0s autopkgtest [12:18:14]: starting date and time: 2025-03-31 12:18:14+0000 0s autopkgtest [12:18:14]: git checkout: 325255d2 Merge branch 'pin-any-arch' into 'ubuntu/production' 0s autopkgtest [12:18:14]: host juju-7f2275-prod-proposed-migration-environment-15; command line: /home/ubuntu/autopkgtest/runner/autopkgtest --output-dir /tmp/autopkgtest-work.b54v2mvn/out --timeout-copy=6000 --setup-commands /home/ubuntu/autopkgtest-cloud/worker-config-production/setup-canonical.sh --apt-pocket=proposed=src:apt --apt-upgrade dgit --timeout-short=300 --timeout-copy=20000 --timeout-build=20000 --env=ADT_TEST_TRIGGERS=apt/2.4.14 -- ssh -s /home/ubuntu/autopkgtest/ssh-setup/nova -- --flavor autopkgtest --security-groups autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup --name adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 --image adt/ubuntu-jammy-amd64-server --keyname testbed-juju-7f2275-prod-proposed-migration-environment-15 --net-id=net_prod-proposed-migration -e TERM=linux -e ''"'"'http_proxy=http://squid.internal:3128'"'"'' -e ''"'"'https_proxy=http://squid.internal:3128'"'"'' -e ''"'"'no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com'"'"'' --mirror=http://ftpmaster.internal/ubuntu/ 47s autopkgtest [12:19:01]: testbed dpkg architecture: amd64 47s autopkgtest [12:19:01]: testbed apt version: 2.4.13 47s autopkgtest [12:19:01]: @@@@@@@@@@@@@@@@@@@@ test bed setup 47s autopkgtest [12:19:01]: testbed release detected to be: None 47s autopkgtest [12:19:01]: updating testbed package index (apt update) 47s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 47s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 47s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 47s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 48s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 48s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 48s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 48s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 48s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 48s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 48s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 48s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 48s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 48s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 48s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 48s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 48s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 51s Fetched 1719 kB in 1s (2911 kB/s) 52s Reading package lists... 52s autopkgtest [12:19:06]: upgrading testbed (apt dist-upgrade and autopurge) 52s Reading package lists... 53s Building dependency tree... 53s Reading state information... 53s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 53s Starting 2 pkgProblemResolver with broken count: 0 53s Done 53s Entering ResolveByKeep 54s 54s The following packages will be upgraded: 54s apt apt-utils libapt-pkg6.0 54s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 54s Need to get 2486 kB of archives. 54s After this operation, 0 B of additional disk space will be used. 54s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 54s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 54s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 54s Fetched 2486 kB in 0s (25.2 MB/s) 54s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 54s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 54s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 54s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 55s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 55s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 55s Unpacking apt (2.4.14) over (2.4.13) ... 55s Setting up apt (2.4.14) ... 55s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 55s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 55s Unpacking apt-utils (2.4.14) over (2.4.13) ... 55s Setting up apt-utils (2.4.14) ... 55s Processing triggers for man-db (2.10.2-1) ... 55s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 57s Reading package lists... 57s Building dependency tree... 57s Reading state information... 57s Starting pkgProblemResolver with broken count: 0 57s Starting 2 pkgProblemResolver with broken count: 0 57s Done 58s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 58s autopkgtest [12:19:12]: rebooting testbed after setup commands that affected boot 70s autopkgtest [12:19:24]: testbed running kernel: Linux 5.15.0-135-generic #146-Ubuntu SMP Sat Feb 15 17:06:22 UTC 2025 70s autopkgtest [12:19:24]: @@@@@@@@@@@@@@@@@@@@ apt-source dgit 72s Get:1 http://ftpmaster.internal/ubuntu jammy/universe dgit 9.15 (dsc) [1846 B] 72s Get:2 http://ftpmaster.internal/ubuntu jammy/universe dgit 9.15 (tar) [668 kB] 73s gpgv: Signature made Sun Jan 2 12:22:29 2022 UTC 73s gpgv: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 73s gpgv: Can't check signature: No public key 73s dpkg-source: warning: cannot verify signature ./dgit_9.15.dsc 73s autopkgtest [12:19:27]: testing package dgit version 9.15 73s dpkgsourceignores-docs SKIP unknown restriction x-dgit-intree-only 73s defdistro-dsd-clone-drs SKIP unknown restriction x-dgit-intree-only 73s dsd-clone-drs SKIP unknown restriction x-dgit-intree-only 73s hint-testsuite-triggers SKIP unknown restriction hint-testsuite-triggers 73s build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 73s quilt-gbp-build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 73s sbuild-gitish SKIP unknown restriction x-dgit-schroot-build 73s i18n-po4a-uptodate SKIP unknown restriction x-dgit-git-only 73s package-build SKIP unknown restriction x-dgit-git-only 73s spelling SKIP unknown restriction x-dgit-git-only 73s autopkgtest [12:19:27]: build not needed 73s dpkgsourceignores-docs SKIP unknown restriction x-dgit-intree-only 73s defdistro-dsd-clone-drs SKIP unknown restriction x-dgit-intree-only 73s dsd-clone-drs SKIP unknown restriction x-dgit-intree-only 73s hint-testsuite-triggers SKIP unknown restriction hint-testsuite-triggers 73s build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 73s quilt-gbp-build-modes-sbuild SKIP unknown restriction x-dgit-schroot-build 73s sbuild-gitish SKIP unknown restriction x-dgit-schroot-build 73s i18n-po4a-uptodate SKIP unknown restriction x-dgit-git-only 73s package-build SKIP unknown restriction x-dgit-git-only 73s spelling SKIP unknown restriction x-dgit-git-only 73s autopkgtest [12:19:27]: test baredebian-multitar: preparing testbed 73s Reading package lists... 73s Building dependency tree... 73s Reading state information... 74s Starting pkgProblemResolver with broken count: 0 74s Starting 2 pkgProblemResolver with broken count: 0 74s Done 74s The following NEW packages will be installed: 74s autoconf automake autopoint autotools-dev bc build-essential 74s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 74s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism diffstat dput dwz 74s fakeroot faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git 74s git-buildpackage git-debrebase git-man intltool-debian libarchive-zip-perl 74s libasan6 libatomic1 libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 74s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 74s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 74s libdynaloader-functions-perl libencode-locale-perl liberror-perl 74s libexporter-tiny-perl libfakeroot libfaketime libfile-chdir-perl 74s libfile-dirlist-perl libfile-fnmatch-perl libfile-homedir-perl 74s libfile-listing-perl libfile-stripnondeterminism-perl libfile-touch-perl 74s libfile-which-perl libgcc-11-dev libgit-wrapper-perl libgomp1 74s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 74s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 74s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 74s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 74s liblist-compare-perl liblist-moreutils-perl liblist-moreutils-xs-perl 74s liblsan0 liblwp-mediatypes-perl liblwp-protocol-https-perl 74s libmodule-runtime-perl libmoo-perl libmpc3 libnet-http-perl 74s libnet-ssleay-perl libnsl-dev libparams-classify-perl libquadmath0 74s librole-tiny-perl libsort-versions-perl libstdc++-11-dev 74s libstring-shellquote-perl libsub-override-perl libsub-quote-perl 74s libtext-csv-perl libtext-glob-perl libtimedate-perl libtirpc-dev libtool 74s libtry-tiny-perl libtsan0 libubsan1 liburi-perl libwww-curl-perl libwww-perl 74s libwww-robotrules-perl linux-libc-dev m4 patchutils perl-openssl-defaults 74s po-debconf python3-dateutil python3-debian python3-gpg quilt rpcsvc-proto 74s sqlite3 wdiff 74s 0 upgraded, 122 newly installed, 0 to remove and 0 not upgraded. 74s Need to get 73.4 MB of archives. 74s After this operation, 248 MB of additional disk space will be used. 74s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 74s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 74s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 74s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 74s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 74s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 74s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 74s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 74s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 74s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 74s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 74s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 74s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 74s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 74s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 74s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 74s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 74s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 74s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 74s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 74s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 74s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 74s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 74s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 74s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 74s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 74s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 74s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 74s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 75s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 75s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 75s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 75s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 75s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 75s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 75s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 75s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 75s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 75s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 75s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 75s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 75s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 75s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 75s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 75s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 75s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 75s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 75s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 75s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 75s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 75s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 75s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 75s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 75s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 75s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 75s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 75s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 75s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 75s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 75s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 75s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 75s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 75s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 75s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 75s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 75s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 75s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 75s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 75s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 75s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 75s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 75s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 75s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 75s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 75s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 75s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 75s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 75s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 75s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 75s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 75s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 75s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 75s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 75s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 75s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 75s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 75s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 75s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 75s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 75s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 75s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 75s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 75s Get:93 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 75s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 75s Get:95 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 75s Get:96 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 75s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 75s Get:98 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 75s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 75s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 75s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 75s Get:102 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 75s Get:103 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 75s Get:104 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 75s Get:105 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 75s Get:106 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 75s Get:107 http://ftpmaster.internal/ubuntu jammy/main amd64 diffstat amd64 1.64-1build2 [29.2 kB] 75s Get:108 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-fnmatch-perl amd64 0.02-2build8 [10.5 kB] 75s Get:109 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-debrebase all 9.15 [67.5 kB] 75s Get:110 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 75s Get:111 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 75s Get:112 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-chdir-perl all 0.1008-1.1 [10.6 kB] 75s Get:113 http://ftpmaster.internal/ubuntu jammy/main amd64 libsort-versions-perl all 1.62-1 [9294 B] 75s Get:114 http://ftpmaster.internal/ubuntu jammy/main amd64 libgit-wrapper-perl all 0.048-1 [29.9 kB] 75s Get:115 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-compare-perl all 0.55-1 [63.3 kB] 75s Get:116 http://ftpmaster.internal/ubuntu jammy/main amd64 libstring-shellquote-perl all 1.04-1 [12.0 kB] 75s Get:117 http://ftpmaster.internal/ubuntu jammy/universe amd64 quilt all 0.66-2.1 [304 kB] 75s Get:118 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 75s Get:119 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 75s Get:120 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 75s Get:121 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 75s Get:122 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 76s Fetched 73.4 MB in 1s (72.3 MB/s) 76s Selecting previously unselected package m4. 76s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 76s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 76s Unpacking m4 (1.4.18-5ubuntu2) ... 76s Selecting previously unselected package autoconf. 76s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 76s Unpacking autoconf (2.71-2) ... 76s Selecting previously unselected package autotools-dev. 76s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 76s Unpacking autotools-dev (20220109.1) ... 76s Selecting previously unselected package automake. 76s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 76s Unpacking automake (1:1.16.5-1.3) ... 76s Selecting previously unselected package autopoint. 76s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 76s Unpacking autopoint (0.21-4ubuntu4) ... 76s Selecting previously unselected package bc. 76s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 76s Unpacking bc (1.07.1-3build1) ... 76s Selecting previously unselected package libc-dev-bin. 76s Preparing to unpack .../006-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 76s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 76s Selecting previously unselected package linux-libc-dev:amd64. 76s Preparing to unpack .../007-linux-libc-dev_5.15.0-135.146_amd64.deb ... 76s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 76s Selecting previously unselected package libcrypt-dev:amd64. 76s Preparing to unpack .../008-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 76s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 76s Selecting previously unselected package rpcsvc-proto. 76s Preparing to unpack .../009-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 76s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 76s Selecting previously unselected package libtirpc-dev:amd64. 76s Preparing to unpack .../010-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 76s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 76s Selecting previously unselected package libnsl-dev:amd64. 76s Preparing to unpack .../011-libnsl-dev_1.3.0-2build2_amd64.deb ... 76s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 76s Selecting previously unselected package libc6-dev:amd64. 76s Preparing to unpack .../012-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 76s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 76s Selecting previously unselected package gcc-11-base:amd64. 76s Preparing to unpack .../013-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 76s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 76s Selecting previously unselected package libisl23:amd64. 76s Preparing to unpack .../014-libisl23_0.24-2build1_amd64.deb ... 76s Unpacking libisl23:amd64 (0.24-2build1) ... 76s Selecting previously unselected package libmpc3:amd64. 76s Preparing to unpack .../015-libmpc3_1.2.1-2build1_amd64.deb ... 76s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 76s Selecting previously unselected package cpp-11. 76s Preparing to unpack .../016-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 76s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 76s Selecting previously unselected package cpp. 76s Preparing to unpack .../017-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 76s Unpacking cpp (4:11.2.0-1ubuntu1) ... 76s Selecting previously unselected package libcc1-0:amd64. 76s Preparing to unpack .../018-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 76s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 76s Selecting previously unselected package libgomp1:amd64. 76s Preparing to unpack .../019-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 76s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 76s Selecting previously unselected package libitm1:amd64. 76s Preparing to unpack .../020-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 76s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libatomic1:amd64. 77s Preparing to unpack .../021-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libasan6:amd64. 77s Preparing to unpack .../022-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package liblsan0:amd64. 77s Preparing to unpack .../023-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libtsan0:amd64. 77s Preparing to unpack .../024-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libubsan1:amd64. 77s Preparing to unpack .../025-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libquadmath0:amd64. 77s Preparing to unpack .../026-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package libgcc-11-dev:amd64. 77s Preparing to unpack .../027-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package gcc-11. 77s Preparing to unpack .../028-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package gcc. 77s Preparing to unpack .../029-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 77s Unpacking gcc (4:11.2.0-1ubuntu1) ... 77s Selecting previously unselected package libstdc++-11-dev:amd64. 77s Preparing to unpack .../030-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package g++-11. 77s Preparing to unpack .../031-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 77s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 77s Selecting previously unselected package g++. 77s Preparing to unpack .../032-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 77s Unpacking g++ (4:11.2.0-1ubuntu1) ... 77s Selecting previously unselected package build-essential. 77s Preparing to unpack .../033-build-essential_12.9ubuntu3_amd64.deb ... 77s Unpacking build-essential (12.9ubuntu3) ... 77s Selecting previously unselected package libdebhelper-perl. 77s Preparing to unpack .../034-libdebhelper-perl_13.6ubuntu1_all.deb ... 77s Unpacking libdebhelper-perl (13.6ubuntu1) ... 77s Selecting previously unselected package libtool. 77s Preparing to unpack .../035-libtool_2.4.6-15build2_all.deb ... 77s Unpacking libtool (2.4.6-15build2) ... 77s Selecting previously unselected package dh-autoreconf. 77s Preparing to unpack .../036-dh-autoreconf_20_all.deb ... 77s Unpacking dh-autoreconf (20) ... 77s Selecting previously unselected package libarchive-zip-perl. 77s Preparing to unpack .../037-libarchive-zip-perl_1.68-1_all.deb ... 77s Unpacking libarchive-zip-perl (1.68-1) ... 77s Selecting previously unselected package libsub-override-perl. 77s Preparing to unpack .../038-libsub-override-perl_0.09-2_all.deb ... 77s Unpacking libsub-override-perl (0.09-2) ... 77s Selecting previously unselected package libfile-stripnondeterminism-perl. 77s Preparing to unpack .../039-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 77s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 77s Selecting previously unselected package dh-strip-nondeterminism. 77s Preparing to unpack .../040-dh-strip-nondeterminism_1.13.0-1_all.deb ... 77s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 77s Selecting previously unselected package debugedit. 77s Preparing to unpack .../041-debugedit_1%3a5.0-4build1_amd64.deb ... 77s Unpacking debugedit (1:5.0-4build1) ... 77s Selecting previously unselected package dwz. 77s Preparing to unpack .../042-dwz_0.14-1build2_amd64.deb ... 77s Unpacking dwz (0.14-1build2) ... 77s Selecting previously unselected package gettext. 77s Preparing to unpack .../043-gettext_0.21-4ubuntu4_amd64.deb ... 77s Unpacking gettext (0.21-4ubuntu4) ... 77s Selecting previously unselected package intltool-debian. 77s Preparing to unpack .../044-intltool-debian_0.35.0+20060710.5_all.deb ... 77s Unpacking intltool-debian (0.35.0+20060710.5) ... 77s Selecting previously unselected package po-debconf. 77s Preparing to unpack .../045-po-debconf_1.0.21+nmu1_all.deb ... 77s Unpacking po-debconf (1.0.21+nmu1) ... 77s Selecting previously unselected package debhelper. 77s Preparing to unpack .../046-debhelper_13.6ubuntu1_all.deb ... 77s Unpacking debhelper (13.6ubuntu1) ... 77s Selecting previously unselected package libfakeroot:amd64. 77s Preparing to unpack .../047-libfakeroot_1.28-1ubuntu1_amd64.deb ... 77s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 77s Selecting previously unselected package fakeroot. 77s Preparing to unpack .../048-fakeroot_1.28-1ubuntu1_amd64.deb ... 77s Unpacking fakeroot (1.28-1ubuntu1) ... 77s Selecting previously unselected package libfile-dirlist-perl. 77s Preparing to unpack .../049-libfile-dirlist-perl_0.05-2_all.deb ... 77s Unpacking libfile-dirlist-perl (0.05-2) ... 77s Selecting previously unselected package libfile-which-perl. 77s Preparing to unpack .../050-libfile-which-perl_1.23-1_all.deb ... 77s Unpacking libfile-which-perl (1.23-1) ... 77s Selecting previously unselected package libfile-homedir-perl. 77s Preparing to unpack .../051-libfile-homedir-perl_1.006-1_all.deb ... 77s Unpacking libfile-homedir-perl (1.006-1) ... 78s Selecting previously unselected package libfile-touch-perl. 78s Preparing to unpack .../052-libfile-touch-perl_0.12-1_all.deb ... 78s Unpacking libfile-touch-perl (0.12-1) ... 78s Selecting previously unselected package libio-pty-perl. 78s Preparing to unpack .../053-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 78s Unpacking libio-pty-perl (1:1.15-2build2) ... 78s Selecting previously unselected package libipc-run-perl. 78s Preparing to unpack .../054-libipc-run-perl_20200505.0-1_all.deb ... 78s Unpacking libipc-run-perl (20200505.0-1) ... 78s Selecting previously unselected package libclass-method-modifiers-perl. 78s Preparing to unpack .../055-libclass-method-modifiers-perl_2.13-1_all.deb ... 78s Unpacking libclass-method-modifiers-perl (2.13-1) ... 78s Selecting previously unselected package libclass-xsaccessor-perl. 78s Preparing to unpack .../056-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 78s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 78s Selecting previously unselected package libb-hooks-op-check-perl. 78s Preparing to unpack .../057-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 78s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 78s Selecting previously unselected package libdynaloader-functions-perl. 78s Preparing to unpack .../058-libdynaloader-functions-perl_0.003-1.1_all.deb ... 78s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 78s Selecting previously unselected package libdevel-callchecker-perl. 78s Preparing to unpack .../059-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 78s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 78s Selecting previously unselected package libparams-classify-perl. 78s Preparing to unpack .../060-libparams-classify-perl_0.015-1build5_amd64.deb ... 78s Unpacking libparams-classify-perl (0.015-1build5) ... 78s Selecting previously unselected package libmodule-runtime-perl. 78s Preparing to unpack .../061-libmodule-runtime-perl_0.016-1_all.deb ... 78s Unpacking libmodule-runtime-perl (0.016-1) ... 78s Selecting previously unselected package libimport-into-perl. 78s Preparing to unpack .../062-libimport-into-perl_1.002005-1_all.deb ... 78s Unpacking libimport-into-perl (1.002005-1) ... 78s Selecting previously unselected package librole-tiny-perl. 78s Preparing to unpack .../063-librole-tiny-perl_2.002004-1_all.deb ... 78s Unpacking librole-tiny-perl (2.002004-1) ... 78s Selecting previously unselected package libsub-quote-perl. 78s Preparing to unpack .../064-libsub-quote-perl_2.006006-1_all.deb ... 78s Unpacking libsub-quote-perl (2.006006-1) ... 78s Selecting previously unselected package libmoo-perl. 78s Preparing to unpack .../065-libmoo-perl_2.005004-3_all.deb ... 78s Unpacking libmoo-perl (2.005004-3) ... 78s Selecting previously unselected package libencode-locale-perl. 78s Preparing to unpack .../066-libencode-locale-perl_1.05-1.1_all.deb ... 78s Unpacking libencode-locale-perl (1.05-1.1) ... 78s Selecting previously unselected package libtimedate-perl. 78s Preparing to unpack .../067-libtimedate-perl_2.3300-2_all.deb ... 78s Unpacking libtimedate-perl (2.3300-2) ... 78s Selecting previously unselected package libhttp-date-perl. 78s Preparing to unpack .../068-libhttp-date-perl_6.05-1_all.deb ... 78s Unpacking libhttp-date-perl (6.05-1) ... 78s Selecting previously unselected package libfile-listing-perl. 78s Preparing to unpack .../069-libfile-listing-perl_6.14-1_all.deb ... 78s Unpacking libfile-listing-perl (6.14-1) ... 78s Selecting previously unselected package libhtml-tagset-perl. 78s Preparing to unpack .../070-libhtml-tagset-perl_3.20-4_all.deb ... 78s Unpacking libhtml-tagset-perl (3.20-4) ... 78s Selecting previously unselected package liburi-perl. 78s Preparing to unpack .../071-liburi-perl_5.10-1_all.deb ... 78s Unpacking liburi-perl (5.10-1) ... 78s Selecting previously unselected package libhtml-parser-perl:amd64. 78s Preparing to unpack .../072-libhtml-parser-perl_3.76-1build2_amd64.deb ... 78s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 78s Selecting previously unselected package libhtml-tree-perl. 78s Preparing to unpack .../073-libhtml-tree-perl_5.07-2_all.deb ... 78s Unpacking libhtml-tree-perl (5.07-2) ... 78s Selecting previously unselected package libio-html-perl. 78s Preparing to unpack .../074-libio-html-perl_1.004-2_all.deb ... 78s Unpacking libio-html-perl (1.004-2) ... 78s Selecting previously unselected package liblwp-mediatypes-perl. 78s Preparing to unpack .../075-liblwp-mediatypes-perl_6.04-1_all.deb ... 78s Unpacking liblwp-mediatypes-perl (6.04-1) ... 78s Selecting previously unselected package libhttp-message-perl. 78s Preparing to unpack .../076-libhttp-message-perl_6.36-1_all.deb ... 78s Unpacking libhttp-message-perl (6.36-1) ... 78s Selecting previously unselected package libhttp-cookies-perl. 78s Preparing to unpack .../077-libhttp-cookies-perl_6.10-1_all.deb ... 78s Unpacking libhttp-cookies-perl (6.10-1) ... 78s Selecting previously unselected package libhttp-negotiate-perl. 78s Preparing to unpack .../078-libhttp-negotiate-perl_6.01-1_all.deb ... 78s Unpacking libhttp-negotiate-perl (6.01-1) ... 78s Selecting previously unselected package perl-openssl-defaults:amd64. 78s Preparing to unpack .../079-perl-openssl-defaults_5build2_amd64.deb ... 78s Unpacking perl-openssl-defaults:amd64 (5build2) ... 78s Selecting previously unselected package libnet-ssleay-perl:amd64. 78s Preparing to unpack .../080-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 78s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 78s Selecting previously unselected package libio-socket-ssl-perl. 78s Preparing to unpack .../081-libio-socket-ssl-perl_2.074-2_all.deb ... 78s Unpacking libio-socket-ssl-perl (2.074-2) ... 78s Selecting previously unselected package libnet-http-perl. 78s Preparing to unpack .../082-libnet-http-perl_6.22-1_all.deb ... 78s Unpacking libnet-http-perl (6.22-1) ... 78s Selecting previously unselected package liblwp-protocol-https-perl. 78s Preparing to unpack .../083-liblwp-protocol-https-perl_6.10-1_all.deb ... 78s Unpacking liblwp-protocol-https-perl (6.10-1) ... 78s Selecting previously unselected package libtry-tiny-perl. 78s Preparing to unpack .../084-libtry-tiny-perl_0.31-1_all.deb ... 78s Unpacking libtry-tiny-perl (0.31-1) ... 78s Selecting previously unselected package libwww-robotrules-perl. 78s Preparing to unpack .../085-libwww-robotrules-perl_6.02-1_all.deb ... 78s Unpacking libwww-robotrules-perl (6.02-1) ... 78s Selecting previously unselected package libwww-perl. 78s Preparing to unpack .../086-libwww-perl_6.61-1_all.deb ... 78s Unpacking libwww-perl (6.61-1) ... 78s Selecting previously unselected package patchutils. 78s Preparing to unpack .../087-patchutils_0.4.2-1build2_amd64.deb ... 78s Unpacking patchutils (0.4.2-1build2) ... 78s Selecting previously unselected package wdiff. 78s Preparing to unpack .../088-wdiff_1.2.2-2build3_amd64.deb ... 78s Unpacking wdiff (1.2.2-2build3) ... 78s Selecting previously unselected package devscripts. 78s Preparing to unpack .../089-devscripts_2.22.1ubuntu1_amd64.deb ... 78s Unpacking devscripts (2.22.1ubuntu1) ... 78s Selecting previously unselected package liberror-perl. 78s Preparing to unpack .../090-liberror-perl_0.17029-1_all.deb ... 78s Unpacking liberror-perl (0.17029-1) ... 78s Selecting previously unselected package git-man. 78s Preparing to unpack .../091-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 78s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 78s Selecting previously unselected package git. 78s Preparing to unpack .../092-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 78s Unpacking git (1:2.34.1-1ubuntu1.12) ... 78s Selecting previously unselected package python3-dateutil. 78s Preparing to unpack .../093-python3-dateutil_2.8.1-6_all.deb ... 78s Unpacking python3-dateutil (2.8.1-6) ... 78s Selecting previously unselected package git-buildpackage. 78s Preparing to unpack .../094-git-buildpackage_0.9.25_all.deb ... 78s Unpacking git-buildpackage (0.9.25) ... 78s Selecting previously unselected package libexporter-tiny-perl. 78s Preparing to unpack .../095-libexporter-tiny-perl_1.002002-1_all.deb ... 78s Unpacking libexporter-tiny-perl (1.002002-1) ... 78s Selecting previously unselected package liblist-moreutils-xs-perl. 78s Preparing to unpack .../096-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 78s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 78s Selecting previously unselected package liblist-moreutils-perl. 78s Preparing to unpack .../097-liblist-moreutils-perl_0.430-2_all.deb ... 78s Unpacking liblist-moreutils-perl (0.430-2) ... 78s Selecting previously unselected package python3-debian. 78s Preparing to unpack .../098-python3-debian_0.1.43ubuntu1.1_all.deb ... 78s Unpacking python3-debian (0.1.43ubuntu1.1) ... 78s Selecting previously unselected package python3-gpg. 78s Preparing to unpack .../099-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 78s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 78s Selecting previously unselected package dput. 78s Preparing to unpack .../100-dput_1.1.0ubuntu2.1_all.deb ... 78s Unpacking dput (1.1.0ubuntu2.1) ... 78s Selecting previously unselected package libjson-perl. 78s Preparing to unpack .../101-libjson-perl_4.04000-1_all.deb ... 78s Unpacking libjson-perl (4.04000-1) ... 78s Selecting previously unselected package libtext-glob-perl. 78s Preparing to unpack .../102-libtext-glob-perl_0.11-2_all.deb ... 78s Unpacking libtext-glob-perl (0.11-2) ... 78s Selecting previously unselected package libwww-curl-perl. 78s Preparing to unpack .../103-libwww-curl-perl_4.17-7build2_amd64.deb ... 78s Unpacking libwww-curl-perl (4.17-7build2) ... 78s Selecting previously unselected package libtext-csv-perl. 78s Preparing to unpack .../104-libtext-csv-perl_2.01-1_all.deb ... 78s Unpacking libtext-csv-perl (2.01-1) ... 78s Selecting previously unselected package dgit. 78s Preparing to unpack .../105-dgit_9.15_all.deb ... 78s Unpacking dgit (9.15) ... 79s Selecting previously unselected package diffstat. 79s Preparing to unpack .../106-diffstat_1.64-1build2_amd64.deb ... 79s Unpacking diffstat (1.64-1build2) ... 79s Selecting previously unselected package libfile-fnmatch-perl. 79s Preparing to unpack .../107-libfile-fnmatch-perl_0.02-2build8_amd64.deb ... 79s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 79s Selecting previously unselected package git-debrebase. 79s Preparing to unpack .../108-git-debrebase_9.15_all.deb ... 79s Unpacking git-debrebase (9.15) ... 79s Selecting previously unselected package libdbi-perl:amd64. 79s Preparing to unpack .../109-libdbi-perl_1.643-3build3_amd64.deb ... 79s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 79s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 79s Preparing to unpack .../110-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 79s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 79s Selecting previously unselected package libfile-chdir-perl. 79s Preparing to unpack .../111-libfile-chdir-perl_0.1008-1.1_all.deb ... 79s Unpacking libfile-chdir-perl (0.1008-1.1) ... 79s Selecting previously unselected package libsort-versions-perl. 79s Preparing to unpack .../112-libsort-versions-perl_1.62-1_all.deb ... 79s Unpacking libsort-versions-perl (1.62-1) ... 79s Selecting previously unselected package libgit-wrapper-perl. 79s Preparing to unpack .../113-libgit-wrapper-perl_0.048-1_all.deb ... 79s Unpacking libgit-wrapper-perl (0.048-1) ... 79s Selecting previously unselected package liblist-compare-perl. 79s Preparing to unpack .../114-liblist-compare-perl_0.55-1_all.deb ... 79s Unpacking liblist-compare-perl (0.55-1) ... 79s Selecting previously unselected package libstring-shellquote-perl. 79s Preparing to unpack .../115-libstring-shellquote-perl_1.04-1_all.deb ... 79s Unpacking libstring-shellquote-perl (1.04-1) ... 79s Selecting previously unselected package quilt. 79s Preparing to unpack .../116-quilt_0.66-2.1_all.deb ... 79s Unpacking quilt (0.66-2.1) ... 79s Selecting previously unselected package sqlite3. 79s Preparing to unpack .../117-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 79s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 79s Selecting previously unselected package chiark-utils-bin. 79s Preparing to unpack .../118-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 79s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 79s Selecting previously unselected package dgit-infrastructure. 79s Preparing to unpack .../119-dgit-infrastructure_9.15_all.deb ... 79s Unpacking dgit-infrastructure (9.15) ... 79s Selecting previously unselected package libfaketime:amd64. 79s Preparing to unpack .../120-libfaketime_0.9.8-9_amd64.deb ... 79s Unpacking libfaketime:amd64 (0.9.8-9) ... 79s Selecting previously unselected package faketime. 79s Preparing to unpack .../121-faketime_0.9.8-9_amd64.deb ... 79s Unpacking faketime (0.9.8-9) ... 79s Setting up wdiff (1.2.2-2build3) ... 79s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 79s Setting up libfile-which-perl (1.23-1) ... 79s Setting up libdynaloader-functions-perl (0.003-1.1) ... 79s Setting up libtext-glob-perl (0.11-2) ... 79s Setting up libclass-method-modifiers-perl (2.13-1) ... 79s Setting up liblist-compare-perl (0.55-1) ... 79s Setting up libio-pty-perl (1:1.15-2build2) ... 79s Setting up libarchive-zip-perl (1.68-1) ... 79s Setting up libhtml-tagset-perl (3.20-4) ... 79s Setting up libdebhelper-perl (13.6ubuntu1) ... 79s Setting up liblwp-mediatypes-perl (6.04-1) ... 79s Setting up libtry-tiny-perl (0.31-1) ... 79s Setting up perl-openssl-defaults:amd64 (5build2) ... 79s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 79s Setting up bc (1.07.1-3build1) ... 79s Setting up m4 (1.4.18-5ubuntu2) ... 79s Setting up libwww-curl-perl (4.17-7build2) ... 79s Setting up libencode-locale-perl (1.05-1.1) ... 79s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up libstring-shellquote-perl (1.04-1) ... 79s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 79s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 79s Setting up chiark-utils-bin (6.1.2+nmu1) ... 79s Setting up fakeroot (1.28-1ubuntu1) ... 79s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 79s Setting up liberror-perl (0.17029-1) ... 79s Setting up patchutils (0.4.2-1build2) ... 79s Setting up autotools-dev (20220109.1) ... 79s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 79s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 79s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 79s Setting up python3-debian (0.1.43ubuntu1.1) ... 79s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up diffstat (1.64-1build2) ... 79s Setting up libmpc3:amd64 (1.2.1-2build1) ... 79s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up libio-html-perl (1.004-2) ... 79s Setting up autopoint (0.21-4ubuntu4) ... 79s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 79s Setting up libipc-run-perl (20200505.0-1) ... 79s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 79s Setting up autoconf (2.71-2) ... 79s Setting up libfile-fnmatch-perl (0.02-2build8) ... 79s Setting up libtimedate-perl (2.3300-2) ... 79s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up dwz (0.14-1build2) ... 79s Setting up libfile-chdir-perl (0.1008-1.1) ... 79s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 79s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 79s Setting up libjson-perl (4.04000-1) ... 79s Setting up librole-tiny-perl (2.002004-1) ... 79s Setting up debugedit (1:5.0-4build1) ... 79s Setting up libsub-override-perl (0.09-2) ... 79s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 79s Setting up python3-dateutil (2.8.1-6) ... 79s Setting up libsub-quote-perl (2.006006-1) ... 79s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 79s Setting up libsort-versions-perl (1.62-1) ... 79s Setting up libexporter-tiny-perl (1.002002-1) ... 79s Setting up libfile-dirlist-perl (0.05-2) ... 79s Setting up libisl23:amd64 (0.24-2build1) ... 79s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 79s Setting up libfile-homedir-perl (1.006-1) ... 79s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up liburi-perl (5.10-1) ... 79s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 79s Setting up libfile-touch-perl (0.12-1) ... 79s Setting up libdbi-perl:amd64 (1.643-3build3) ... 79s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 79s Setting up libfaketime:amd64 (0.9.8-9) ... 79s Setting up libtext-csv-perl (2.01-1) ... 79s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 79s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 79s Setting up automake (1:1.16.5-1.3) ... 79s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 79s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 79s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 79s Setting up faketime (0.9.8-9) ... 79s Setting up libhttp-date-perl (6.05-1) ... 79s Setting up gettext (0.21-4ubuntu4) ... 79s Setting up libfile-listing-perl (6.14-1) ... 79s Setting up liblist-moreutils-perl (0.430-2) ... 79s Setting up libnet-http-perl (6.22-1) ... 79s Setting up quilt (0.66-2.1) ... 79s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 79s Setting up dput (1.1.0ubuntu2.1) ... 79s Setting up intltool-debian (0.35.0+20060710.5) ... 79s Setting up git (1:2.34.1-1ubuntu1.12) ... 79s Setting up dh-strip-nondeterminism (1.13.0-1) ... 79s Setting up libwww-robotrules-perl (6.02-1) ... 79s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 79s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 79s Setting up cpp (4:11.2.0-1ubuntu1) ... 79s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 79s Setting up libgit-wrapper-perl (0.048-1) ... 79s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 79s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 79s Setting up libio-socket-ssl-perl (2.074-2) ... 79s Setting up libhttp-message-perl (6.36-1) ... 79s Setting up libhttp-negotiate-perl (6.01-1) ... 79s Setting up libhttp-cookies-perl (6.10-1) ... 79s Setting up libtool (2.4.6-15build2) ... 79s Setting up po-debconf (1.0.21+nmu1) ... 79s Setting up libhtml-tree-perl (5.07-2) ... 79s Setting up libparams-classify-perl (0.015-1build5) ... 79s Setting up gcc (4:11.2.0-1ubuntu1) ... 79s Setting up dh-autoreconf (20) ... 79s Setting up libmodule-runtime-perl (0.016-1) ... 79s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 79s Setting up dgit-infrastructure (9.15) ... 79s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 79s Setting up libimport-into-perl (1.002005-1) ... 79s Setting up libmoo-perl (2.005004-3) ... 79s Setting up debhelper (13.6ubuntu1) ... 79s Setting up g++ (4:11.2.0-1ubuntu1) ... 79s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 79s Setting up build-essential (12.9ubuntu3) ... 79s Setting up liblwp-protocol-https-perl (6.10-1) ... 79s Setting up libwww-perl (6.61-1) ... 79s Setting up devscripts (2.22.1ubuntu1) ... 80s Setting up git-buildpackage (0.9.25) ... 80s Setting up git-debrebase (9.15) ... 80s Setting up dgit (9.15) ... 80s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 80s Processing triggers for man-db (2.10.2-1) ... 80s Processing triggers for install-info (6.8-4build1) ... 81s autopkgtest [12:19:35]: test baredebian-multitar: [----------------------- 81s ++ set -o pipefail 81s ++ . tests/lib-core 81s ++ . tests/lib-restricts 81s ++ trap ' 81s rc=$? 81s set +x 81s test $rc = 0 || echo " 81s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 81s 81s Most relevant logs are just before assignment rc=$rc 81s Will now do cleanup etc. 81s " 81s set -x 81s set +e 81s pwd 81s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 81s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 81s set -e 81s test $rc = 0 || t-report-failure 81s ' EXIT 81s ++ t-filter-out-git-hyphen-dir 81s ++ local pathent 81s +++ type -p git-rev-parse 81s +++ : 81s ++ pathent= 81s ++ case "$pathent" in 81s ++ return 81s ++ t-set-intree 81s ++ '[' x = x ']' 81s ++ return 81s ++ : -D 81s ++ export DGIT_TEST_DEBUG 81s ++ : x 81s ++ export DGIT_TEST_DEBPUSH_DEBUG 81s ++ : 81s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 81s ++ GIT_COMMITTER_DATE='1530000000 +0100' 81s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 81s ++ GIT_AUTHOR_DATE='1530000000 +0100' 81s ++ export LC_CTYPE=C.UTF-8 81s ++ LC_CTYPE=C.UTF-8 81s ++ unset CDPATH 81s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 81s ++ FILTER_BRANCH_SQUELCH_WARNING=1 81s +++ pwd 81s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 81s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ testname=baredebian-multitar 81s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ bpd=.. 81s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 81s ++ '[' x '!=' x ']' 81s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s +++ pwd 81s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ t-set-using-tmp 81s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 81s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 81s ++ export 'DEBFULLNAME=dgit test git user' 81s ++ DEBFULLNAME='dgit test git user' 81s ++ git config --global user.email dgit-test@debian.example.net 81s ++ git config --global user.name 'dgit test git user' 81s ++ git config --global protocol.ext.allow always 81s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 81s ++ env -0 81s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 81s ++ export DEBCHANGE_VENDOR=dpkg 81s ++ DEBCHANGE_VENDOR=dpkg 81s ++ unset VISUAL 81s ++ unset GIT_EDITOR 81s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 81s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 81s ++ cat 81s ++ schroot=build 81s ++ : aq 81s ++ : archive/test-dummy 81s ++ : sid:unstable 81s ++ t-git-config dgit.default.old-dsc-distro test-dummy 81s ++ git config --global dgit.default.old-dsc-distro test-dummy 81s ++ for import in ${autoimport-gnupg} 81s ++ case "$0" in 81s ++ t-setup-import gnupg 81s ++ local setupname=gnupg 81s ++ local setupsrc 81s ++ local lock 81s ++ '[' x = x ']' 81s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 81s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 81s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 81s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 81s cd "$1"; shift 81s setupname="$1"; shift 81s simport="$1"; shift 81s if [ -e "$simport" ]; then exit 0; fi 81s env - "$@" \ 81s "tests/setup/$setupname" 81s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 81s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 81s + shift 81s + setupname=gnupg 81s + shift 81s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 81s + shift 81s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 81s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/baredebian-multitar-stderr --stdout=/tmp/autopkgtest.ztMUxl/baredebian-multitar-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-multitar -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-multitar' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 81s ++ set -o pipefail 81s ++ . tests/lib-core 81s ++ . tests/lib-restricts 81s ++ trap ' 81s rc=$? 81s set +x 81s test $rc = 0 || echo " 81s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 81s 81s Most relevant logs are just before assignment rc=$rc 81s Will now do cleanup etc. 81s " 81s set -x 81s set +e 81s pwd 81s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 81s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 81s set -e 81s test $rc = 0 || t-report-failure 81s ' EXIT 81s ++ t-filter-out-git-hyphen-dir 81s ++ local pathent 81s +++ type -p git-rev-parse 81s +++ : 81s ++ pathent= 81s ++ case "$pathent" in 81s ++ return 81s ++ t-set-intree 81s ++ '[' x = x ']' 81s ++ return 81s ++ : -D 81s ++ export DGIT_TEST_DEBUG 81s ++ : x 81s ++ export DGIT_TEST_DEBPUSH_DEBUG 81s ++ : 81s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 81s ++ GIT_COMMITTER_DATE='1530000000 +0100' 81s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 81s ++ GIT_AUTHOR_DATE='1530000000 +0100' 81s ++ export LC_CTYPE=C.UTF-8 81s ++ LC_CTYPE=C.UTF-8 81s ++ unset CDPATH 81s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 81s ++ FILTER_BRANCH_SQUELCH_WARNING=1 81s +++ pwd 81s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 81s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ testname=gnupg 81s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 81s ++ bpd=.. 81s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 81s ++ '[' x '!=' x ']' 81s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s +++ pwd 81s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ t-set-using-tmp 81s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 81s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 81s ++ export 'DEBFULLNAME=dgit test git user' 81s ++ DEBFULLNAME='dgit test git user' 81s ++ git config --global user.email dgit-test@debian.example.net 81s ++ git config --global user.name 'dgit test git user' 81s ++ git config --global protocol.ext.allow always 81s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 81s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 81s ++ export DEBCHANGE_VENDOR=dpkg 81s ++ DEBCHANGE_VENDOR=dpkg 81s ++ unset VISUAL 81s ++ unset GIT_EDITOR 81s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 81s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 81s ++ cat 81s ++ schroot=build 81s ++ : aq 81s ++ : archive/test-dummy 81s ++ : sid:unstable 81s ++ t-git-config dgit.default.old-dsc-distro test-dummy 81s ++ git config --global dgit.default.old-dsc-distro test-dummy 81s ++ for import in ${autoimport-gnupg} 81s ++ case "$0" in 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 81s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 81s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 81s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 81s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 81s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 81s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 81s + setup=' 81s export GNUPGHOME=$tmp/gnupg 81s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 81s 81s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 81s ssb rsa2048 2013-11-17 [E] 81s 81s sec rsa2048 2014-01-26 [SC] 81s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 81s uid [ultimate] Populus Romanus (test key) 81s ssb rsa2048 2014-01-26 [E] 81s 81s sec rsa2048 2014-01-26 [SC] 81s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 81s uid [ unknown] Hannibal (test key) 81s ssb rsa2048 2014-01-26 [E] 81s 81s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 81s export GNUPGHOME=$tmp/gnupg 81s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 81s 81s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 81s "sha256sum" => "$2", 81s "component" => "$3", 81s "filename" => "$4", 81s }; 81s END { 81s my $json = JSON->new->canonical(); 81s print $json->encode(\@v) or die $!; 81s } 81s ' 81s + t-aq-archive-updated new example 81s + local suite=new 81s + local p=example 81s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 81s + perl -wne ' 81s use JSON; 81s use strict; 81s our @v; 81s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 81s push @v, { 81s "version" => "$1", 81s "sha256sum" => "$2", 81s "component" => "$3", 81s "filename" => "$4", 81s }; 81s END { 81s my $json = JSON->new->canonical(); 81s print $json->encode(\@v) or die $!; 81s } 81s ' 81s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 81s + cat 81s + jsondelim=' },' 81s + cat 81s + t-git-none 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 81s + set -e 81s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 81s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 81s + t-gdr-gbp-import-core-with-queue 81s + t-gdr-gbp-import-core 81s + p=example 81s + t-worktree 1.1 81s + rm -rf example 81s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 81s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 81s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 81s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 81s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 81s + cd example 81s + : 'fake up some kind of upstream' 81s + git checkout -b upstream quilt-tip 81s Switched to a new branch 'upstream' 81s + rm -rf debian 81s + mkdir debian 81s + echo junk 81s + git add debian 81s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 81s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 81s 6 files changed, 1 insertion(+), 36 deletions(-) 81s delete mode 100644 debian/changelog 81s delete mode 100644 debian/compat 81s delete mode 100644 debian/control 81s delete mode 100644 debian/example.install 81s mode change 100755 => 100644 debian/rules 81s delete mode 100644 debian/source/format 81s + git tag v1.0 81s + : 'fake up that our quilt-tip was descended from upstream' 81s + git checkout quilt-tip 81s Switched to branch 'quilt-tip' 81s + git merge --no-edit -s ours upstream 81s Merge made by the 'ours' strategy. 81s + : 'fake up that our quilt-tip had the patch queue in it' 81s + git checkout patch-queue/quilt-tip 81s Switched to branch 'patch-queue/quilt-tip' 81s + gbp pq export 81s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 81s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 81s + git add debian/patches 81s + git commit -m 'patch queue update (tests/setup/baredebian)' 81s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 81s 4 files changed, 50 insertions(+) 81s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 81s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 81s create mode 100644 debian/patches/series 81s create mode 100644 debian/patches/subdir/addnewups 81s + : 'make branch names more conventional' 81s + git branch -D master 81s Deleted branch master (was 17d67db). 81s + git branch -m quilt-tip master 81s + git-deborig 81s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 81s + git branch -D patch-queue/quilt-tip 81s Deleted branch patch-queue/quilt-tip (was d843a68). 81s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 81s + git branch -D gitish-only 81s Deleted branch gitish-only (was 2b2ddc8). 81s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 81s + git branch -D quilt-tip-1.1 81s Deleted branch quilt-tip-1.1 (was 7fc34be). 81s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 81s + git branch -D quilt-tip-2 81s Deleted branch quilt-tip-2 (was 99fcab4). 81s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 81s + git branch -D indep-arch 81s Deleted branch indep-arch (was e215729). 81s + git rm -rf . 81s rm '.gitignore' 81s rm 'debian/changelog' 81s rm 'debian/compat' 81s rm 'debian/control' 81s rm 'debian/example.install' 81s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 81s rm 'debian/patches/0002-Edit-the-.c-file.patch' 81s rm 'debian/patches/series' 81s rm 'debian/patches/subdir/addnewups' 81s rm 'debian/rules' 81s rm 'debian/source/format' 81s rm 'docs/README' 81s rm 'example' 81s rm 'src.c' 81s + git checkout HEAD -- debian 81s ++ git write-tree 81s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 81s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 81s + t=5c410cc573946394fbd85950449595317108dca9 81s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 81s HEAD is now at 5c410cc Convert to bare debian 81s ++ echo 'example*' 81s + t-setup-done '' 'example* git mirror aq' ' 81s t-select-package example 81s t-git-next-date 81s ' 81s + local savevars= 81s + local 'savedirs=example* git mirror aq' 81s + local 'importeval= 81s t-select-package example 81s t-git-next-date 81s ' 81s + local import=IMPORT.baredebian 81s + exec 81s + local vn 81s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 81s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 81s print STDERR "saving-exporting $vn\n"; 81s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 81s or die $!; 81s } 81s ' 81s saving-exporting DGIT_TEST_REAL_GPG 81s saving-exporting DGIT_TEST_REAL_DEBCHANGE 81s saving-exporting DGIT_TEST_REAL_GPG_AGENT 81s + set -e 81s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 81s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 81s + printf '\n%s\n' ' 81s t-select-package example 81s t-git-next-date 81s ' 81s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 81s + rc=0 81s + set +x 81s + set +e 81s + pwd 81s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 81s + '[' x '!=' x ']' 81s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 81s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 81s + set -e 81s + test 0 = 0 81s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 81s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 81s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 81s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 81s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 81s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 81s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 81s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 81s ++ t-select-package example 81s ++ p=example 81s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 81s ++ t-git-next-date 81s ++ GIT_COMMITTER_DATE='1530000001 +0100' 81s ++ GIT_AUTHOR_DATE='1530000001 +0100' 81s + t-tstunt-parsechangelog 81s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 81s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s + local var=PATH 81s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s + eval ' 81s case "$PATH" in 81s "$tstunt:"*) ;; 81s *":$tstunt:"*) ;; 81s "") PATH="$tstunt" ;; 81s *) PATH="$tstunt:$PATH" ;; 81s esac 81s export PATH 81s ' 81s ++ case "$PATH" in 81s ++ export PATH 81s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s + local var=PERLLIB 81s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s + eval ' 81s case "$PERLLIB" in 81s "$tstunt:"*) ;; 81s *":$tstunt:"*) ;; 81s "") PERLLIB="$tstunt" ;; 81s *) PERLLIB="$tstunt:$PERLLIB" ;; 81s esac 81s export PERLLIB 81s ' 81s ++ case "$PERLLIB" in 81s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 81s ++ export PERLLIB 81s + local f 81s + for f in "$@" 81s + t-tstunt--save-real dpkg-parsechangelog 81s + local f=dpkg-parsechangelog 81s + case "$f" in 81s + local rc 81s + local real 81s + set +e 81s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 81s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 81s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 81s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 81s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 81s ++ type -p dpkg-parsechangelog 81s + real=/usr/bin/dpkg-parsechangelog 81s + rc=0 81s + set -e 81s + case $rc in 81s + local varname=dpkg_parsechangelog 81s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 81s + eval ' 81s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 81s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 81s ' 81s ++ : /usr/bin/dpkg-parsechangelog 81s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 81s + f=./dpkg-parsechangelog 81s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 81s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 81s + for f in "$@" 81s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 81s + local f=Dpkg/Changelog/Parse.pm 81s + case "$f" in 81s + return 81s + f=./Dpkg/Changelog/Parse.pm 81s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 81s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 81s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 81s + cd example 81s + baredebian-test-vars 81s + quiltmode=baredebian 81s + v=1.0-1 81s + suite=sid 81s + uv=1.0 81s + uvtag=v1.0 81s + origbase=example_1.0.orig 81s + xorigcomps= 81s + baredebian-tarball-mode 81s + git tag -d v1.0 81s Deleted tag 'v1.0' (was aa9b151) 81s + uvtag= 81s + quiltmode=baredebian+tarball 81s + rm -f ../example_1.0.orig.tar.xz 81s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig.tar.gz .. 81s + xorigcomps=docs 81s + git tag -d 81s + baredebian-test-minimum 81s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 81s + local 'mpat=contradicts clean mode git-ff' 81s + shift 81s + set +o pipefail 81s + LC_MESSAGES=C 81s + LANGUAGE=C 81s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 81s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 81s + local dgit=dgit 81s + pwd 81s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 81s + : ' 81s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 81s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 82s | git rev-parse --show-toplevel 82s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 82s | git config -z --get-regexp --local '.*' 82s | git config -z --get-regexp --local '.*' 82s | git config -z --get-regexp --global '.*' 82s | git config -z --get-regexp --system '.*' 82s format 3.0 (quilt), quilt mode baredebian+tarball 82s Format `3.0 (quilt)', need to check/update patch stack 82s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 82s => `' 82s + git diff --quiet HEAD 82s 82s dgit: error: quilt mode baredebian+tarball (generally needs untracked upstream files) 82s dgit: contradicts clean mode git-ff (which would delete them) 82s + local 'ps=255 0' 82s + set -o pipefail 82s + case $ps in 82s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 82s + local 'mpat=contradicts clean mode git-ff' 82s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 82s + local grepper=fgrep 82s + case "$mpat" in 82s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 82s dgit: contradicts clean mode git-ff (which would delete them) 82s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 82s + local dgit=dgit 82s + pwd 82s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 82s + : ' 82s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 82s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 82s | git rev-parse --show-toplevel 82s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 82s | git config -z --get-regexp --local '.*' 82s | git config -z --get-regexp --local '.*' 82s | git config -z --get-regexp --global '.*' 82s | git config -z --get-regexp --system '.*' 82s format 3.0 (quilt), quilt mode baredebian+tarball 82s Format `3.0 (quilt)', need to check/update patch stack 82s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 82s => `' 82s + git diff --quiet HEAD 82s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 82s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 82s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 82s | git rev-parse 'HEAD~0' 82s => `5c410cc573946394fbd85950449595317108dca9' 82s | git symbolic-ref -q HEAD 82s => `refs/heads/master' 82s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 82s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 82s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 82s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 82s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 82s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 82s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - a3555f08decb0ecc2905427a016e27a867130db6d1e91425675defe73589e510 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 82s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 82s >(no reflog) 82s splitbrain cache miss 82s CD work 82s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 82s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 82s + git checkout -q -b dgit-view 82s examining quilt state (multiple patches, baredebian+tarball mode) 82s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 82s CD fake 82s | find -name .git -prune -print0 82s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 82s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 82s + git add -Af . 82s | git write-tree 82s => `e24b70dab05337283037dfefde87e77ee7ff43f6' 82s fake orig tree object e24b70dab05337283037dfefde87e77ee7ff43f6 82s CD .. 82s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 82s CD ../fake 82s + git add -Af . 82s | git write-tree 82s => `f45019e20f793efa44bafe38eef6dd784f356f59' 82s fake o+d/p tree object e24b70dab05337283037dfefde87e77ee7ff43f6 82s CD ../work 82s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 82s => `debian\x00' 82s CD .. 82s import considering example_1.0.orig.tar.gz Y .gz orig 82s + chmod -R '+rwX' _unpack-tar 82s CD _unpack-tar 82s | find -name .git -prune -print0 82s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 82s + git add -Af . 82s | git write-tree 82s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 82s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 82s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 82s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 82s CD .. 82s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 82s + chmod -R '+rwX' _unpack-tar 82s CD _unpack-tar 82s | find -name .git -prune -print0 82s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 82s + git add -Af . 82s | git write-tree 82s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 82s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 82s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 82s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 82s CD .. 82s CD work 82s import clog search... 82s | dpkg-parsechangelog --format rfc822 --all 82s import clog 1.0-1 package changelog, entry no.1... 82s import clog 1.0-1 vs 1.0... 82s import clog 1.0-1 becomes r1 82s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 82s => `1431548802 +0000' 82s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 82s => `1431548802 +0000' 82s import tartrees authline Ian Jackson 1431548802 +0000 82s import tartrees r1authline Ian Jackson 1431548802 +0000 82s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 82s | git hash-object -w -t commit --stdin 82s => 94c010931d011cbd6c1861bb9d453aa12d826298 82s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 82s | git hash-object -w -t commit --stdin 82s => a5bb1f49c872a76a5d703570fd5352e424719bda 82s + git rm --quiet -rf --cached --ignore-unmatch . 82s + git read-tree 94c010931d011cbd6c1861bb9d453aa12d826298 82s + git rm --quiet -rf --cached --ignore-unmatch docs 82s + git read-tree --prefix=docs/ a5bb1f49c872a76a5d703570fd5352e424719bda 82s | git write-tree 82s => `b5c653c509621c62608ee67507d359ddd46a900b' 82s | git hash-object -w -t commit --stdin 82s => c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 82s + git reset -q 82s | git diff-tree -z --no-renames -r e24b70dab05337283037dfefde87e77ee7ff43f6 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 82s => `:000000 100644 0000000000000000000000000000000000000000 e4dde7e0d9bce1bdfbfc565beea115e079263ec6 A\x00debian/TRASH\x00:100644 000000 6f6830cf687e60a381ddb22f14e45a21b514cf59 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 9e8f73939dc78596676351d6e2f13f99f6adf51f 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 000000 41e210551949a27c6848cc5d233bfb65f94e3a14 0000000000000000000000000000000000000000 D\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 82s quiltify_trees_differ e24b70dab05337283037dfefde87e77ee7ff43f6 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef => 0 82s | git diff-tree -z --no-renames --name-only -r c54c10146a9aad6d3dcba4e07eeddde7cb1eebef f45019e20f793efa44bafe38eef6dd784f356f59 82s => `debian/TRASH\x00debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 82s quiltify_trees_differ c54c10146a9aad6d3dcba4e07eeddde7cb1eebef f45019e20f793efa44bafe38eef6dd784f356f59 => 1 82s | git diff-tree -z --no-renames --name-only -r e24b70dab05337283037dfefde87e77ee7ff43f6 f45019e20f793efa44bafe38eef6dd784f356f59 82s => `lib.c\x00new-upstream-file\x00src.c\x00' 82s quiltify_trees_differ e24b70dab05337283037dfefde87e77ee7ff43f6 f45019e20f793efa44bafe38eef6dd784f356f59 => 1 82s differences @dl == ## ## == == ==. 82s dgit: base trees orig=e24b70dab05337283037 o+d/p=f45019e20f793efa44ba 82s dgit: quilt differences: src: == orig ## gitignores: == orig == 82s dgit: quilt differences: tarballs ## o+d/p tarballs == o+d/p 82s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 82s => `1431548802 +0000' 82s + git read-tree c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 82s + git rm --quiet -rf --cached --ignore-unmatch debian 82s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 82s | git write-tree 82s => `e24b70dab05337283037dfefde87e77ee7ff43f6' 82s | git commit-tree e24b70dab05337283037dfefde87e77ee7ff43f6 -p 5c410cc573946394fbd85950449595317108dca9 -p c54c10146a9aad6d3dcba4e07eeddde7cb1eebef -m 'Combine debian/ with upstream source for 1.0 82s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-1 *orig*] 82s ' 82s => `8118bec61036025f8586b14741872963b435daa9' 82s + git reset -q --hard 8118bec61036025f8586b14741872963b435daa9 82s dgit view: creating patches-applied version using gbp pq 82s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 82s + git update-ref refs/heads/dgit-view HEAD 82s + git checkout -q dgit-view 82s | git rev-parse 'HEAD~0' 82s => `ea581faf12044c3dca1617bde6556e587f8906a3' 82s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 82s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 82s => `' 82s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - a3555f08decb0ecc2905427a016e27a867130db6d1e91425675defe73589e510 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache ea581faf12044c3dca1617bde6556e587f8906a3 82s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 82s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 ea581faf12044c3dca1617bde6556e587f8906a3 82s dgit view: created (and left in refs/heads/split.f1) 82s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 82s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 82s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 82s ' 82s + baredebian-test-core 82s + baredebian-test-core-prepush 82s + tar --strip-components=1 -axf ../example_1.0.orig.tar.gz 82s + for comp in $xorigcomps 82s + mkdir docs 82s + cd docs 82s + tar --strip-components=1 -axf ../../example_1.0.orig-docs.tar.gz 82s + cd .. 82s + cd debian 82s + git clean -xdff 82s Removing TRASH 82s + git checkout HEAD -- . 82s + cd .. 82s + export QUILT_PATCHES=debian/patches 82s + QUILT_PATCHES=debian/patches 82s + quilt push -a 82s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 82s patching file new-upstream-file 82s 82s Applying patch debian/patches/0002-Edit-the-.c-file.patch 82s patching file src.c 82s 82s Applying patch debian/patches/subdir/addnewups 82s patching file lib.c 82s 82s Now at patch debian/patches/subdir/addnewups 82s + git add -Af . 82s + git reset .pc 82s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 82s + git diff --exit-code HEAD..split.f1 -- :/debian 82s + git reset 82s + quilt new made-with-quilt 82s Patch debian/patches/made-with-quilt is now on top 82s + quilt add src.c 82s File src.c added to patch debian/patches/made-with-quilt 82s + echo //omg 82s + quilt refresh 82s Refreshed patch debian/patches/made-with-quilt 82s + git add debian/patches/. 82s + t-commit 'extra patch made with quilt' 1.0-2 82s + local 'msg=extra patch made with quilt' 82s + v=1.0-2 82s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 82s + DEBEMAIL=dgit-tests@example.org 82s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 82s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange --force-distribution -v1.0-2 --distribution unstable extra patch made with quilt 82s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 82s libdistro-info-perl is not installed, Debian release names are not known. 82s libdistro-info-perl is not installed, Ubuntu release names are not known. 83s + git add debian/changelog 83s + debcommit 83s git commit -m 'extra patch made with quilt' 83s [master d0c1094] extra patch made with quilt 83s 3 files changed, 14 insertions(+) 83s create mode 100644 debian/patches/made-with-quilt 83s + revision=1 83s + t-refs-same-start 83s + unset t_ref_val 83s + t_ref_names=() 83s + t-ref-head 83s + local val 83s ++ git rev-parse HEAD 83s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + local name=HEAD 83s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + case "${t_ref_val-unset}" in 83s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + t_ref_names+=("$name") 83s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 83s + local dgit=dgit 83s + pwd 83s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 83s + : ' 83s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 83s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 83s | git rev-parse --show-toplevel 83s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 83s | git config -z --get-regexp --local '.*' 83s | git config -z --get-regexp --local '.*' 83s | git config -z --get-regexp --global '.*' 83s | git config -z --get-regexp --system '.*' 83s format 3.0 (quilt), quilt mode baredebian+tarball 83s Format `3.0 (quilt)', need to check/update patch stack 83s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 83s => `' 83s + git diff --quiet HEAD 83s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 83s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 83s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 83s | git rev-parse 'HEAD~0' 83s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 83s | git symbolic-ref -q HEAD 83s => `refs/heads/master' 83s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 83s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 83s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 83s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 83s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 83s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 83s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 0b0920bb2afe77fe6f317afe8af1ee371644c929457080013602d3aa525c09cf 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 83s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 83s splitbrain cache miss 83s CD work 83s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 83s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + git checkout -q -b dgit-view 83s examining quilt state (multiple patches, baredebian+tarball mode) 83s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 83s CD fake 83s | find -name .git -prune -print0 83s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 83s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 83s + git add -Af . 83s | git write-tree 83s => `1a39a2c773a44fe277aaae01894089f5c9074760' 83s fake orig tree object 1a39a2c773a44fe277aaae01894089f5c9074760 83s CD .. 83s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s CD ../fake 83s + git add -Af . 83s | git write-tree 83s => `1002894b031bff44b52d1a9231fdcb9ecdf913e2' 83s fake o+d/p tree object 1a39a2c773a44fe277aaae01894089f5c9074760 83s CD ../work 83s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s => `debian\x00' 83s CD .. 83s import considering example_1.0.orig.tar.gz Y .gz orig 83s + chmod -R '+rwX' _unpack-tar 83s CD _unpack-tar 83s | find -name .git -prune -print0 83s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 83s + git add -Af . 83s | git write-tree 83s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 83s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 83s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 83s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 83s CD .. 83s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 83s + chmod -R '+rwX' _unpack-tar 83s CD _unpack-tar 83s | find -name .git -prune -print0 83s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 83s + git add -Af . 83s | git write-tree 83s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 83s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 83s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 83s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 83s CD .. 83s CD work 83s import clog search... 83s | dpkg-parsechangelog --format rfc822 --all 83s import clog 1.0-2 package changelog, entry no.1... 83s import clog 1.0-2 vs 1.0... 83s import clog 1.0-2 becomes r1 83s import clog 1.0-1 package changelog, entry no.2... 83s import clog 1.0-1 vs 1.0... 83s import clog 1.0-1 becomes r1 83s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 83s => `1530000001 +0000' 83s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 83s => `1431548802 +0000' 83s import tartrees authline dgit test git user 1530000001 +0000 83s import tartrees r1authline Ian Jackson 1431548802 +0000 83s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 83s | git hash-object -w -t commit --stdin 83s => 94c010931d011cbd6c1861bb9d453aa12d826298 83s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 83s | git hash-object -w -t commit --stdin 83s => a5bb1f49c872a76a5d703570fd5352e424719bda 83s + git rm --quiet -rf --cached --ignore-unmatch . 83s + git read-tree 94c010931d011cbd6c1861bb9d453aa12d826298 83s + git rm --quiet -rf --cached --ignore-unmatch docs 83s + git read-tree --prefix=docs/ a5bb1f49c872a76a5d703570fd5352e424719bda 83s | git write-tree 83s => `b5c653c509621c62608ee67507d359ddd46a900b' 83s | git hash-object -w -t commit --stdin 83s => c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 83s + git reset -q 83s | git diff-tree -z --no-renames -r 1a39a2c773a44fe277aaae01894089f5c9074760 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 83s => `:000000 100644 0000000000000000000000000000000000000000 e4dde7e0d9bce1bdfbfc565beea115e079263ec6 A\x00debian/TRASH\x00:100644 000000 94f588d88ada8ca51628feea02d735b931cc33d0 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 8aab1b8d48eeef16e2501a1a88b46da32dd4667f 0000000000000000000000000000000000000000 D\x00debian/patches/made-with-quilt\x00:100644 000000 47b57013afc48c2b0afa225e09b019bfb6e8cc25 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 000000 41e210551949a27c6848cc5d233bfb65f94e3a14 0000000000000000000000000000000000000000 D\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 83s quiltify_trees_differ 1a39a2c773a44fe277aaae01894089f5c9074760 c54c10146a9aad6d3dcba4e07eeddde7cb1eebef => 0 83s | git diff-tree -z --no-renames --name-only -r c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 1002894b031bff44b52d1a9231fdcb9ecdf913e2 83s => `debian/TRASH\x00debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/made-with-quilt\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 83s quiltify_trees_differ c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 1002894b031bff44b52d1a9231fdcb9ecdf913e2 => 1 83s | git diff-tree -z --no-renames --name-only -r 1a39a2c773a44fe277aaae01894089f5c9074760 1002894b031bff44b52d1a9231fdcb9ecdf913e2 83s => `lib.c\x00new-upstream-file\x00src.c\x00' 83s quiltify_trees_differ 1a39a2c773a44fe277aaae01894089f5c9074760 1002894b031bff44b52d1a9231fdcb9ecdf913e2 => 1 83s differences @dl == ## ## == == ==. 83s dgit: base trees orig=1a39a2c773a44fe277aa o+d/p=1002894b031bff44b52d 83s dgit: quilt differences: src: == orig ## gitignores: == orig == 83s dgit: quilt differences: tarballs ## o+d/p tarballs == o+d/p 83s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 83s => `1530000001 +0000' 83s + git read-tree c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 83s + git rm --quiet -rf --cached --ignore-unmatch debian 83s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 83s | git write-tree 83s => `1a39a2c773a44fe277aaae01894089f5c9074760' 83s | git commit-tree 1a39a2c773a44fe277aaae01894089f5c9074760 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p c54c10146a9aad6d3dcba4e07eeddde7cb1eebef -m 'Combine debian/ with upstream source for 1.0 83s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-2 *orig*] 83s ' 83s => `33f0f124d41647e4ae7b32d7ed90615f9ad6fe30' 83s + git reset -q --hard 33f0f124d41647e4ae7b32d7ed90615f9ad6fe30 83s dgit view: creating patches-applied version using gbp pq 83s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 83s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 83s + git update-ref refs/heads/dgit-view HEAD 83s + git checkout -q dgit-view 83s | git rev-parse 'HEAD~0' 83s => `cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92' 83s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 83s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 83s => `ea581faf12044c3dca1617bde6556e587f8906a3' 83s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 0b0920bb2afe77fe6f317afe8af1ee371644c929457080013602d3aa525c09cf 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 83s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 83s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 83s dgit view: created (and left in refs/heads/split.b) 83s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 83s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 83s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 83s ' 83s + t-ref-head 83s + local val 83s ++ git rev-parse HEAD 83s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + local name=HEAD 83s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + case "${t_ref_val-unset}" in 83s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 83s + t_ref_names+=("$name") 83s + baredebian-test-core-push 83s + dpkg-buildpackage -uc -us --build=source 83s dpkg-buildpackage: info: source package example 83s dpkg-buildpackage: info: source version 1.0-2 83s dpkg-buildpackage: info: source distribution unstable 83s dpkg-buildpackage: info: source changed by dgit test git user 83s dpkg-source --before-build . 84s fakeroot debian/rules clean 84s EXAMPLE RULES TARGET clean 84s dh_clean 84s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 84s dpkg-source -b . 84s dpkg-source: info: using source format '3.0 (quilt)' 84s dpkg-source: info: building example using existing ./example_1.0.orig-docs.tar.gz 84s dpkg-source: info: building example using existing ./example_1.0.orig.tar.gz 84s dpkg-source: info: using patch list from debian/patches/series 84s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 84s dpkg-source: info: building example in example_1.0-2.dsc 84s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 84s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 84s dpkg-genchanges: info: not including original source code in upload 84s dpkg-source --after-build . 84s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 84s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 84s + local dgit=dgit 84s + pwd 84s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 84s + : ' 84s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 84s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 84s | git rev-parse --show-toplevel 84s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 84s | git config -z --get-regexp --local '.*' 84s | git config -z --get-regexp --local '.*' 84s | git config -z --get-regexp --global '.*' 84s | git config -z --get-regexp --system '.*' 84s format 3.0 (quilt), quilt mode baredebian+tarball 84s Format `3.0 (quilt)', need to check/update patch stack 84s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 84s => `' 84s + git diff --quiet HEAD 84s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 84s canonical suite name for unstable is sid 84s actually entering push 84s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 84s => `0' 84s + git config remote.dgit.skipdefaultupdate true 84s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 84s get_archive_dsc: nothing in archive, returning undef 84s no version available from the archive 84s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 84s => `' 84s previous reference hash= 84s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 84s => `' 84s fetch_from_archive: lastfetch= 84s nothing found! 84s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 84s + git check-ref-format archive/test-dummy/1.0-2 84s | git symbolic-ref -q HEAD 84s => `refs/heads/master' 84s | git rev-parse 'HEAD~0' 84s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 84s ffq_prev_branchinfo branch current refs/heads/master 84s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 84s => `' 84s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 84s => `' 84s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 84s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 84s QF linkorigs example_1.0.orig-docs.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig-docs.tar.gz Y 84s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 84s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 84s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 84s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 0b0920bb2afe77fe6f317afe8af1ee371644c929457080013602d3aa525c09cf 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 84s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 84s CD work 84s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 84s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 84s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 84s dgit view: found cached (and left in refs/heads/split.p) 84s + git checkout -q -b dgit-view cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 84s splitbrain_pseudomerge... 84s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 84s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 84s => `' 84s + git diff --quiet HEAD 84s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 84s => `' 84s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 84s checking that example_1.0-2.dsc corresponds to HEAD 84s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc 84s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc) 84s dpkg-source: info: extracting example in example-1.0 84s dpkg-source: info: unpacking example_1.0.orig.tar.gz 84s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 84s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 84s dpkg-source: info: using patch list from debian/patches/series 84s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 84s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 84s dpkg-source: info: applying subdir/addnewups 84s dpkg-source: info: applying made-with-quilt 84s CD example-1.0 84s | find -name .git -prune -print0 84s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 84s + git add -Af . 84s | git write-tree 84s => `1002894b031bff44b52d1a9231fdcb9ecdf913e2' 84s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 84s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 84s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 84s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 84s + git diff --quiet 1002894b031bff44b52d1a9231fdcb9ecdf913e2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 84s files_compare_inputs example_1.0-2.dsc 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig-docs.tar.gz 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.gz 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig-docs.tar.gz 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.gz 84s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2.dsc Files 84s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig-docs.tar.gz 84s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.gz 84s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2_source.changes 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 84s files_compare_inputs example_1.0-2_source.changes Files 84s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 84s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 84s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 84s checking origs needed (1.0)... 84s checking origs needed placement 'devel extra'... 84s origs example_1.0.orig-docs.tar.gz | cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz 84s origs example_1.0.orig-docs.tar.gz is_orig 84s -| sh -ec 'cd "$1"; shift 84s 84s find -name "$1" -print0 | 84s xargs -0r sha256sum 84s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_1.0.orig-docs.tar.gz 84s origs example_1.0.orig-docs.tar.gz $#$have=-1 84s origs example_1.0.orig-docs.tar.gz f.same=0 #f._differ=-1 84s origs example_1.0.orig.tar.gz | 599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz 84s origs example_1.0.orig.tar.gz is_orig 84s -| sh -ec 'cd "$1"; shift 84s 84s find -name "$1" -print0 | 84s xargs -0r sha256sum 84s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_1.0.orig.tar.gz 84s origs example_1.0.orig.tar.gz $#$have=-1 84s origs example_1.0.orig.tar.gz f.same=0 #f._differ=-1 84s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 84s edited .changes for archive .orig contents: added example_1.0.orig.tar.gz 84s edited .changes for archive .orig contents: added example_1.0.orig-docs.tar.gz 84s push_tagwants: $VAR1 = [ 84s '1.0-2', 84s 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92', 84s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 84s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 84s ]; 84s $VAR2 = [ 84s { 84s 'Objid' => 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92', 84s 'TagFn' => sub { "DUMMY" }, 84s 'TfSuffix' => '', 84s 'Tfn' => sub { "DUMMY" }, 84s 'Tag' => 'archive/test-dummy/1.0-2', 84s 'View' => 'dgit' 84s }, 84s { 84s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 84s 'TagFn' => sub { "DUMMY" }, 84s 'TfSuffix' => '-maintview', 84s 'Tfn' => sub { "DUMMY" }, 84s 'Tag' => 'test-dummy/1.0-2', 84s 'View' => 'maint' 84s } 84s ]; 84s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 84s => `1530000001 +0000' 84s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 84s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 84s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 84s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 84s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 84s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 84s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 84s => `59817ec19092ec559643354a6a71515165a779d3' 84s + git verify-tag 59817ec19092ec559643354a6a71515165a779d3 84s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 84s gpg: Signature made Mon Mar 31 12:19:38 2025 UTC 84s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 84s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 84s gpg: WARNING: This key is not certified with a trusted signature! 84s gpg: There is no indication that the signature belongs to the owner. 84s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 84s + git update-ref refs/tags/archive/test-dummy/1.0-2 59817ec19092ec559643354a6a71515165a779d3 84s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 84s => `94756e2b96b5b4ece71fe16fba507c4c05f0370e' 84s + git verify-tag 94756e2b96b5b4ece71fe16fba507c4c05f0370e 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s gpg: Signature made Mon Mar 31 12:19:38 2025 UTC 85s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 85s gpg: WARNING: This key is not certified with a trusted signature! 85s gpg: There is no indication that the signature belongs to the owner. 85s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 85s + git update-ref refs/tags/test-dummy/1.0-2 94756e2b96b5b4ece71fe16fba507c4c05f0370e 85s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 85s => `0' 85s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 85s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 85s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 85s * [new reference] cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 -> refs/dgit/sid 85s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 85s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 85s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 85s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s 85s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 85s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s 85s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 85s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 85s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s 85s Successfully signed dsc, buildinfo, changes files 85s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 85s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 85s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 85s D: Setting host argument. 85s Checking signature on .changes 85s Checking signature on .dsc 85s Package includes an .orig.tar.gz file although the debian revision suggests 85s that it might not be required. Multiple uploads of the .orig.tar.gz may be 85s rejected by the upload queue management software. 85s Uploading to test-dummy (via local to localhost): 85s Successfully uploaded packages. 85s dgit ok: pushed and uploaded 1.0-2 85s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 85s del_lrfetchrefs... 85s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 85s ' 85s + baredebian-test-core-postpush 85s + git merge-base --is-ancestor HEAD split.p 85s + '[' '' ']' 85s + git clean -xdff 85s Removing .pc/ 85s Removing debian/files 85s Removing docs/ 85s Removing example 85s Removing lib.c 85s Removing new-upstream-file 85s Removing src.c 85s + t-splitbrain-pushed-good-start 85s + dep14tag=refs/tags/test-dummy/1.0-2 85s ++ t-v-tag 85s ++ echo refs/tags/archive/test-dummy/1.0-2 85s + dgittag=refs/tags/archive/test-dummy/1.0-2 85s + t-output '' git status --porcelain 85s + printf %s '' 85s + shift 85s + git status --porcelain 85s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 85s + t-ref-head 85s + local val 85s ++ git rev-parse HEAD 85s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + local name=HEAD 85s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t_ref_names+=("$name") 85s + t-refs-same refs/tags/test-dummy/1.0-2 85s + local g 85s + for g in $* 85s + t-ref-same refs/tags/test-dummy/1.0-2 85s + local name=refs/tags/test-dummy/1.0-2 85s + local val 85s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 85s ++ local ref=refs/tags/test-dummy/1.0-2 85s ++ case "$ref" in 85s ++ git show-ref -d refs/tags/test-dummy/1.0-2 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + local name=refs/tags/test-dummy/1.0-2 85s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t_ref_names+=("$name") 85s + set -e 85s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 85s + t-refs-same refs/tags/test-dummy/1.0-2 85s + local g 85s + for g in $* 85s + t-ref-same refs/tags/test-dummy/1.0-2 85s + local name=refs/tags/test-dummy/1.0-2 85s + local val 85s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 85s ++ local ref=refs/tags/test-dummy/1.0-2 85s ++ case "$ref" in 85s ++ git show-ref -d refs/tags/test-dummy/1.0-2 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + local name=refs/tags/test-dummy/1.0-2 85s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 85s + t_ref_names+=("$name") 85s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 85s + t-refs-same-start 85s + unset t_ref_val 85s + t_ref_names=() 85s + t-ref-same refs/heads/split.p 85s + local name=refs/heads/split.p 85s + local val 85s ++ t-git-get-ref refs/heads/split.p 85s ++ local ref=refs/heads/split.p 85s ++ case "$ref" in 85s ++ git show-ref -d refs/heads/split.p 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val refs/heads/split.p cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=refs/heads/split.p 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s ++ t-git-get-ref refs/heads/split.b 85s ++ local ref=refs/heads/split.b 85s ++ case "$ref" in 85s ++ git show-ref -d refs/heads/split.b 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + local split_b=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "$split_b" in 85s + t-pushed-good-core 85s + t-ref-dsc-dgit 85s + t-incoming-dsc 85s + local dsc=example_1.0-2.dsc 85s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 85s + local val 85s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 85s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 85s ++ local field=Dgit 85s ++ perl -e ' 85s use Dpkg::Control::Hash; 85s my $h = new Dpkg::Control::Hash allow_pgp=>1; 85s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 85s my $val = $h->{"Dgit"},"\n"; 85s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 85s print $val,"\n"; 85s ' 85s + val='cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 85s ++ perl -e ' 85s $_=shift @ARGV; 85s die "Dgit $_ ?" unless m/^\w+\b/; 85s print $&,"\n" or die $!; 85s ' 'cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s ++ t-v-tag 85s ++ echo refs/tags/archive/test-dummy/1.0-2 85s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 85s + local g 85s + for g in $* 85s + t-ref-same refs/tags/archive/test-dummy/1.0-2 85s + local name=refs/tags/archive/test-dummy/1.0-2 85s + local val 85s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 85s ++ local ref=refs/tags/archive/test-dummy/1.0-2 85s ++ case "$ref" in 85s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=refs/tags/archive/test-dummy/1.0-2 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s + for g in $* 85s + t-ref-same refs/remotes/dgit/dgit/sid 85s + local name=refs/remotes/dgit/dgit/sid 85s + local val 85s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 85s ++ local ref=refs/remotes/dgit/dgit/sid 85s ++ case "$ref" in 85s ++ git show-ref -d refs/remotes/dgit/dgit/sid 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val refs/remotes/dgit/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=refs/remotes/dgit/dgit/sid 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 85s + local val 85s + for g in $* 85s ++ t-git-get-ref refs/heads/dgit/unstable 85s ++ local ref=refs/heads/dgit/unstable 85s ++ case "$ref" in 85s ++ git show-ref -d refs/heads/dgit/unstable 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s ++ test 1 = 1 85s + val= 85s + '[' x '!=' x ']' 85s + for g in $* 85s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 85s ++ local ref=refs/remotes/dgit/dgit/unstable 85s ++ case "$ref" in 85s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s ++ test 1 = 1 85s + val= 85s + '[' x '!=' x ']' 85s + set -e 85s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 85s ++ t-v-tag 85s ++ echo refs/tags/archive/test-dummy/1.0-2 85s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 85s + local g 85s + for g in $* 85s + t-ref-same refs/dgit/sid 85s + local name=refs/dgit/sid 85s + local val 85s ++ t-git-get-ref refs/dgit/sid 85s ++ local ref=refs/dgit/sid 85s ++ case "$ref" in 85s ++ git show-ref -d refs/dgit/sid 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val refs/dgit/sid cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=refs/dgit/sid 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s + for g in $* 85s + t-ref-same refs/tags/archive/test-dummy/1.0-2 85s + local name=refs/tags/archive/test-dummy/1.0-2 85s + local val 85s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 85s ++ local ref=refs/tags/archive/test-dummy/1.0-2 85s ++ case "$ref" in 85s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s + val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + local name=refs/tags/archive/test-dummy/1.0-2 85s + local val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + case "${t_ref_val-unset}" in 85s + t_ref_val=cd143b9b7cf459528ef13ed0f2f71cf38d3b3b92 85s + t_ref_names+=("$name") 85s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 85s + t-refs-notexist refs/dgit/unstable 85s + local val 85s + for g in $* 85s ++ t-git-get-ref refs/dgit/unstable 85s ++ local ref=refs/dgit/unstable 85s ++ case "$ref" in 85s ++ git show-ref -d refs/dgit/unstable 85s ++ perl -ne ' 85s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 85s END { print "$x\n" if length $x; } 85s ' 85s ++ test 1 = 1 85s + val= 85s + '[' x '!=' x ']' 85s ++ t-v-tag 85s ++ echo refs/tags/archive/test-dummy/1.0-2 85s + git verify-tag refs/tags/archive/test-dummy/1.0-2 85s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 85s gpg: Signature made Mon Mar 31 12:19:38 2025 UTC 85s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 85s gpg: WARNING: This key is not certified with a trusted signature! 85s gpg: There is no indication that the signature belongs to the owner. 85s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 85s + t-incoming-dsc 85s + local dsc=example_1.0-2.dsc 85s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 85s + t-splitbrain-pushed-good--unpack 85s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 85s + rm -rf t-unpack 85s + mkdir t-unpack 85s + cd t-unpack 85s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.gz . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 85s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 85s + dpkg-source -x example_1.0-2.dsc 85s gpgv: Signature made Mon Mar 31 12:19:39 2025 UTC 85s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 85s gpgv: Can't check signature: No public key 85s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 85s dpkg-source: info: extracting example in example-1.0 85s dpkg-source: info: unpacking example_1.0.orig.tar.gz 85s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 85s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 85s dpkg-source: info: using patch list from debian/patches/series 85s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 85s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 85s dpkg-source: info: applying subdir/addnewups 85s dpkg-source: info: applying made-with-quilt 85s + cd example-1.0/. 85s + git init 85s hint: Using 'master' as the name for the initial branch. This default branch name 85s hint: is subject to change. To configure the initial branch name to use in all 85s hint: of your new repositories, which will suppress this warning, call: 85s hint: 85s hint: git config --global init.defaultBranch 85s hint: 85s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 85s hint: 'development'. The just-created branch can be renamed via this command: 85s hint: 85s hint: git branch -m 85s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 85s + git fetch ../../example 'refs/tags/*:refs/tags/*' 85s From ../../example 85s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 85s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 85s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 85s + local tag=refs/tags/archive/test-dummy/1.0-2 85s + t-splitbrain-pushed-good--checkprep 85s + git add -Af . 85s + git rm --cached -r --ignore-unmatch .pc 85s rm '.pc/.quilt_patches' 85s rm '.pc/.quilt_series' 85s rm '.pc/.version' 85s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 85s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 85s rm '.pc/applied-patches' 85s rm '.pc/made-with-quilt/src.c' 85s rm '.pc/subdir/addnewups/lib.c' 85s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 85s + printf %s '' 85s + shift 85s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 85s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 85s + t-splitbrain-pushed-good--unpack 85s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 85s + rm -rf t-unpack 85s + mkdir t-unpack 85s + cd t-unpack 85s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.gz . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 85s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 85s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 85s + dpkg-source -x example_1.0-2.dsc 86s gpgv: Signature made Mon Mar 31 12:19:39 2025 UTC 86s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 86s gpgv: Can't check signature: No public key 86s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 86s dpkg-source: info: extracting example in example-1.0 86s dpkg-source: info: unpacking example_1.0.orig.tar.gz 86s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 86s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 86s dpkg-source: info: using patch list from debian/patches/series 86s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 86s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 86s dpkg-source: info: applying subdir/addnewups 86s dpkg-source: info: applying made-with-quilt 86s + cd example-1.0/. 86s + git init 86s hint: Using 'master' as the name for the initial branch. This default branch name 86s hint: is subject to change. To configure the initial branch name to use in all 86s hint: of your new repositories, which will suppress this warning, call: 86s hint: 86s hint: git config --global init.defaultBranch 86s hint: 86s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 86s hint: 'development'. The just-created branch can be renamed via this command: 86s hint: 86s hint: git branch -m 86s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 86s + git fetch ../../example 'refs/tags/*:refs/tags/*' 86s From ../../example 86s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 86s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 86s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 86s + xargs -0r rm -rf -- 86s + t-splitbrain-pushed-good-end-made-dep14 86s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 86s + local tag=refs/tags/test-dummy/1.0-2 86s + t-splitbrain-pushed-good--checkprep 86s + git add -Af . 86s + git rm --cached -r --ignore-unmatch .pc 86s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 86s + printf %s '' 86s + shift 86s + git diff --stat --cached refs/tags/test-dummy/1.0-2 86s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 86s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 86s ++ git log --pretty=format:%H --grep 'Combine orig tarballs for example 1.0' split.p 86s + combine=c54c10146a9aad6d3dcba4e07eeddde7cb1eebef 86s + parentnum=0 86s + for comp in '' $xorigcomps 86s + parentnum=1 86s + fn=example_1.0.orig.tar.gz 86s + git checkout --orphan imp1 86s Switched to a new branch 'imp1' 86s + git rm -rf . 86s rm 'debian/changelog' 86s rm 'debian/compat' 86s rm 'debian/control' 86s rm 'debian/example.install' 86s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 86s rm 'debian/patches/0002-Edit-the-.c-file.patch' 86s rm 'debian/patches/made-with-quilt' 86s rm 'debian/patches/series' 86s rm 'debian/patches/subdir/addnewups' 86s rm 'debian/rules' 86s rm 'debian/source/format' 86s + tar --strip-components=1 -axf ../example_1.0.orig.tar.gz 86s + git add -Af . 86s + git commit -m P1 86s [imp1 (root-commit) b3963f4] P1 86s 3 files changed, 4 insertions(+) 86s create mode 100644 debian/TRASH 86s create mode 100755 example 86s create mode 100644 src.c 86s + git diff --stat --exit-code 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^1' 86s ++ git log 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^1' 86s ++ grep -Fc example_1.0.orig.tar.gz 86s + count=2 86s + '[' 2 = 2 ']' 86s + for comp in '' $xorigcomps 86s + parentnum=2 86s + fn=example_1.0.orig-docs.tar.gz 86s + git checkout --orphan imp2 86s Switched to a new branch 'imp2' 86s + git rm -rf . 86s rm 'debian/TRASH' 86s rm 'example' 86s rm 'src.c' 86s + tar --strip-components=1 -axf ../example_1.0.orig-docs.tar.gz 86s + git add -Af . 86s + git commit -m P2 86s [imp2 (root-commit) b176913] P2 86s 1 file changed, 1 insertion(+) 86s create mode 100644 README 86s + git diff --stat --exit-code 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^2' 86s ++ git log 'c54c10146a9aad6d3dcba4e07eeddde7cb1eebef^2' 86s ++ grep -Fc example_1.0.orig-docs.tar.gz 86s + count=2 86s + '[' 2 = 2 ']' 86s + t-ok 86s + : ======================================== 86s + t-check-only-bpd 86s + '[' .. = .. ']' 86s + return 86s + t-fscks 86s + shopt -s nullglob 86s + for d in $tmp/*/.git $tmp/git/*.git 86s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 86s + t-git-fsck 86s ++ git rev-parse --git-dir 86s + local fsckerrs=.git/dgit-test-fsck.errs 86s + set +e 86s + LC_MESSAGES=C 86s + git fsck --no-dangling --strict 86s + tee .git/dgit-test-fsck.errs 86s + ps='0 0' 86s + set -e 86s + local pats 86s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 86s + test '0 0' = '0 0' 86s + pats+=(-e 'notice: HEAD points to an unborn branch') 86s + pats+=(-e 'notice: No default references') 86s + set +e 86s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 86s + rc=1 86s + set -e 86s + case $rc in 86s + for d in $tmp/*/.git $tmp/git/*.git 86s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 86s + t-git-fsck 86s ++ git rev-parse --git-dir 86s + local fsckerrs=./dgit-test-fsck.errs 86s + set +e 86s + LC_MESSAGES=C 86s + git fsck --no-dangling --strict 86s + tee ./dgit-test-fsck.errs 86s notice: HEAD points to an unborn branch (master) 86s + ps='0 0' 86s + set -e 86s + local pats 86s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 86s + test '0 0' = '0 0' 86s + pats+=(-e 'notice: HEAD points to an unborn branch') 86s + pats+=(-e 'notice: No default references') 86s + set +e 86s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 86s + rc=1 86s + set -e 86s + case $rc in 86s + t-save-artifacts 86s + artifacts=/tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts 86s + '[' x/tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts = x ']' 86s + '[' xtmp = x ']' 86s + GZIP=-1v 86s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/baredebian-multitar-artifacts/baredebian-multitar.tar.gz '--exclude=*.tar' . 86s gzip: warning: GZIP environment variable is deprecated; use an alias or script 86s 78.9% 86s + echo ok. 86s ok. 86s + rc=0 86s + set +x 86s + set +e 86s + pwd 86s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 86s + '[' x '!=' x ']' 86s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 86s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 86s + set -e 86s + test 0 = 0 86s autopkgtest [12:19:40]: test baredebian-multitar: -----------------------] 86s baredebian-multitar PASS 86s autopkgtest [12:19:40]: test baredebian-multitar: - - - - - - - - - - results - - - - - - - - - - 86s autopkgtest [12:19:40]: test baredebian-plusgit: preparing testbed 86s Reading package lists... 87s Building dependency tree... 87s Reading state information... 87s Starting pkgProblemResolver with broken count: 0 87s Starting 2 pkgProblemResolver with broken count: 0 87s Done 87s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 88s autopkgtest [12:19:42]: test baredebian-plusgit: [----------------------- 88s ++ set -o pipefail 88s ++ . tests/lib-core 88s ++ . tests/lib-restricts 88s ++ trap ' 88s rc=$? 88s set +x 88s test $rc = 0 || echo " 88s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 88s 88s Most relevant logs are just before assignment rc=$rc 88s Will now do cleanup etc. 88s " 88s set -x 88s set +e 88s pwd 88s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 88s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 88s set -e 88s test $rc = 0 || t-report-failure 88s ' EXIT 88s ++ t-filter-out-git-hyphen-dir 88s ++ local pathent 88s +++ type -p git-rev-parse 88s +++ : 88s ++ pathent= 88s ++ case "$pathent" in 88s ++ return 88s ++ t-set-intree 88s ++ '[' x = x ']' 88s ++ return 88s ++ : -D 88s ++ export DGIT_TEST_DEBUG 88s ++ : x 88s ++ export DGIT_TEST_DEBPUSH_DEBUG 88s ++ : 88s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 88s ++ GIT_COMMITTER_DATE='1530000000 +0100' 88s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 88s ++ GIT_AUTHOR_DATE='1530000000 +0100' 88s ++ export LC_CTYPE=C.UTF-8 88s ++ LC_CTYPE=C.UTF-8 88s ++ unset CDPATH 88s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 88s ++ FILTER_BRANCH_SQUELCH_WARNING=1 88s +++ pwd 88s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 88s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ testname=baredebian-plusgit 88s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ bpd=.. 88s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 88s ++ '[' x '!=' x ']' 88s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s +++ pwd 88s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ t-set-using-tmp 88s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 88s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 88s ++ export 'DEBFULLNAME=dgit test git user' 88s ++ DEBFULLNAME='dgit test git user' 88s ++ git config --global user.email dgit-test@debian.example.net 88s ++ git config --global user.name 'dgit test git user' 88s ++ git config --global protocol.ext.allow always 88s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 88s ++ env -0 88s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 88s ++ export DEBCHANGE_VENDOR=dpkg 88s ++ DEBCHANGE_VENDOR=dpkg 88s ++ unset VISUAL 88s ++ unset GIT_EDITOR 88s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 88s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 88s ++ cat 88s ++ schroot=build 88s ++ : aq 88s ++ : archive/test-dummy 88s ++ : sid:unstable 88s ++ t-git-config dgit.default.old-dsc-distro test-dummy 88s ++ git config --global dgit.default.old-dsc-distro test-dummy 88s ++ for import in ${autoimport-gnupg} 88s ++ case "$0" in 88s ++ t-setup-import gnupg 88s ++ local setupname=gnupg 88s ++ local setupsrc 88s ++ local lock 88s ++ '[' x = x ']' 88s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 88s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 88s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 88s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 88s cd "$1"; shift 88s setupname="$1"; shift 88s simport="$1"; shift 88s if [ -e "$simport" ]; then exit 0; fi 88s env - "$@" \ 88s "tests/setup/$setupname" 88s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 88s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 88s + shift 88s + setupname=gnupg 88s + shift 88s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 88s + shift 88s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 88s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-plusgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-plusgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 88s ++ set -o pipefail 88s ++ . tests/lib-core 88s ++ . tests/lib-restricts 88s ++ trap ' 88s rc=$? 88s set +x 88s test $rc = 0 || echo " 88s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 88s 88s Most relevant logs are just before assignment rc=$rc 88s Will now do cleanup etc. 88s " 88s set -x 88s set +e 88s pwd 88s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 88s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 88s set -e 88s test $rc = 0 || t-report-failure 88s ' EXIT 88s ++ t-filter-out-git-hyphen-dir 88s ++ local pathent 88s +++ type -p git-rev-parse 88s +++ : 88s ++ pathent= 88s ++ case "$pathent" in 88s ++ return 88s ++ t-set-intree 88s ++ '[' x = x ']' 88s ++ return 88s ++ : -D 88s ++ export DGIT_TEST_DEBUG 88s ++ : x 88s ++ export DGIT_TEST_DEBPUSH_DEBUG 88s ++ : 88s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 88s ++ GIT_COMMITTER_DATE='1530000000 +0100' 88s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 88s ++ GIT_AUTHOR_DATE='1530000000 +0100' 88s ++ export LC_CTYPE=C.UTF-8 88s ++ LC_CTYPE=C.UTF-8 88s ++ unset CDPATH 88s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 88s ++ FILTER_BRANCH_SQUELCH_WARNING=1 88s +++ pwd 88s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 88s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ testname=gnupg 88s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 88s ++ bpd=.. 88s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 88s ++ '[' x '!=' x ']' 88s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s +++ pwd 88s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ t-set-using-tmp 88s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 88s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 88s ++ export 'DEBFULLNAME=dgit test git user' 88s ++ DEBFULLNAME='dgit test git user' 88s ++ git config --global user.email dgit-test@debian.example.net 88s ++ git config --global user.name 'dgit test git user' 88s ++ git config --global protocol.ext.allow always 88s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 88s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 88s ++ export DEBCHANGE_VENDOR=dpkg 88s ++ DEBCHANGE_VENDOR=dpkg 88s ++ unset VISUAL 88s ++ unset GIT_EDITOR 88s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 88s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 88s ++ cat 88s ++ schroot=build 88s ++ : aq 88s ++ : archive/test-dummy 88s ++ : sid:unstable 88s ++ t-git-config dgit.default.old-dsc-distro test-dummy 88s ++ git config --global dgit.default.old-dsc-distro test-dummy 88s ++ for import in ${autoimport-gnupg} 88s ++ case "$0" in 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 88s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 88s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 88s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 88s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 88s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 88s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 88s + setup=' 88s export GNUPGHOME=$tmp/gnupg 88s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 88s 88s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 88s ssb rsa2048 2013-11-17 [E] 88s 88s sec rsa2048 2014-01-26 [SC] 88s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 88s uid [ultimate] Populus Romanus (test key) 88s ssb rsa2048 2014-01-26 [E] 88s 88s sec rsa2048 2014-01-26 [SC] 88s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 88s uid [ unknown] Hannibal (test key) 88s ssb rsa2048 2014-01-26 [E] 88s 88s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 88s export GNUPGHOME=$tmp/gnupg 88s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 88s 88s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 88s "sha256sum" => "$2", 88s "component" => "$3", 88s "filename" => "$4", 88s }; 88s END { 88s my $json = JSON->new->canonical(); 88s print $json->encode(\@v) or die $!; 88s } 88s ' 88s + t-aq-archive-updated new example 88s + local suite=new 88s + local p=example 88s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 88s + perl -wne ' 88s use JSON; 88s use strict; 88s our @v; 88s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 88s push @v, { 88s "version" => "$1", 88s "sha256sum" => "$2", 88s "component" => "$3", 88s "filename" => "$4", 88s }; 88s END { 88s my $json = JSON->new->canonical(); 88s print $json->encode(\@v) or die $!; 88s } 88s ' 88s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 88s + cat 88s + jsondelim=' },' 88s + cat 88s + t-git-none 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 88s + set -e 88s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 88s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 88s + t-gdr-gbp-import-core-with-queue 88s + t-gdr-gbp-import-core 88s + p=example 88s + t-worktree 1.1 88s + rm -rf example 88s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 88s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 88s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 88s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 88s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 88s + cd example 88s + : 'fake up some kind of upstream' 88s + git checkout -b upstream quilt-tip 88s Switched to a new branch 'upstream' 88s + rm -rf debian 88s + mkdir debian 88s + echo junk 88s + git add debian 88s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 88s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 88s 6 files changed, 1 insertion(+), 36 deletions(-) 88s delete mode 100644 debian/changelog 88s delete mode 100644 debian/compat 88s delete mode 100644 debian/control 88s delete mode 100644 debian/example.install 88s mode change 100755 => 100644 debian/rules 88s delete mode 100644 debian/source/format 88s + git tag v1.0 88s + : 'fake up that our quilt-tip was descended from upstream' 88s + git checkout quilt-tip 88s Switched to branch 'quilt-tip' 88s + git merge --no-edit -s ours upstream 88s Merge made by the 'ours' strategy. 88s + : 'fake up that our quilt-tip had the patch queue in it' 88s + git checkout patch-queue/quilt-tip 88s Switched to branch 'patch-queue/quilt-tip' 88s + gbp pq export 88s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 88s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 88s + git add debian/patches 88s + git commit -m 'patch queue update (tests/setup/baredebian)' 88s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 88s 4 files changed, 50 insertions(+) 88s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 88s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 88s create mode 100644 debian/patches/series 88s create mode 100644 debian/patches/subdir/addnewups 88s + : 'make branch names more conventional' 88s + git branch -D master 88s Deleted branch master (was 17d67db). 88s + git branch -m quilt-tip master 88s + git-deborig 88s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 88s + git branch -D patch-queue/quilt-tip 88s Deleted branch patch-queue/quilt-tip (was d843a68). 88s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 88s + git branch -D gitish-only 88s Deleted branch gitish-only (was 2b2ddc8). 88s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 88s + git branch -D quilt-tip-1.1 88s Deleted branch quilt-tip-1.1 (was 7fc34be). 88s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 88s + git branch -D quilt-tip-2 88s Deleted branch quilt-tip-2 (was 99fcab4). 88s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 88s + git branch -D indep-arch 88s Deleted branch indep-arch (was e215729). 88s + git rm -rf . 88s rm '.gitignore' 88s rm 'debian/changelog' 88s rm 'debian/compat' 88s rm 'debian/control' 88s rm 'debian/example.install' 88s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 88s rm 'debian/patches/0002-Edit-the-.c-file.patch' 88s rm 'debian/patches/series' 88s rm 'debian/patches/subdir/addnewups' 88s rm 'debian/rules' 88s rm 'debian/source/format' 88s rm 'docs/README' 88s rm 'example' 88s rm 'src.c' 88s + git checkout HEAD -- debian 88s ++ git write-tree 88s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 88s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 88s + t=5c410cc573946394fbd85950449595317108dca9 88s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 88s HEAD is now at 5c410cc Convert to bare debian 88s ++ echo 'example*' 88s + t-setup-done '' 'example* git mirror aq' ' 88s t-select-package example 88s t-git-next-date 88s ' 88s + local savevars= 88s + local 'savedirs=example* git mirror aq' 88s + local 'importeval= 88s t-select-package example 88s t-git-next-date 88s ' 88s + local import=IMPORT.baredebian 88s + exec 88s + local vn 88s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 88s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 88s print STDERR "saving-exporting $vn\n"; 88s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 88s or die $!; 88s } 88s ' 88s saving-exporting DGIT_TEST_REAL_DEBCHANGE 88s saving-exporting DGIT_TEST_REAL_GPG 88s saving-exporting DGIT_TEST_REAL_GPG_AGENT 88s + set -e 88s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 88s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 88s + printf '\n%s\n' ' 88s t-select-package example 88s t-git-next-date 88s ' 88s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 88s + rc=0 88s + set +x 88s + set +e 88s + pwd 88s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 88s + '[' x '!=' x ']' 88s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 88s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 88s + set -e 88s + test 0 = 0 88s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 88s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 88s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 88s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 88s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 88s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 88s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 88s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 88s ++ t-select-package example 88s ++ p=example 88s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 88s ++ t-git-next-date 88s ++ GIT_COMMITTER_DATE='1530000001 +0100' 88s ++ GIT_AUTHOR_DATE='1530000001 +0100' 88s + t-tstunt-parsechangelog 88s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 88s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s + local var=PATH 88s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s + eval ' 88s case "$PATH" in 88s "$tstunt:"*) ;; 88s *":$tstunt:"*) ;; 88s "") PATH="$tstunt" ;; 88s *) PATH="$tstunt:$PATH" ;; 88s esac 88s export PATH 88s ' 88s ++ case "$PATH" in 88s ++ export PATH 88s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s + local var=PERLLIB 88s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s + eval ' 88s case "$PERLLIB" in 88s "$tstunt:"*) ;; 88s *":$tstunt:"*) ;; 88s "") PERLLIB="$tstunt" ;; 88s *) PERLLIB="$tstunt:$PERLLIB" ;; 88s esac 88s export PERLLIB 88s ' 88s ++ case "$PERLLIB" in 88s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 88s ++ export PERLLIB 88s + local f 88s + for f in "$@" 88s + t-tstunt--save-real dpkg-parsechangelog 88s + local f=dpkg-parsechangelog 88s + case "$f" in 88s + local rc 88s + local real 88s + set +e 88s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 88s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 88s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 88s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 88s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 88s ++ type -p dpkg-parsechangelog 88s + real=/usr/bin/dpkg-parsechangelog 88s + rc=0 88s + set -e 88s + case $rc in 88s + local varname=dpkg_parsechangelog 88s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 88s + eval ' 88s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 88s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 88s ' 88s ++ : /usr/bin/dpkg-parsechangelog 88s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 88s + f=./dpkg-parsechangelog 88s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 88s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 88s + for f in "$@" 88s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 88s + local f=Dpkg/Changelog/Parse.pm 88s + case "$f" in 88s + return 88s + f=./Dpkg/Changelog/Parse.pm 88s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 88s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 88s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 88s + cd example 88s + baredebian-test-vars 88s + quiltmode=baredebian 88s + v=1.0-1 88s + suite=sid 88s + uv=1.0 88s + uvtag=v1.0 88s + origbase=example_1.0.orig 88s + xorigcomps= 88s + quiltmode=baredebian+git 88s + baredebian-test-minimum 88s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+git quilt-fixup 88s + local 'mpat=contradicts clean mode git-ff' 88s + shift 88s + set +o pipefail 88s + LC_MESSAGES=C 88s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 88s + LANGUAGE=C 88s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+git quilt-fixup 88s + local dgit=dgit 88s + pwd 88s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 88s + : ' 88s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 88s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --dgit-view-save=split.f1 --baredebian+git quilt-fixup 88s | git rev-parse --show-toplevel 88s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 88s | git config -z --get-regexp --local '.*' 88s | git config -z --get-regexp --local '.*' 88s | git config -z --get-regexp --global '.*' 88s | git config -z --get-regexp --system '.*' 88s format 3.0 (quilt), quilt mode baredebian 88s Format `3.0 (quilt)', need to check/update patch stack 88s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 88s => `' 88s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 88s => `aa9b15129f92e99418effffef1bae210b11b6eed' 88s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 88s => `' 88s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 88s => `aa9b15129f92e99418effffef1bae210b11b6eed' 88s dgit: --quilt=baredebian, using upstream from git tag v1.0 88s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 88s => `' 88s + git diff --quiet HEAD 88s 88s dgit: error: quilt mode baredebian (generally needs untracked upstream files) 88s dgit: contradicts clean mode git-ff (which would delete them) 88s + local 'ps=255 0' 88s + set -o pipefail 88s + case $ps in 88s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 88s + local 'mpat=contradicts clean mode git-ff' 88s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 88s + local grepper=fgrep 88s + case "$mpat" in 88s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 88s dgit: contradicts clean mode git-ff (which would delete them) 88s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+git quilt-fixup 88s + local dgit=dgit 88s + pwd 88s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 88s + : ' 88s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 88s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --dgit-view-save=split.f1 --baredebian+git quilt-fixup 89s | git rev-parse --show-toplevel 89s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 89s | git config -z --get-regexp --local '.*' 89s | git config -z --get-regexp --local '.*' 89s | git config -z --get-regexp --global '.*' 89s | git config -z --get-regexp --system '.*' 89s format 3.0 (quilt), quilt mode baredebian 89s Format `3.0 (quilt)', need to check/update patch stack 89s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 89s => `' 89s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 89s => `aa9b15129f92e99418effffef1bae210b11b6eed' 89s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 89s => `' 89s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 89s => `aa9b15129f92e99418effffef1bae210b11b6eed' 89s dgit: --quilt=baredebian, using upstream from git tag v1.0 89s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 89s => `' 89s + git diff --quiet HEAD 89s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 89s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 89s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 89s | git rev-parse 'HEAD~0' 89s => `5c410cc573946394fbd85950449595317108dca9' 89s | git symbolic-ref -q HEAD 89s => `refs/heads/master' 89s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 89s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 89s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 89s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 89s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 89s splitbrain cachekey dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed e262fbdbee85211bc73a6cc4a863860c5d89d45bd16e9facd69f9cd0927b17f6 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 89s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 89s >(no reflog) 89s splitbrain cache miss 89s CD work 89s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 89s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 89s + git checkout -q -b dgit-view 89s examining quilt state (multiple patches, baredebian mode) 89s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 89s CD fake 89s | find -name .git -prune -print0 89s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 89s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 89s + git add -Af . 89s | git write-tree 89s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 89s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 89s CD .. 89s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 89s CD ../fake 89s + git add -Af . 89s | git write-tree 89s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 89s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 89s CD ../work 89s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 89s => `debian\x00' 89s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed 89s => `:100644 000000 6f6830cf687e60a381ddb22f14e45a21b514cf59 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 9e8f73939dc78596676351d6e2f13f99f6adf51f 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 100644 41e210551949a27c6848cc5d233bfb65f94e3a14 a941931010167fd6cd8c7ea895d3468f26e67bde M\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 89s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed => 0 89s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 89s => `debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 89s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 89s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 89s => `lib.c\x00new-upstream-file\x00src.c\x00' 89s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 89s differences @dl == ## ## == == ==. 89s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 89s dgit: quilt differences: src: == orig ## gitignores: == orig == 89s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 89s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 89s => `1431548802 +0000' 89s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 89s + git rm --quiet -rf --cached --ignore-unmatch debian 89s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 89s | git write-tree 89s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 89s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 89s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-1 v1.0] 89s ' 89s => `b458f9044514fb0fed66d018e26e5fcc1a6dfeed' 89s + git reset -q --hard b458f9044514fb0fed66d018e26e5fcc1a6dfeed 89s dgit view: creating patches-applied version using gbp pq 89s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 89s + git update-ref refs/heads/dgit-view HEAD 89s + git checkout -q dgit-view 89s | git rev-parse 'HEAD~0' 89s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 89s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 89s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 89s => `' 89s + git update-ref -m 'dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed e262fbdbee85211bc73a6cc4a863860c5d89d45bd16e9facd69f9cd0927b17f6 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 89s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 89s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 89s dgit view: created (and left in refs/heads/split.f1) 89s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 89s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 89s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 89s ' 89s + t-ok 89s + : ======================================== 89s + t-check-only-bpd 89s + '[' .. = .. ']' 89s + return 89s + t-fscks 89s + shopt -s nullglob 89s + for d in $tmp/*/.git $tmp/git/*.git 89s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 89s + t-git-fsck 89s ++ git rev-parse --git-dir 89s + local fsckerrs=.git/dgit-test-fsck.errs 89s + set +e 89s + LC_MESSAGES=C 89s + git fsck --no-dangling --strict 89s + tee .git/dgit-test-fsck.errs 89s + ps='0 0' 89s + set -e 89s + local pats 89s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 89s + test '0 0' = '0 0' 89s + pats+=(-e 'notice: HEAD points to an unborn branch') 89s + pats+=(-e 'notice: No default references') 89s + set +e 89s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 89s + rc=1 89s + set -e 89s + case $rc in 89s + t-save-artifacts 89s + artifacts=/tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts 89s + '[' x/tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts = x ']' 89s + '[' xtmp = x ']' 89s + GZIP=-1v 89s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/baredebian-plusgit-artifacts/baredebian-plusgit.tar.gz '--exclude=*.tar' . 89s gzip: warning: GZIP environment variable is deprecated; use an alias or script 89s 77.0% 89s + echo ok. 89s ok. 89s + rc=0 89s + set +x 89s + set +e 89s + pwd 89s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 89s + '[' x '!=' x ']' 89s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 89s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 89s + set -e 89s + test 0 = 0 89s autopkgtest [12:19:43]: test baredebian-plusgit: -----------------------] 89s baredebian-plusgit PASS 89s autopkgtest [12:19:43]: test baredebian-plusgit: - - - - - - - - - - results - - - - - - - - - - 90s autopkgtest [12:19:44]: test baredebian-push: preparing testbed 90s Reading package lists... 90s Building dependency tree... 90s Reading state information... 90s Starting pkgProblemResolver with broken count: 0 90s Starting 2 pkgProblemResolver with broken count: 0 90s Done 91s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 91s autopkgtest [12:19:45]: test baredebian-push: [----------------------- 91s ++ set -o pipefail 91s ++ . tests/lib-core 91s ++ . tests/lib-restricts 91s ++ trap ' 91s rc=$? 91s set +x 91s test $rc = 0 || echo " 91s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 91s 91s Most relevant logs are just before assignment rc=$rc 91s Will now do cleanup etc. 91s " 91s set -x 91s set +e 91s pwd 91s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 91s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 91s set -e 91s test $rc = 0 || t-report-failure 91s ' EXIT 91s ++ t-filter-out-git-hyphen-dir 91s ++ local pathent 91s +++ type -p git-rev-parse 91s +++ : 91s ++ pathent= 91s ++ case "$pathent" in 91s ++ return 91s ++ t-set-intree 91s ++ '[' x = x ']' 91s ++ return 91s ++ : -D 91s ++ export DGIT_TEST_DEBUG 91s ++ : x 91s ++ export DGIT_TEST_DEBPUSH_DEBUG 91s ++ : 91s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 91s ++ GIT_COMMITTER_DATE='1530000000 +0100' 91s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 91s ++ GIT_AUTHOR_DATE='1530000000 +0100' 91s ++ export LC_CTYPE=C.UTF-8 91s ++ LC_CTYPE=C.UTF-8 91s ++ unset CDPATH 91s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 91s ++ FILTER_BRANCH_SQUELCH_WARNING=1 91s +++ pwd 91s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 91s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ testname=baredebian-push 91s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ bpd=.. 91s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 91s ++ '[' x '!=' x ']' 91s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s +++ pwd 91s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ t-set-using-tmp 91s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 91s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 91s ++ export 'DEBFULLNAME=dgit test git user' 91s ++ DEBFULLNAME='dgit test git user' 91s ++ git config --global user.email dgit-test@debian.example.net 91s ++ git config --global user.name 'dgit test git user' 91s ++ git config --global protocol.ext.allow always 91s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 91s ++ env -0 91s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 91s ++ export DEBCHANGE_VENDOR=dpkg 91s ++ DEBCHANGE_VENDOR=dpkg 91s ++ unset VISUAL 91s ++ unset GIT_EDITOR 91s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 91s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 91s ++ cat 91s ++ schroot=build 91s ++ : aq 91s ++ : archive/test-dummy 91s ++ : sid:unstable 91s ++ t-git-config dgit.default.old-dsc-distro test-dummy 91s ++ git config --global dgit.default.old-dsc-distro test-dummy 91s ++ for import in ${autoimport-gnupg} 91s ++ case "$0" in 91s ++ t-setup-import gnupg 91s ++ local setupname=gnupg 91s ++ local setupsrc 91s ++ local lock 91s ++ '[' x = x ']' 91s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 91s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 91s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 91s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 91s cd "$1"; shift 91s setupname="$1"; shift 91s simport="$1"; shift 91s if [ -e "$simport" ]; then exit 0; fi 91s env - "$@" \ 91s "tests/setup/$setupname" 91s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 91s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 91s + shift 91s + setupname=gnupg 91s + shift 91s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 91s + shift 91s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 91s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/baredebian-push-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/baredebian-push-stderr --stdout=/tmp/autopkgtest.ztMUxl/baredebian-push-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-push -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-push' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-push-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-push-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 91s ++ set -o pipefail 91s ++ . tests/lib-core 91s ++ . tests/lib-restricts 91s ++ trap ' 91s rc=$? 91s set +x 91s test $rc = 0 || echo " 91s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 91s 91s Most relevant logs are just before assignment rc=$rc 91s Will now do cleanup etc. 91s " 91s set -x 91s set +e 91s pwd 91s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 91s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 91s set -e 91s test $rc = 0 || t-report-failure 91s ' EXIT 91s ++ t-filter-out-git-hyphen-dir 91s ++ local pathent 91s +++ type -p git-rev-parse 91s +++ : 91s ++ pathent= 91s ++ case "$pathent" in 91s ++ return 91s ++ t-set-intree 91s ++ '[' x = x ']' 91s ++ return 91s ++ : -D 91s ++ export DGIT_TEST_DEBUG 91s ++ : x 91s ++ export DGIT_TEST_DEBPUSH_DEBUG 91s ++ : 91s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 91s ++ GIT_COMMITTER_DATE='1530000000 +0100' 91s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 91s ++ GIT_AUTHOR_DATE='1530000000 +0100' 91s ++ export LC_CTYPE=C.UTF-8 91s ++ LC_CTYPE=C.UTF-8 91s ++ unset CDPATH 91s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 91s ++ FILTER_BRANCH_SQUELCH_WARNING=1 91s +++ pwd 91s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 91s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ testname=gnupg 91s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 91s ++ bpd=.. 91s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 91s ++ '[' x '!=' x ']' 91s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s +++ pwd 91s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ t-set-using-tmp 91s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 91s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 91s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 91s ++ export 'DEBFULLNAME=dgit test git user' 91s ++ DEBFULLNAME='dgit test git user' 91s ++ git config --global user.email dgit-test@debian.example.net 91s ++ git config --global user.name 'dgit test git user' 91s ++ git config --global protocol.ext.allow always 91s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 91s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 91s ++ export DEBCHANGE_VENDOR=dpkg 91s ++ DEBCHANGE_VENDOR=dpkg 91s ++ unset VISUAL 91s ++ unset GIT_EDITOR 91s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 91s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 91s ++ cat 91s ++ schroot=build 91s ++ : aq 91s ++ : archive/test-dummy 91s ++ : sid:unstable 91s ++ t-git-config dgit.default.old-dsc-distro test-dummy 91s ++ git config --global dgit.default.old-dsc-distro test-dummy 91s ++ for import in ${autoimport-gnupg} 91s ++ case "$0" in 91s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 91s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 91s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 91s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 91s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 91s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 91s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 91s + setup=' 91s export GNUPGHOME=$tmp/gnupg 91s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 91s 91s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 91s ssb rsa2048 2013-11-17 [E] 91s 91s sec rsa2048 2014-01-26 [SC] 91s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 91s uid [ultimate] Populus Romanus (test key) 91s ssb rsa2048 2014-01-26 [E] 91s 91s sec rsa2048 2014-01-26 [SC] 91s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 91s uid [ unknown] Hannibal (test key) 91s ssb rsa2048 2014-01-26 [E] 91s 91s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 91s export GNUPGHOME=$tmp/gnupg 91s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 91s 91s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 91s "sha256sum" => "$2", 91s "component" => "$3", 91s "filename" => "$4", 91s }; 91s END { 91s my $json = JSON->new->canonical(); 91s print $json->encode(\@v) or die $!; 91s } 91s ' 91s + t-aq-archive-updated new example 91s + local suite=new 91s + local p=example 91s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 91s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 91s + perl -wne ' 91s use JSON; 91s use strict; 91s our @v; 91s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 91s push @v, { 91s "version" => "$1", 91s "sha256sum" => "$2", 91s "component" => "$3", 91s "filename" => "$4", 91s }; 91s END { 91s my $json = JSON->new->canonical(); 91s print $json->encode(\@v) or die $!; 91s } 91s ' 91s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 91s + cat 91s + jsondelim=' },' 91s + cat 91s + t-git-none 91s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 91s + set -e 91s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 91s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 91s + t-gdr-gbp-import-core-with-queue 91s + t-gdr-gbp-import-core 91s + p=example 91s + t-worktree 1.1 91s + rm -rf example 91s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 91s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 91s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 91s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 91s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 91s + cd example 91s + : 'fake up some kind of upstream' 91s + git checkout -b upstream quilt-tip 91s Switched to a new branch 'upstream' 91s + rm -rf debian 91s + mkdir debian 91s + echo junk 91s + git add debian 91s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 91s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 91s 6 files changed, 1 insertion(+), 36 deletions(-) 91s delete mode 100644 debian/changelog 91s delete mode 100644 debian/compat 91s delete mode 100644 debian/control 91s delete mode 100644 debian/example.install 91s mode change 100755 => 100644 debian/rules 91s delete mode 100644 debian/source/format 91s + git tag v1.0 91s + : 'fake up that our quilt-tip was descended from upstream' 91s + git checkout quilt-tip 91s Switched to branch 'quilt-tip' 91s + git merge --no-edit -s ours upstream 91s Merge made by the 'ours' strategy. 91s + : 'fake up that our quilt-tip had the patch queue in it' 91s + git checkout patch-queue/quilt-tip 91s Switched to branch 'patch-queue/quilt-tip' 91s + gbp pq export 91s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 91s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 91s + git add debian/patches 91s + git commit -m 'patch queue update (tests/setup/baredebian)' 91s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 91s 4 files changed, 50 insertions(+) 91s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 91s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 91s create mode 100644 debian/patches/series 91s create mode 100644 debian/patches/subdir/addnewups 91s + : 'make branch names more conventional' 91s + git branch -D master 91s Deleted branch master (was 17d67db). 91s + git branch -m quilt-tip master 91s + git-deborig 92s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 92s + git branch -D patch-queue/quilt-tip 92s Deleted branch patch-queue/quilt-tip (was d843a68). 92s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 92s + git branch -D gitish-only 92s Deleted branch gitish-only (was 2b2ddc8). 92s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 92s + git branch -D quilt-tip-1.1 92s Deleted branch quilt-tip-1.1 (was 7fc34be). 92s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 92s + git branch -D quilt-tip-2 92s Deleted branch quilt-tip-2 (was 99fcab4). 92s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 92s + git branch -D indep-arch 92s Deleted branch indep-arch (was e215729). 92s + git rm -rf . 92s rm '.gitignore' 92s rm 'debian/changelog' 92s rm 'debian/compat' 92s rm 'debian/control' 92s rm 'debian/example.install' 92s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 92s rm 'debian/patches/0002-Edit-the-.c-file.patch' 92s rm 'debian/patches/series' 92s rm 'debian/patches/subdir/addnewups' 92s rm 'debian/rules' 92s rm 'debian/source/format' 92s rm 'docs/README' 92s rm 'example' 92s rm 'src.c' 92s + git checkout HEAD -- debian 92s ++ git write-tree 92s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 92s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 92s + t=5c410cc573946394fbd85950449595317108dca9 92s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 92s HEAD is now at 5c410cc Convert to bare debian 92s ++ echo 'example*' 92s + t-setup-done '' 'example* git mirror aq' ' 92s t-select-package example 92s t-git-next-date 92s ' 92s + local savevars= 92s + local 'savedirs=example* git mirror aq' 92s + local 'importeval= 92s t-select-package example 92s t-git-next-date 92s ' 92s + local import=IMPORT.baredebian 92s + exec 92s + local vn 92s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 92s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 92s print STDERR "saving-exporting $vn\n"; 92s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 92s or die $!; 92s } 92s ' 92s saving-exporting DGIT_TEST_REAL_GPG 92s saving-exporting DGIT_TEST_REAL_DEBCHANGE 92s saving-exporting DGIT_TEST_REAL_GPG_AGENT 92s + set -e 92s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 92s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 92s + printf '\n%s\n' ' 92s t-select-package example 92s t-git-next-date 92s ' 92s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 92s + rc=0 92s + set +x 92s + set +e 92s + pwd 92s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 92s + '[' x '!=' x ']' 92s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 92s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 92s + set -e 92s + test 0 = 0 92s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 92s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 92s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 92s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 92s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 92s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 92s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 92s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 92s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 92s ++ t-select-package example 92s ++ p=example 92s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 92s ++ t-git-next-date 92s ++ GIT_COMMITTER_DATE='1530000001 +0100' 92s ++ GIT_AUTHOR_DATE='1530000001 +0100' 92s + t-tstunt-parsechangelog 92s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 92s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s + local var=PATH 92s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s + eval ' 92s case "$PATH" in 92s "$tstunt:"*) ;; 92s *":$tstunt:"*) ;; 92s "") PATH="$tstunt" ;; 92s *) PATH="$tstunt:$PATH" ;; 92s esac 92s export PATH 92s ' 92s ++ case "$PATH" in 92s ++ export PATH 92s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s + local var=PERLLIB 92s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s + eval ' 92s case "$PERLLIB" in 92s "$tstunt:"*) ;; 92s *":$tstunt:"*) ;; 92s "") PERLLIB="$tstunt" ;; 92s *) PERLLIB="$tstunt:$PERLLIB" ;; 92s esac 92s export PERLLIB 92s ' 92s ++ case "$PERLLIB" in 92s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 92s ++ export PERLLIB 92s + local f 92s + for f in "$@" 92s + t-tstunt--save-real dpkg-parsechangelog 92s + local f=dpkg-parsechangelog 92s + case "$f" in 92s + local rc 92s + local real 92s + set +e 92s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 92s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 92s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 92s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 92s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 92s ++ type -p dpkg-parsechangelog 92s + real=/usr/bin/dpkg-parsechangelog 92s + rc=0 92s + set -e 92s + case $rc in 92s + local varname=dpkg_parsechangelog 92s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 92s + eval ' 92s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 92s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 92s ' 92s ++ : /usr/bin/dpkg-parsechangelog 92s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 92s + f=./dpkg-parsechangelog 92s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 92s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 92s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 92s + for f in "$@" 92s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 92s + local f=Dpkg/Changelog/Parse.pm 92s + case "$f" in 92s + return 92s + f=./Dpkg/Changelog/Parse.pm 92s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 92s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 92s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 92s + cd example 92s + baredebian-test 92s + baredebian-test-vars 92s + quiltmode=baredebian 92s + v=1.0-1 92s + suite=sid 92s + uv=1.0 92s + uvtag=v1.0 92s + origbase=example_1.0.orig 92s + xorigcomps= 92s + baredebian-test-minimum 92s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup 92s + local 'mpat=contradicts clean mode git-ff' 92s + shift 92s + set +o pipefail 92s + LC_MESSAGES=C 92s + LANGUAGE=C 92s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup 92s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 92s + local dgit=dgit 92s + pwd 92s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 92s + : ' 92s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 92s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup 92s | git rev-parse --show-toplevel 92s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 92s | git config -z --get-regexp --local '.*' 92s | git config -z --get-regexp --local '.*' 92s | git config -z --get-regexp --global '.*' 92s | git config -z --get-regexp --system '.*' 92s format 3.0 (quilt), quilt mode baredebian 92s Format `3.0 (quilt)', need to check/update patch stack 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 92s => `' 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 92s => `aa9b15129f92e99418effffef1bae210b11b6eed' 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 92s => `' 92s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 92s => `aa9b15129f92e99418effffef1bae210b11b6eed' 92s dgit: --quilt=baredebian, using upstream from git tag v1.0 92s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 92s => `' 92s + git diff --quiet HEAD 92s 92s dgit: error: quilt mode baredebian (generally needs untracked upstream files) 92s dgit: contradicts clean mode git-ff (which would delete them) 92s + local 'ps=255 0' 92s + set -o pipefail 92s + case $ps in 92s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 92s + local 'mpat=contradicts clean mode git-ff' 92s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 92s + local grepper=fgrep 92s + case "$mpat" in 92s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 92s dgit: contradicts clean mode git-ff (which would delete them) 92s + t-dgit -wn --dgit-view-save=split.f1 --baredebian quilt-fixup 92s + local dgit=dgit 92s + pwd 92s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 92s + : ' 92s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 92s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --dgit-view-save=split.f1 --baredebian quilt-fixup 92s | git rev-parse --show-toplevel 92s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 92s | git config -z --get-regexp --local '.*' 92s | git config -z --get-regexp --local '.*' 92s | git config -z --get-regexp --global '.*' 92s | git config -z --get-regexp --system '.*' 92s format 3.0 (quilt), quilt mode baredebian 92s Format `3.0 (quilt)', need to check/update patch stack 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 92s => `' 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 92s => `aa9b15129f92e99418effffef1bae210b11b6eed' 92s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 92s => `' 92s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 92s => `aa9b15129f92e99418effffef1bae210b11b6eed' 92s dgit: --quilt=baredebian, using upstream from git tag v1.0 92s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 92s => `' 92s + git diff --quiet HEAD 92s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 92s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 92s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 92s | git rev-parse 'HEAD~0' 92s => `5c410cc573946394fbd85950449595317108dca9' 92s | git symbolic-ref -q HEAD 92s => `refs/heads/master' 92s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 92s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 92s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 92s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 92s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 92s splitbrain cachekey dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 4d13be4919b4503d47ebdfcfe7223fe277bf023beb3233d36fcbe1d3740a42e8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 92s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 92s >(no reflog) 92s splitbrain cache miss 92s CD work 92s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 92s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 92s + git checkout -q -b dgit-view 92s examining quilt state (multiple patches, baredebian mode) 92s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 92s CD fake 92s | find -name .git -prune -print0 92s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 92s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 92s + git add -Af . 92s | git write-tree 92s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 92s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 92s CD .. 92s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 92s CD ../fake 92s + git add -Af . 92s | git write-tree 92s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 92s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 92s CD ../work 92s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 92s => `debian\x00' 92s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed 92s => `:100644 000000 6f6830cf687e60a381ddb22f14e45a21b514cf59 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 9e8f73939dc78596676351d6e2f13f99f6adf51f 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 100644 41e210551949a27c6848cc5d233bfb65f94e3a14 a941931010167fd6cd8c7ea895d3468f26e67bde M\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 92s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 aa9b15129f92e99418effffef1bae210b11b6eed => 0 92s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 92s => `debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 92s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 92s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 92s => `lib.c\x00new-upstream-file\x00src.c\x00' 92s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 92s differences @dl == ## ## == == ==. 92s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 92s dgit: quilt differences: src: == orig ## gitignores: == orig == 92s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 92s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 92s => `1431548802 +0000' 92s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 92s + git rm --quiet -rf --cached --ignore-unmatch debian 92s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 92s | git write-tree 92s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 92s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 92s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-1 v1.0] 92s ' 92s => `b458f9044514fb0fed66d018e26e5fcc1a6dfeed' 92s + git reset -q --hard b458f9044514fb0fed66d018e26e5fcc1a6dfeed 92s dgit view: creating patches-applied version using gbp pq 92s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 92s + git update-ref refs/heads/dgit-view HEAD 92s + git checkout -q dgit-view 92s | git rev-parse 'HEAD~0' 92s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 92s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 92s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 92s => `' 92s + git update-ref -m 'dgit 9.15 1.0 baredebian 5c410cc573946394fbd85950449595317108dca9 aa9b15129f92e99418effffef1bae210b11b6eed 4d13be4919b4503d47ebdfcfe7223fe277bf023beb3233d36fcbe1d3740a42e8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 92s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 92s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c 92s dgit view: created (and left in refs/heads/split.f1) 92s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 92s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 92s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 92s ' 92s + baredebian-test-core 92s + baredebian-test-core-prepush 92s + tar --strip-components=1 -axf ../example_1.0.orig.tar.xz 92s + cd debian 92s + git clean -xdff 92s + git checkout HEAD -- . 92s + cd .. 92s + export QUILT_PATCHES=debian/patches 92s + QUILT_PATCHES=debian/patches 92s + quilt push -a 92s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 92s patching file new-upstream-file 92s 92s Applying patch debian/patches/0002-Edit-the-.c-file.patch 92s patching file src.c 92s 92s Applying patch debian/patches/subdir/addnewups 92s patching file lib.c 92s 92s Now at patch debian/patches/subdir/addnewups 92s + git add -Af . 92s + git reset .pc 92s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 92s + git diff --exit-code HEAD..split.f1 -- :/debian 92s + git reset 92s + quilt new made-with-quilt 92s Patch debian/patches/made-with-quilt is now on top 92s + quilt add src.c 92s File src.c added to patch debian/patches/made-with-quilt 92s + echo //omg 92s + quilt refresh 93s Refreshed patch debian/patches/made-with-quilt 93s + git add debian/patches/. 93s + t-commit 'extra patch made with quilt' 1.0-2 93s + local 'msg=extra patch made with quilt' 93s + v=1.0-2 93s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 93s + DEBEMAIL=dgit-tests@example.org 93s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 93s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange --force-distribution -v1.0-2 --distribution unstable extra patch made with quilt 93s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 93s libdistro-info-perl is not installed, Debian release names are not known. 93s libdistro-info-perl is not installed, Ubuntu release names are not known. 93s + git add debian/changelog 93s + debcommit 93s git commit -m 'extra patch made with quilt' 93s [master d0c1094] extra patch made with quilt 93s 3 files changed, 14 insertions(+) 93s create mode 100644 debian/patches/made-with-quilt 93s + revision=1 93s + t-refs-same-start 93s + unset t_ref_val 93s + t_ref_names=() 93s + t-ref-head 93s + local val 93s ++ git rev-parse HEAD 93s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + local name=HEAD 93s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + case "${t_ref_val-unset}" in 93s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + t_ref_names+=("$name") 93s + t-dgit -wn --quilt=baredebian --dgit-view-save=split.b quilt-fixup 93s + local dgit=dgit 93s + pwd 93s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 93s + : ' 93s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 93s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian --dgit-view-save=split.b quilt-fixup 93s | git rev-parse --show-toplevel 93s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 93s | git config -z --get-regexp --local '.*' 93s | git config -z --get-regexp --local '.*' 93s | git config -z --get-regexp --global '.*' 93s | git config -z --get-regexp --system '.*' 93s format 3.0 (quilt), quilt mode baredebian 93s Format `3.0 (quilt)', need to check/update patch stack 93s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 93s => `' 93s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 93s => `aa9b15129f92e99418effffef1bae210b11b6eed' 93s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 93s => `' 93s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 93s => `aa9b15129f92e99418effffef1bae210b11b6eed' 93s dgit: --quilt=baredebian, using upstream from git tag v1.0 93s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 93s => `' 93s + git diff --quiet HEAD 93s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 93s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 93s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 93s | git rev-parse 'HEAD~0' 93s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 93s | git symbolic-ref -q HEAD 93s => `refs/heads/master' 93s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 93s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 93s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 93s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 93s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 93s splitbrain cachekey dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed c9c848831ec1a1b7365959b6d17c804ce55c1c8e69dcb35df9ff2cdd159cfe7a 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 93s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 93s splitbrain cache miss 93s CD work 93s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 93s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + git checkout -q -b dgit-view 93s examining quilt state (multiple patches, baredebian mode) 93s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 93s CD fake 93s | find -name .git -prune -print0 93s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 93s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 93s + git add -Af . 93s | git write-tree 93s => `13afe261a5f954761b36d126fa74b978765116a8' 93s fake orig tree object 13afe261a5f954761b36d126fa74b978765116a8 93s CD .. 93s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s CD ../fake 93s + git add -Af . 93s | git write-tree 93s => `09583ba28b17d629329903d2cfda3a22eceef550' 93s fake o+d/p tree object 13afe261a5f954761b36d126fa74b978765116a8 93s CD ../work 93s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s => `debian\x00' 93s | git diff-tree -z --no-renames -r 13afe261a5f954761b36d126fa74b978765116a8 aa9b15129f92e99418effffef1bae210b11b6eed 93s => `:100644 000000 94f588d88ada8ca51628feea02d735b931cc33d0 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 8aab1b8d48eeef16e2501a1a88b46da32dd4667f 0000000000000000000000000000000000000000 D\x00debian/patches/made-with-quilt\x00:100644 000000 47b57013afc48c2b0afa225e09b019bfb6e8cc25 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 100644 41e210551949a27c6848cc5d233bfb65f94e3a14 a941931010167fd6cd8c7ea895d3468f26e67bde M\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 93s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 aa9b15129f92e99418effffef1bae210b11b6eed => 0 93s | git diff-tree -z --no-renames --name-only -r aa9b15129f92e99418effffef1bae210b11b6eed 09583ba28b17d629329903d2cfda3a22eceef550 93s => `debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/made-with-quilt\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 93s quiltify_trees_differ aa9b15129f92e99418effffef1bae210b11b6eed 09583ba28b17d629329903d2cfda3a22eceef550 => 1 93s | git diff-tree -z --no-renames --name-only -r 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 93s => `lib.c\x00new-upstream-file\x00src.c\x00' 93s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 => 1 93s differences @dl == ## ## == == ==. 93s dgit: base trees orig=13afe261a5f954761b36 o+d/p=09583ba28b17d6293299 93s dgit: quilt differences: src: == orig ## gitignores: == orig == 93s dgit: quilt differences: upstream ## o+d/p upstream == o+d/p 93s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 93s => `1530000001 +0000' 93s + git read-tree aa9b15129f92e99418effffef1bae210b11b6eed 93s + git rm --quiet -rf --cached --ignore-unmatch debian 93s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 93s | git write-tree 93s => `13afe261a5f954761b36d126fa74b978765116a8' 93s | git commit-tree 13afe261a5f954761b36d126fa74b978765116a8 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p aa9b15129f92e99418effffef1bae210b11b6eed -m 'Combine debian/ with upstream source for 1.0 93s ' -m 'using upstream from git tag v1.0' -m '[dgit (9.15) baredebian-merge 1.0-2 v1.0] 93s ' 93s => `48a67f5916c472f60fce0570f52fe1cbc2a816b4' 93s + git reset -q --hard 48a67f5916c472f60fce0570f52fe1cbc2a816b4 93s dgit view: creating patches-applied version using gbp pq 93s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 93s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 93s + git update-ref refs/heads/dgit-view HEAD 93s + git checkout -q dgit-view 93s | git rev-parse 'HEAD~0' 93s => `446b27d44feb30f14d38c53e07fafadd95dc90ef' 93s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 93s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 93s => `47a78c7bb5438d448afd6ff1c4f0e465e39d5c1c' 93s + git update-ref -m 'dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed c9c848831ec1a1b7365959b6d17c804ce55c1c8e69dcb35df9ff2cdd159cfe7a 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 446b27d44feb30f14d38c53e07fafadd95dc90ef 93s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 93s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b 446b27d44feb30f14d38c53e07fafadd95dc90ef 93s dgit view: created (and left in refs/heads/split.b) 93s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 93s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 93s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 93s ' 93s + t-ref-head 93s + local val 93s ++ git rev-parse HEAD 93s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + local name=HEAD 93s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + case "${t_ref_val-unset}" in 93s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 93s + t_ref_names+=("$name") 93s + baredebian-test-core-push 93s + dpkg-buildpackage -uc -us --build=source 93s dpkg-buildpackage: info: source package example 93s dpkg-buildpackage: info: source version 1.0-2 93s dpkg-buildpackage: info: source distribution unstable 93s dpkg-buildpackage: info: source changed by dgit test git user 93s dpkg-source --before-build . 94s fakeroot debian/rules clean 94s EXAMPLE RULES TARGET clean 94s dh_clean 94s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 94s dpkg-source -b . 94s dpkg-source: info: using source format '3.0 (quilt)' 94s dpkg-source: info: building example using existing ./example_1.0.orig.tar.xz 94s dpkg-source: info: using patch list from debian/patches/series 94s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 94s dpkg-source: info: building example in example_1.0-2.dsc 94s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 94s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 94s dpkg-genchanges: info: not including original source code in upload 94s dpkg-source --after-build . 94s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 94s + t-dgit -wn --quilt=baredebian --dgit-view-save=split.p --new push 94s + local dgit=dgit 94s + pwd 94s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 94s + : ' 94s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 94s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian --dgit-view-save=split.p --new push 94s | git rev-parse --show-toplevel 94s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 94s | git config -z --get-regexp --local '.*' 94s | git config -z --get-regexp --local '.*' 94s | git config -z --get-regexp --global '.*' 94s | git config -z --get-regexp --system '.*' 94s format 3.0 (quilt), quilt mode baredebian 94s Format `3.0 (quilt)', need to check/update patch stack 94s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 94s => `' 94s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 94s => `aa9b15129f92e99418effffef1bae210b11b6eed' 94s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 94s => `' 94s | git rev-parse 'aa9b15129f92e99418effffef1bae210b11b6eed~0' 94s => `aa9b15129f92e99418effffef1bae210b11b6eed' 94s dgit: --quilt=baredebian, using upstream from git tag v1.0 94s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 94s => `' 94s + git diff --quiet HEAD 94s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 94s canonical suite name for unstable is sid 94s actually entering push 94s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 94s => `0' 94s + git config remote.dgit.skipdefaultupdate true 94s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 94s get_archive_dsc: nothing in archive, returning undef 94s no version available from the archive 94s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 94s => `' 94s previous reference hash= 94s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 94s => `' 94s fetch_from_archive: lastfetch= 94s nothing found! 94s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 94s + git check-ref-format archive/test-dummy/1.0-2 94s | git symbolic-ref -q HEAD 94s => `refs/heads/master' 94s | git rev-parse 'HEAD~0' 94s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 94s ffq_prev_branchinfo branch current refs/heads/master 94s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 94s => `' 94s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 94s => `' 94s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 94s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 94s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 94s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 94s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian). 94s splitbrain cachekey dgit 9.15 1.0 baredebian d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 aa9b15129f92e99418effffef1bae210b11b6eed c9c848831ec1a1b7365959b6d17c804ce55c1c8e69dcb35df9ff2cdd159cfe7a 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 94s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 94s CD work 94s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 94s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 94s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p 446b27d44feb30f14d38c53e07fafadd95dc90ef 94s dgit view: found cached (and left in refs/heads/split.p) 94s + git checkout -q -b dgit-view 446b27d44feb30f14d38c53e07fafadd95dc90ef 94s splitbrain_pseudomerge... 94s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 94s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 94s => `' 94s + git diff --quiet HEAD 94s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 94s => `' 94s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 94s checking that example_1.0-2.dsc corresponds to HEAD 94s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc 94s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc) 94s dpkg-source: info: extracting example in example-1.0 94s dpkg-source: info: unpacking example_1.0.orig.tar.xz 94s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 94s dpkg-source: info: using patch list from debian/patches/series 94s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 94s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 94s dpkg-source: info: applying subdir/addnewups 94s dpkg-source: info: applying made-with-quilt 94s CD example-1.0 94s | find -name .git -prune -print0 94s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 94s + git add -Af . 94s | git write-tree 94s => `09583ba28b17d629329903d2cfda3a22eceef550' 94s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 94s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 94s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 94s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 94s + git diff --quiet 09583ba28b17d629329903d2cfda3a22eceef550 446b27d44feb30f14d38c53e07fafadd95dc90ef 94s files_compare_inputs example_1.0-2.dsc 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.xz 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.xz 94s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2.dsc Files 94s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.xz 94s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2_source.changes 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 94s files_compare_inputs example_1.0-2_source.changes Files 94s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 94s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 94s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 94s checking origs needed (1.0)... 94s checking origs needed placement 'devel extra'... 94s origs example_1.0.orig.tar.xz | 9ff3b1cef499c0c890e9366b9da974c2 460 example_1.0.orig.tar.xz 94s origs example_1.0.orig.tar.xz is_orig 94s -| sh -ec 'cd "$1"; shift 94s 94s find -name "$1" -print0 | 94s xargs -0r sha256sum 94s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_1.0.orig.tar.xz 94s origs example_1.0.orig.tar.xz $#$have=-1 94s origs example_1.0.orig.tar.xz f.same=0 #f._differ=-1 94s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 94s edited .changes for archive .orig contents: added example_1.0.orig.tar.xz 94s push_tagwants: $VAR1 = [ 94s '1.0-2', 94s '446b27d44feb30f14d38c53e07fafadd95dc90ef', 94s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 94s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 94s ]; 94s $VAR2 = [ 94s { 94s 'View' => 'dgit', 94s 'Objid' => '446b27d44feb30f14d38c53e07fafadd95dc90ef', 94s 'Tfn' => sub { "DUMMY" }, 94s 'Tag' => 'archive/test-dummy/1.0-2', 94s 'TfSuffix' => '', 94s 'TagFn' => sub { "DUMMY" } 94s }, 94s { 94s 'TfSuffix' => '-maintview', 94s 'TagFn' => sub { "DUMMY" }, 94s 'Tag' => 'test-dummy/1.0-2', 94s 'View' => 'maint', 94s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 94s 'Tfn' => sub { "DUMMY" } 94s } 94s ]; 94s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 94s => `1530000001 +0000' 94s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 94s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 94s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 94s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 95s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 95s => `7840ba04c31540a386a4cdbe6b5eeda5eb4e453e' 95s + git verify-tag 7840ba04c31540a386a4cdbe6b5eeda5eb4e453e 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: Signature made Mon Mar 31 12:19:48 2025 UTC 95s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 95s gpg: WARNING: This key is not certified with a trusted signature! 95s gpg: There is no indication that the signature belongs to the owner. 95s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 95s + git update-ref refs/tags/archive/test-dummy/1.0-2 7840ba04c31540a386a4cdbe6b5eeda5eb4e453e 95s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 95s => `b0e57c35206b2542fbec8627a4c72c8ba4825713' 95s + git verify-tag b0e57c35206b2542fbec8627a4c72c8ba4825713 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: Signature made Mon Mar 31 12:19:49 2025 UTC 95s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 95s gpg: WARNING: This key is not certified with a trusted signature! 95s gpg: There is no indication that the signature belongs to the owner. 95s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 95s + git update-ref refs/tags/test-dummy/1.0-2 b0e57c35206b2542fbec8627a4c72c8ba4825713 95s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 95s => `0' 95s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 95s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 446b27d44feb30f14d38c53e07fafadd95dc90ef:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 95s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 95s * [new reference] 446b27d44feb30f14d38c53e07fafadd95dc90ef -> refs/dgit/sid 95s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 95s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 95s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 95s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s 95s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 95s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s 95s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 95s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 95s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s 95s Successfully signed dsc, buildinfo, changes files 95s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 95s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 95s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 95s D: Setting host argument. 95s Checking signature on .changes 95s Checking signature on .dsc 95s Uploading to test-dummy (via local to localhost): 95s Successfully uploaded packages. 95s dgit ok: pushed and uploaded 1.0-2 95s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 95s del_lrfetchrefs... 95s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 95s ' 95s + baredebian-test-core-postpush 95s + git merge-base --is-ancestor HEAD split.p 95s + '[' v1.0 ']' 95s + git merge-base --is-ancestor v1.0 split.p 95s + set +e 95s + git merge-base HEAD v1.0 95s + rc=1 95s + set -e 95s + '[' 1 = 1 ']' 95s + git clean -xdff 95s Removing .gitignore 95s Removing .pc/ 95s Removing debian/files 95s Removing docs/ 95s Removing example 95s Removing lib.c 95s Removing new-upstream-file 95s Removing src.c 95s + t-splitbrain-pushed-good-start 95s + dep14tag=refs/tags/test-dummy/1.0-2 95s ++ t-v-tag 95s ++ echo refs/tags/archive/test-dummy/1.0-2 95s + dgittag=refs/tags/archive/test-dummy/1.0-2 95s + t-output '' git status --porcelain 95s + printf %s '' 95s + shift 95s + git status --porcelain 95s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 95s + t-ref-head 95s + local val 95s ++ git rev-parse HEAD 95s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + local name=HEAD 95s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t_ref_names+=("$name") 95s + t-refs-same refs/tags/test-dummy/1.0-2 95s + local g 95s + for g in $* 95s + t-ref-same refs/tags/test-dummy/1.0-2 95s + local name=refs/tags/test-dummy/1.0-2 95s + local val 95s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 95s ++ local ref=refs/tags/test-dummy/1.0-2 95s ++ case "$ref" in 95s ++ git show-ref -d refs/tags/test-dummy/1.0-2 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + local name=refs/tags/test-dummy/1.0-2 95s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t_ref_names+=("$name") 95s + set -e 95s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 95s + t-refs-same refs/tags/test-dummy/1.0-2 95s + local g 95s + for g in $* 95s + t-ref-same refs/tags/test-dummy/1.0-2 95s + local name=refs/tags/test-dummy/1.0-2 95s + local val 95s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 95s ++ local ref=refs/tags/test-dummy/1.0-2 95s ++ case "$ref" in 95s ++ git show-ref -d refs/tags/test-dummy/1.0-2 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + local name=refs/tags/test-dummy/1.0-2 95s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 95s + t_ref_names+=("$name") 95s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 95s + t-refs-same-start 95s + unset t_ref_val 95s + t_ref_names=() 95s + t-ref-same refs/heads/split.p 95s + local name=refs/heads/split.p 95s + local val 95s ++ t-git-get-ref refs/heads/split.p 95s ++ local ref=refs/heads/split.p 95s ++ case "$ref" in 95s ++ git show-ref -d refs/heads/split.p 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val refs/heads/split.p 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=refs/heads/split.p 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s ++ t-git-get-ref refs/heads/split.b 95s ++ local ref=refs/heads/split.b 95s ++ case "$ref" in 95s ++ git show-ref -d refs/heads/split.b 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + local split_b=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "$split_b" in 95s + t-pushed-good-core 95s + t-ref-dsc-dgit 95s + t-incoming-dsc 95s + local dsc=example_1.0-2.dsc 95s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 95s + local val 95s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 95s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 95s ++ local field=Dgit 95s ++ perl -e ' 95s use Dpkg::Control::Hash; 95s my $h = new Dpkg::Control::Hash allow_pgp=>1; 95s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 95s my $val = $h->{"Dgit"},"\n"; 95s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 95s print $val,"\n"; 95s ' 95s + val='446b27d44feb30f14d38c53e07fafadd95dc90ef test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 95s ++ perl -e ' 95s $_=shift @ARGV; 95s die "Dgit $_ ?" unless m/^\w+\b/; 95s print $&,"\n" or die $!; 95s ' '446b27d44feb30f14d38c53e07fafadd95dc90ef test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s ++ t-v-tag 95s ++ echo refs/tags/archive/test-dummy/1.0-2 95s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 95s + local g 95s + for g in $* 95s + t-ref-same refs/tags/archive/test-dummy/1.0-2 95s + local name=refs/tags/archive/test-dummy/1.0-2 95s + local val 95s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 95s ++ local ref=refs/tags/archive/test-dummy/1.0-2 95s ++ case "$ref" in 95s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=refs/tags/archive/test-dummy/1.0-2 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s + for g in $* 95s + t-ref-same refs/remotes/dgit/dgit/sid 95s + local name=refs/remotes/dgit/dgit/sid 95s + local val 95s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 95s ++ local ref=refs/remotes/dgit/dgit/sid 95s ++ case "$ref" in 95s ++ git show-ref -d refs/remotes/dgit/dgit/sid 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val refs/remotes/dgit/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=refs/remotes/dgit/dgit/sid 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 95s + local val 95s + for g in $* 95s ++ t-git-get-ref refs/heads/dgit/unstable 95s ++ local ref=refs/heads/dgit/unstable 95s ++ case "$ref" in 95s ++ git show-ref -d refs/heads/dgit/unstable 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s ++ test 1 = 1 95s + val= 95s + '[' x '!=' x ']' 95s + for g in $* 95s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 95s ++ local ref=refs/remotes/dgit/dgit/unstable 95s ++ case "$ref" in 95s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s ++ test 1 = 1 95s + val= 95s + '[' x '!=' x ']' 95s + set -e 95s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 95s ++ t-v-tag 95s ++ echo refs/tags/archive/test-dummy/1.0-2 95s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 95s + local g 95s + for g in $* 95s + t-ref-same refs/dgit/sid 95s + local name=refs/dgit/sid 95s + local val 95s ++ t-git-get-ref refs/dgit/sid 95s ++ local ref=refs/dgit/sid 95s ++ case "$ref" in 95s ++ git show-ref -d refs/dgit/sid 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val refs/dgit/sid 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=refs/dgit/sid 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s + for g in $* 95s + t-ref-same refs/tags/archive/test-dummy/1.0-2 95s + local name=refs/tags/archive/test-dummy/1.0-2 95s + local val 95s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 95s ++ local ref=refs/tags/archive/test-dummy/1.0-2 95s ++ case "$ref" in 95s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s + val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + local name=refs/tags/archive/test-dummy/1.0-2 95s + local val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + case "${t_ref_val-unset}" in 95s + t_ref_val=446b27d44feb30f14d38c53e07fafadd95dc90ef 95s + t_ref_names+=("$name") 95s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 95s + t-refs-notexist refs/dgit/unstable 95s + local val 95s + for g in $* 95s ++ t-git-get-ref refs/dgit/unstable 95s ++ local ref=refs/dgit/unstable 95s ++ case "$ref" in 95s ++ git show-ref -d refs/dgit/unstable 95s ++ perl -ne ' 95s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 95s END { print "$x\n" if length $x; } 95s ' 95s ++ test 1 = 1 95s + val= 95s + '[' x '!=' x ']' 95s ++ t-v-tag 95s ++ echo refs/tags/archive/test-dummy/1.0-2 95s + git verify-tag refs/tags/archive/test-dummy/1.0-2 95s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 95s gpg: Signature made Mon Mar 31 12:19:48 2025 UTC 95s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 95s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 95s gpg: WARNING: This key is not certified with a trusted signature! 95s gpg: There is no indication that the signature belongs to the owner. 95s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 95s + t-incoming-dsc 95s + local dsc=example_1.0-2.dsc 95s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 95s + t-splitbrain-pushed-good--unpack 95s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 95s + rm -rf t-unpack 95s + mkdir t-unpack 95s + cd t-unpack 95s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 95s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 95s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 95s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 95s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 95s + dpkg-source -x example_1.0-2.dsc 96s gpgv: Signature made Mon Mar 31 12:19:49 2025 UTC 96s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 96s gpgv: Can't check signature: No public key 96s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 96s dpkg-source: info: extracting example in example-1.0 96s dpkg-source: info: unpacking example_1.0.orig.tar.xz 96s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 96s dpkg-source: info: using patch list from debian/patches/series 96s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 96s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 96s dpkg-source: info: applying subdir/addnewups 96s dpkg-source: info: applying made-with-quilt 96s + cd example-1.0/. 96s + git init 96s hint: Using 'master' as the name for the initial branch. This default branch name 96s hint: is subject to change. To configure the initial branch name to use in all 96s hint: of your new repositories, which will suppress this warning, call: 96s hint: 96s hint: git config --global init.defaultBranch 96s hint: 96s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 96s hint: 'development'. The just-created branch can be renamed via this command: 96s hint: 96s hint: git branch -m 96s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 96s + git fetch ../../example 'refs/tags/*:refs/tags/*' 96s From ../../example 96s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 96s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 96s * [new tag] v1.0 -> v1.0 96s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 96s + local tag=refs/tags/archive/test-dummy/1.0-2 96s + t-splitbrain-pushed-good--checkprep 96s + git add -Af . 96s + git rm --cached -r --ignore-unmatch .pc 96s rm '.pc/.quilt_patches' 96s rm '.pc/.quilt_series' 96s rm '.pc/.version' 96s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 96s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 96s rm '.pc/applied-patches' 96s rm '.pc/made-with-quilt/src.c' 96s rm '.pc/subdir/addnewups/lib.c' 96s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 96s + printf %s '' 96s + shift 96s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 96s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 96s + t-splitbrain-pushed-good--unpack 96s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 96s + rm -rf t-unpack 96s + mkdir t-unpack 96s + cd t-unpack 96s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 96s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 96s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 96s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 96s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 96s + dpkg-source -x example_1.0-2.dsc 96s gpgv: Signature made Mon Mar 31 12:19:49 2025 UTC 96s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 96s gpgv: Can't check signature: No public key 96s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 96s dpkg-source: info: extracting example in example-1.0 96s dpkg-source: info: unpacking example_1.0.orig.tar.xz 96s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 96s dpkg-source: info: using patch list from debian/patches/series 96s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 96s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 96s dpkg-source: info: applying subdir/addnewups 96s dpkg-source: info: applying made-with-quilt 96s + cd example-1.0/. 96s + git init 96s hint: Using 'master' as the name for the initial branch. This default branch name 96s hint: is subject to change. To configure the initial branch name to use in all 96s hint: of your new repositories, which will suppress this warning, call: 96s hint: 96s hint: git config --global init.defaultBranch 96s hint: 96s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 96s hint: 'development'. The just-created branch can be renamed via this command: 96s hint: 96s hint: git branch -m 96s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 96s + git fetch ../../example 'refs/tags/*:refs/tags/*' 96s From ../../example 96s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 96s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 96s * [new tag] v1.0 -> v1.0 96s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 96s + xargs -0r rm -rf -- 96s + t-splitbrain-pushed-good-end-made-dep14 96s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 96s + local tag=refs/tags/test-dummy/1.0-2 96s + t-splitbrain-pushed-good--checkprep 96s + git add -Af . 96s + git rm --cached -r --ignore-unmatch .pc 96s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 96s + printf %s '' 96s + shift 96s + git diff --stat --cached refs/tags/test-dummy/1.0-2 96s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 96s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 96s + t-ok 96s + : ======================================== 96s + t-check-only-bpd 96s + '[' .. = .. ']' 96s + return 96s + t-fscks 96s + shopt -s nullglob 96s + for d in $tmp/*/.git $tmp/git/*.git 96s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 96s + t-git-fsck 96s ++ git rev-parse --git-dir 96s + local fsckerrs=.git/dgit-test-fsck.errs 96s + set +e 96s + LC_MESSAGES=C 96s + tee .git/dgit-test-fsck.errs 96s + git fsck --no-dangling --strict 96s + ps='0 0' 96s + set -e 96s + local pats 96s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 96s + test '0 0' = '0 0' 96s + pats+=(-e 'notice: HEAD points to an unborn branch') 96s + pats+=(-e 'notice: No default references') 96s + set +e 96s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 96s + rc=1 96s + set -e 96s + case $rc in 96s + for d in $tmp/*/.git $tmp/git/*.git 96s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 96s + t-git-fsck 96s ++ git rev-parse --git-dir 96s + local fsckerrs=./dgit-test-fsck.errs 96s + set +e 96s + LC_MESSAGES=C 96s + tee ./dgit-test-fsck.errs 96s + git fsck --no-dangling --strict 96s notice: HEAD points to an unborn branch (master) 96s + ps='0 0' 96s + set -e 96s + local pats 96s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 96s + test '0 0' = '0 0' 96s + pats+=(-e 'notice: HEAD points to an unborn branch') 96s + pats+=(-e 'notice: No default references') 96s + set +e 96s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 96s + rc=1 96s + set -e 96s + case $rc in 96s + t-save-artifacts 96s + artifacts=/tmp/autopkgtest.ztMUxl/baredebian-push-artifacts 96s + '[' x/tmp/autopkgtest.ztMUxl/baredebian-push-artifacts = x ']' 96s + '[' xtmp = x ']' 96s + GZIP=-1v 96s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/baredebian-push-artifacts/baredebian-push.tar.gz '--exclude=*.tar' . 96s gzip: warning: GZIP environment variable is deprecated; use an alias or script 96s 79.5% 96s + echo ok. 96s ok. 96s + rc=0 96s + set +x 96s + set +e 96s + pwd 96s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 96s + '[' x '!=' x ']' 96s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 96s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 96s + set -e 96s + test 0 = 0 96s autopkgtest [12:19:50]: test baredebian-push: -----------------------] 96s baredebian-push PASS 96s autopkgtest [12:19:50]: test baredebian-push: - - - - - - - - - - results - - - - - - - - - - 96s autopkgtest [12:19:50]: test baredebian-tarball: preparing testbed 97s Reading package lists... 97s Building dependency tree... 97s Reading state information... 97s Starting pkgProblemResolver with broken count: 0 97s Starting 2 pkgProblemResolver with broken count: 0 97s Done 98s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 98s autopkgtest [12:19:52]: test baredebian-tarball: [----------------------- 98s ++ set -o pipefail 98s ++ . tests/lib-core 98s ++ . tests/lib-restricts 98s ++ trap ' 98s rc=$? 98s set +x 98s test $rc = 0 || echo " 98s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 98s 98s Most relevant logs are just before assignment rc=$rc 98s Will now do cleanup etc. 98s " 98s set -x 98s set +e 98s pwd 98s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 98s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 98s set -e 98s test $rc = 0 || t-report-failure 98s ' EXIT 98s ++ t-filter-out-git-hyphen-dir 98s ++ local pathent 98s +++ type -p git-rev-parse 98s +++ : 98s ++ pathent= 98s ++ case "$pathent" in 98s ++ return 98s ++ t-set-intree 98s ++ '[' x = x ']' 98s ++ return 98s ++ : -D 98s ++ export DGIT_TEST_DEBUG 98s ++ : x 98s ++ export DGIT_TEST_DEBPUSH_DEBUG 98s ++ : 98s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 98s ++ GIT_COMMITTER_DATE='1530000000 +0100' 98s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 98s ++ GIT_AUTHOR_DATE='1530000000 +0100' 98s ++ export LC_CTYPE=C.UTF-8 98s ++ LC_CTYPE=C.UTF-8 98s ++ unset CDPATH 98s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 98s ++ FILTER_BRANCH_SQUELCH_WARNING=1 98s +++ pwd 98s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 98s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ testname=baredebian-tarball 98s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ bpd=.. 98s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 98s ++ '[' x '!=' x ']' 98s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s +++ pwd 98s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ t-set-using-tmp 98s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 98s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 98s ++ export 'DEBFULLNAME=dgit test git user' 98s ++ DEBFULLNAME='dgit test git user' 98s ++ git config --global user.email dgit-test@debian.example.net 98s ++ git config --global user.name 'dgit test git user' 98s ++ git config --global protocol.ext.allow always 98s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 98s ++ env -0 98s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 98s ++ export DEBCHANGE_VENDOR=dpkg 98s ++ DEBCHANGE_VENDOR=dpkg 98s ++ unset VISUAL 98s ++ unset GIT_EDITOR 98s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 98s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 98s ++ cat 98s ++ schroot=build 98s ++ : aq 98s ++ : archive/test-dummy 98s ++ : sid:unstable 98s ++ t-git-config dgit.default.old-dsc-distro test-dummy 98s ++ git config --global dgit.default.old-dsc-distro test-dummy 98s ++ for import in ${autoimport-gnupg} 98s ++ case "$0" in 98s ++ t-setup-import gnupg 98s ++ local setupname=gnupg 98s ++ local setupsrc 98s ++ local lock 98s ++ '[' x = x ']' 98s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 98s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 98s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 98s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 98s cd "$1"; shift 98s setupname="$1"; shift 98s simport="$1"; shift 98s if [ -e "$simport" ]; then exit 0; fi 98s env - "$@" \ 98s "tests/setup/$setupname" 98s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 98s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 98s + shift 98s + setupname=gnupg 98s + shift 98s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 98s + shift 98s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 98s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/baredebian-tarball-stderr --stdout=/tmp/autopkgtest.ztMUxl/baredebian-tarball-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-tarball -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/baredebian-tarball' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 98s ++ set -o pipefail 98s ++ . tests/lib-core 98s ++ . tests/lib-restricts 98s ++ trap ' 98s rc=$? 98s set +x 98s test $rc = 0 || echo " 98s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 98s 98s Most relevant logs are just before assignment rc=$rc 98s Will now do cleanup etc. 98s " 98s set -x 98s set +e 98s pwd 98s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 98s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 98s set -e 98s test $rc = 0 || t-report-failure 98s ' EXIT 98s ++ t-filter-out-git-hyphen-dir 98s ++ local pathent 98s +++ type -p git-rev-parse 98s +++ : 98s ++ pathent= 98s ++ case "$pathent" in 98s ++ return 98s ++ t-set-intree 98s ++ '[' x = x ']' 98s ++ return 98s ++ : -D 98s ++ export DGIT_TEST_DEBUG 98s ++ : x 98s ++ export DGIT_TEST_DEBPUSH_DEBUG 98s ++ : 98s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 98s ++ GIT_COMMITTER_DATE='1530000000 +0100' 98s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 98s ++ GIT_AUTHOR_DATE='1530000000 +0100' 98s ++ export LC_CTYPE=C.UTF-8 98s ++ LC_CTYPE=C.UTF-8 98s ++ unset CDPATH 98s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 98s ++ FILTER_BRANCH_SQUELCH_WARNING=1 98s +++ pwd 98s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 98s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ testname=gnupg 98s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 98s ++ bpd=.. 98s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 98s ++ '[' x '!=' x ']' 98s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s +++ pwd 98s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ t-set-using-tmp 98s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 98s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 98s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 98s ++ export 'DEBFULLNAME=dgit test git user' 98s ++ DEBFULLNAME='dgit test git user' 98s ++ git config --global user.email dgit-test@debian.example.net 98s ++ git config --global user.name 'dgit test git user' 98s ++ git config --global protocol.ext.allow always 98s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 98s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 98s ++ export DEBCHANGE_VENDOR=dpkg 98s ++ DEBCHANGE_VENDOR=dpkg 98s ++ unset VISUAL 98s ++ unset GIT_EDITOR 98s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 98s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 98s ++ cat 98s ++ schroot=build 98s ++ : aq 98s ++ : archive/test-dummy 98s ++ : sid:unstable 98s ++ t-git-config dgit.default.old-dsc-distro test-dummy 98s ++ git config --global dgit.default.old-dsc-distro test-dummy 98s ++ for import in ${autoimport-gnupg} 98s ++ case "$0" in 98s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 98s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 98s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 98s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 98s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 98s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 98s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 98s + setup=' 98s export GNUPGHOME=$tmp/gnupg 98s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 98s 98s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 98s ssb rsa2048 2013-11-17 [E] 98s 98s sec rsa2048 2014-01-26 [SC] 98s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 98s uid [ultimate] Populus Romanus (test key) 98s ssb rsa2048 2014-01-26 [E] 98s 98s sec rsa2048 2014-01-26 [SC] 98s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 98s uid [ unknown] Hannibal (test key) 98s ssb rsa2048 2014-01-26 [E] 98s 98s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 98s export GNUPGHOME=$tmp/gnupg 98s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 98s 98s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 98s "sha256sum" => "$2", 98s "component" => "$3", 98s "filename" => "$4", 98s }; 98s END { 98s my $json = JSON->new->canonical(); 98s print $json->encode(\@v) or die $!; 98s } 98s ' 98s + t-aq-archive-updated new example 98s + local suite=new 98s + local p=example 98s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 98s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 98s + perl -wne ' 98s use JSON; 98s use strict; 98s our @v; 98s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 98s push @v, { 98s "version" => "$1", 98s "sha256sum" => "$2", 98s "component" => "$3", 98s "filename" => "$4", 98s }; 98s END { 98s my $json = JSON->new->canonical(); 98s print $json->encode(\@v) or die $!; 98s } 98s ' 98s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 98s + cat 98s + jsondelim=' },' 98s + cat 98s + t-git-none 98s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 98s + set -e 98s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 98s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 98s + t-gdr-gbp-import-core-with-queue 98s + t-gdr-gbp-import-core 98s + p=example 98s + t-worktree 1.1 98s + rm -rf example 98s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 98s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 98s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 98s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 98s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 98s + cd example 98s + : 'fake up some kind of upstream' 98s + git checkout -b upstream quilt-tip 98s Switched to a new branch 'upstream' 98s + rm -rf debian 98s + mkdir debian 98s + echo junk 98s + git add debian 98s + git commit -m 'an upstream retcon (tests/setup/baredebian)' 98s [upstream aa9b151] an upstream retcon (tests/setup/baredebian) 98s 6 files changed, 1 insertion(+), 36 deletions(-) 98s delete mode 100644 debian/changelog 98s delete mode 100644 debian/compat 98s delete mode 100644 debian/control 98s delete mode 100644 debian/example.install 98s mode change 100755 => 100644 debian/rules 98s delete mode 100644 debian/source/format 98s + git tag v1.0 98s + : 'fake up that our quilt-tip was descended from upstream' 98s + git checkout quilt-tip 98s Switched to branch 'quilt-tip' 98s + git merge --no-edit -s ours upstream 98s Merge made by the 'ours' strategy. 98s + : 'fake up that our quilt-tip had the patch queue in it' 98s + git checkout patch-queue/quilt-tip 98s Switched to branch 'patch-queue/quilt-tip' 98s + gbp pq export 98s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 98s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 98s + git add debian/patches 98s + git commit -m 'patch queue update (tests/setup/baredebian)' 98s [quilt-tip 474da4c] patch queue update (tests/setup/baredebian) 98s 4 files changed, 50 insertions(+) 98s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 98s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 98s create mode 100644 debian/patches/series 98s create mode 100644 debian/patches/subdir/addnewups 98s + : 'make branch names more conventional' 98s + git branch -D master 98s Deleted branch master (was 17d67db). 98s + git branch -m quilt-tip master 98s + git-deborig 98s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 98s + git branch -D patch-queue/quilt-tip 98s Deleted branch patch-queue/quilt-tip (was d843a68). 98s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 98s + git branch -D gitish-only 98s Deleted branch gitish-only (was 2b2ddc8). 98s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 98s + git branch -D quilt-tip-1.1 98s Deleted branch quilt-tip-1.1 (was 7fc34be). 98s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 98s + git branch -D quilt-tip-2 98s Deleted branch quilt-tip-2 (was 99fcab4). 98s + for b in patch-queue/quilt-tip gitish-only quilt-tip-1.1 quilt-tip-2 indep-arch 98s + git branch -D indep-arch 98s Deleted branch indep-arch (was e215729). 98s + git rm -rf . 98s rm '.gitignore' 98s rm 'debian/changelog' 98s rm 'debian/compat' 98s rm 'debian/control' 98s rm 'debian/example.install' 98s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 98s rm 'debian/patches/0002-Edit-the-.c-file.patch' 98s rm 'debian/patches/series' 98s rm 'debian/patches/subdir/addnewups' 98s rm 'debian/rules' 98s rm 'debian/source/format' 98s rm 'docs/README' 98s rm 'example' 98s rm 'src.c' 98s + git checkout HEAD -- debian 98s ++ git write-tree 98s + t=1b876c7f2ff3a5f3e269aa710210897c32caee00 98s ++ git commit-tree -m 'Convert to bare debian' 1b876c7f2ff3a5f3e269aa710210897c32caee00 98s + t=5c410cc573946394fbd85950449595317108dca9 98s + git reset --hard 5c410cc573946394fbd85950449595317108dca9 98s HEAD is now at 5c410cc Convert to bare debian 98s ++ echo 'example*' 98s + t-setup-done '' 'example* git mirror aq' ' 98s t-select-package example 98s t-git-next-date 98s ' 98s + local savevars= 98s + local 'savedirs=example* git mirror aq' 98s + local 'importeval= 98s t-select-package example 98s t-git-next-date 98s ' 98s + local import=IMPORT.baredebian 98s + exec 98s + local vn 98s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 98s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 98s print STDERR "saving-exporting $vn\n"; 98s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 98s or die $!; 98s } 98s ' 99s saving-exporting DGIT_TEST_REAL_GPG_AGENT 99s saving-exporting DGIT_TEST_REAL_DEBCHANGE 99s saving-exporting DGIT_TEST_REAL_GPG 99s + set -e 99s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 99s + tar cf IMPORT.baredebian.tar example example_1.0.orig.tar.xz git mirror aq 99s + printf '\n%s\n' ' 99s t-select-package example 99s t-git-next-date 99s ' 99s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 99s + rc=0 99s + set +x 99s + set +e 99s + pwd 99s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 99s + '[' x '!=' x ']' 99s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 99s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 99s + set -e 99s + test 0 = 0 99s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 99s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 99s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.baredebian 99s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 99s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 99s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 99s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 99s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 99s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 99s ++ t-select-package example 99s ++ p=example 99s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 99s ++ t-git-next-date 99s ++ GIT_COMMITTER_DATE='1530000001 +0100' 99s ++ GIT_AUTHOR_DATE='1530000001 +0100' 99s + t-tstunt-parsechangelog 99s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 99s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s + local var=PATH 99s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s + eval ' 99s case "$PATH" in 99s "$tstunt:"*) ;; 99s *":$tstunt:"*) ;; 99s "") PATH="$tstunt" ;; 99s *) PATH="$tstunt:$PATH" ;; 99s esac 99s export PATH 99s ' 99s ++ case "$PATH" in 99s ++ export PATH 99s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s + local var=PERLLIB 99s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s + eval ' 99s case "$PERLLIB" in 99s "$tstunt:"*) ;; 99s *":$tstunt:"*) ;; 99s "") PERLLIB="$tstunt" ;; 99s *) PERLLIB="$tstunt:$PERLLIB" ;; 99s esac 99s export PERLLIB 99s ' 99s ++ case "$PERLLIB" in 99s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 99s ++ export PERLLIB 99s + local f 99s + for f in "$@" 99s + t-tstunt--save-real dpkg-parsechangelog 99s + local f=dpkg-parsechangelog 99s + case "$f" in 99s + local rc 99s + local real 99s + set +e 99s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 99s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 99s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 99s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 99s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 99s ++ type -p dpkg-parsechangelog 99s + real=/usr/bin/dpkg-parsechangelog 99s + rc=0 99s + set -e 99s + case $rc in 99s + local varname=dpkg_parsechangelog 99s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 99s + eval ' 99s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 99s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 99s ' 99s ++ : /usr/bin/dpkg-parsechangelog 99s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 99s + f=./dpkg-parsechangelog 99s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 99s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 99s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 99s + for f in "$@" 99s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 99s + local f=Dpkg/Changelog/Parse.pm 99s + case "$f" in 99s + return 99s + f=./Dpkg/Changelog/Parse.pm 99s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 99s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 99s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 99s + cd example 99s + baredebian-test-vars 99s + quiltmode=baredebian 99s + v=1.0-1 99s + suite=sid 99s + uv=1.0 99s + uvtag=v1.0 99s + origbase=example_1.0.orig 99s + xorigcomps= 99s + baredebian-tarball-mode 99s + git tag -d v1.0 99s Deleted tag 'v1.0' (was aa9b151) 99s + uvtag= 99s + quiltmode=baredebian+tarball 99s + t-expect-fail 'Could not determine appropriate upstream commitish' t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup 99s + local 'mpat=Could not determine appropriate upstream commitish' 99s + shift 99s + set +o pipefail 99s + LC_MESSAGES=C 99s + LANGUAGE=C 99s + t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup 99s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local dgit=dgit 99s + pwd 99s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 99s + : ' 99s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 99s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --dgit-view-save=split.g --baredebian quilt-fixup 99s | git rev-parse --show-toplevel 99s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --global '.*' 99s | git config -z --get-regexp --system '.*' 99s format 3.0 (quilt), quilt mode baredebian 99s Format `3.0 (quilt)', need to check/update patch stack 99s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/1.0' 99s => `' 99s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/v1.0' 99s => `' 99s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/upstream/1.0' 99s => `' 99s 99s dgit: error: Could not determine appropriate upstream commitish. 99s dgit: (Tried these tags: 1.0 v1.0 upstream/1.0) 99s dgit: Check version, and specify upstream commitish explicitly. 99s + local 'ps=255 0' 99s + set -o pipefail 99s + case $ps in 99s + t-grep-mpat 'Could not determine appropriate upstream commitish' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local 'mpat=Could not determine appropriate upstream commitish' 99s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local grepper=fgrep 99s + case "$mpat" in 99s + fgrep -e 'Could not determine appropriate upstream commitish' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s dgit: error: Could not determine appropriate upstream commitish. 99s + baredebian-test-minimum 99s + t-expect-fail 'contradicts clean mode git-ff' t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 99s + local 'mpat=contradicts clean mode git-ff' 99s + shift 99s + set +o pipefail 99s + LC_MESSAGES=C 99s + LANGUAGE=C 99s + t-dgit -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 99s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local dgit=dgit 99s + pwd 99s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 99s + : ' 99s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 99s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 99s | git rev-parse --show-toplevel 99s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --global '.*' 99s | git config -z --get-regexp --system '.*' 99s format 3.0 (quilt), quilt mode baredebian+tarball 99s Format `3.0 (quilt)', need to check/update patch stack 99s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 99s => `' 99s + git diff --quiet HEAD 99s 99s dgit: error: quilt mode baredebian+tarball (generally needs untracked upstream files) 99s dgit: contradicts clean mode git-ff (which would delete them) 99s + local 'ps=255 0' 99s + set -o pipefail 99s + case $ps in 99s + t-grep-mpat 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local 'mpat=contradicts clean mode git-ff' 99s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s + local grepper=fgrep 99s + case "$mpat" in 99s + fgrep -e 'contradicts clean mode git-ff' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 99s dgit: contradicts clean mode git-ff (which would delete them) 99s + t-dgit -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 99s + local dgit=dgit 99s + pwd 99s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 99s + : ' 99s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 99s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --dgit-view-save=split.f1 --baredebian+tarball quilt-fixup 99s | git rev-parse --show-toplevel 99s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --local '.*' 99s | git config -z --get-regexp --global '.*' 99s | git config -z --get-regexp --system '.*' 99s format 3.0 (quilt), quilt mode baredebian+tarball 99s Format `3.0 (quilt)', need to check/update patch stack 99s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 99s => `' 99s + git diff --quiet HEAD 99s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 99s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 99s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 99s | git rev-parse 'HEAD~0' 99s => `5c410cc573946394fbd85950449595317108dca9' 99s | git symbolic-ref -q HEAD 99s => `refs/heads/master' 99s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 99s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 99s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 99s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 99s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 99s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - 32ea9ddd6ffeffa01e9f13dceeb0e4d79e984842dec403d43632da267de2326b 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 99s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 99s >(no reflog) 99s splitbrain cache miss 99s CD work 99s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 99s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 99s + git checkout -q -b dgit-view 99s examining quilt state (multiple patches, baredebian+tarball mode) 99s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 99s CD fake 99s | find -name .git -prune -print0 99s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 99s + git checkout -f 5c410cc573946394fbd85950449595317108dca9 -- debian 99s + git add -Af . 99s | git write-tree 99s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 99s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 99s CD .. 99s + git reset -q --hard 5c410cc573946394fbd85950449595317108dca9 99s CD ../fake 99s + git add -Af . 99s | git write-tree 99s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 99s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 99s CD ../work 99s | git ls-tree --name-only -z 5c410cc573946394fbd85950449595317108dca9 99s => `debian\x00' 99s CD .. 99s import considering example_1.0.orig.tar.xz Y .xz orig 99s + chmod -R '+rwX' _unpack-tar 99s CD _unpack-tar 99s | find -name .git -prune -print0 99s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 99s + git add -Af . 99s | git write-tree 99s => `122a22a7a62ec58750ccbb592db476469e4a92df' 99s | git ls-tree -z 122a22a7a62ec58750ccbb592db476469e4a92df 99s => `040000 tree caf096e042e2ca6a83cf87bd23de17e65f6513e7\x09example-1.0\x00' 99s one subtree caf096e042e2ca6a83cf87bd23de17e65f6513e7 99s CD .. 99s CD work 99s import clog search... 99s | dpkg-parsechangelog --format rfc822 --all 99s import clog 1.0-1 package changelog, entry no.1... 99s import clog 1.0-1 vs 1.0... 99s import clog 1.0-1 becomes r1 99s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 99s => `1431548802 +0000' 99s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 99s => `1431548802 +0000' 99s import tartrees authline Ian Jackson 1431548802 +0000 99s import tartrees r1authline Ian Jackson 1431548802 +0000 99s import tartree example_1.0.orig.tar.xz caf096e042e2ca6a83cf87bd23de17e65f6513e7 99s | git hash-object -w -t commit --stdin 99s => b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 99s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 99s => `:100644 000000 6f6830cf687e60a381ddb22f14e45a21b514cf59 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 9e8f73939dc78596676351d6e2f13f99f6adf51f 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 100644 41e210551949a27c6848cc5d233bfb65f94e3a14 a941931010167fd6cd8c7ea895d3468f26e67bde M\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 99s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 => 0 99s | git diff-tree -z --no-renames --name-only -r b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 763a72c3d91f517f4a54c0759ccf4876f1fbb304 99s => `debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 99s quiltify_trees_differ b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 99s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 99s => `lib.c\x00new-upstream-file\x00src.c\x00' 99s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 99s differences @dl == ## ## == == ==. 99s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 99s dgit: quilt differences: src: == orig ## gitignores: == orig == 99s dgit: quilt differences: tarball ## o+d/p tarball == o+d/p 99s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 99s => `1431548802 +0000' 99s + git read-tree b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 99s + git rm --quiet -rf --cached --ignore-unmatch debian 99s + git read-tree --prefix=debian/ 5c410cc573946394fbd85950449595317108dca9:debian 99s | git write-tree 99s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 99s | git commit-tree bf7987f1ad573f033a09951c00ab7bdaa7c98445 -p 5c410cc573946394fbd85950449595317108dca9 -p b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 -m 'Combine debian/ with upstream source for 1.0 99s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-1 *orig*] 99s ' 99s => `36798db17489df0fa2359ccd51ea80cbdf34c7ab' 99s + git reset -q --hard 36798db17489df0fa2359ccd51ea80cbdf34c7ab 99s dgit view: creating patches-applied version using gbp pq 99s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 100s + git update-ref refs/heads/dgit-view HEAD 100s + git checkout -q dgit-view 100s | git rev-parse 'HEAD~0' 100s => `660071e3c960767550c93733d62f96f36ec75cb6' 100s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 100s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 100s => `' 100s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball 5c410cc573946394fbd85950449595317108dca9 - 32ea9ddd6ffeffa01e9f13dceeb0e4d79e984842dec403d43632da267de2326b 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 660071e3c960767550c93733d62f96f36ec75cb6 100s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 100s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=5c410cc573946394fbd85950449595317108dca9' refs/heads/split.f1 660071e3c960767550c93733d62f96f36ec75cb6 100s dgit view: created (and left in refs/heads/split.f1) 100s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 100s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 100s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 100s ' 100s + baredebian-test-core 100s + baredebian-test-core-prepush 100s + tar --strip-components=1 -axf ../example_1.0.orig.tar.xz 100s + cd debian 100s + git clean -xdff 100s + git checkout HEAD -- . 100s + cd .. 100s + export QUILT_PATCHES=debian/patches 100s + QUILT_PATCHES=debian/patches 100s + quilt push -a 100s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 100s patching file new-upstream-file 100s 100s Applying patch debian/patches/0002-Edit-the-.c-file.patch 100s patching file src.c 100s 100s Applying patch debian/patches/subdir/addnewups 100s patching file lib.c 100s 100s Now at patch debian/patches/subdir/addnewups 100s + git add -Af . 100s + git reset .pc 100s + git diff --cached --exit-code split.f1 -- :/ ':!/debian' 100s + git diff --exit-code HEAD..split.f1 -- :/debian 100s + git reset 100s + quilt new made-with-quilt 100s Patch debian/patches/made-with-quilt is now on top 100s + quilt add src.c 100s File src.c added to patch debian/patches/made-with-quilt 100s + echo //omg 100s + quilt refresh 100s Refreshed patch debian/patches/made-with-quilt 100s + git add debian/patches/. 100s + t-commit 'extra patch made with quilt' 1.0-2 100s + local 'msg=extra patch made with quilt' 100s + v=1.0-2 100s + t-debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 100s + DEBEMAIL=dgit-tests@example.org 100s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.0-2 --distribution unstable 'extra patch made with quilt' 100s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange --force-distribution -v1.0-2 --distribution unstable extra patch made with quilt 100s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 100s libdistro-info-perl is not installed, Debian release names are not known. 100s libdistro-info-perl is not installed, Ubuntu release names are not known. 100s + git add debian/changelog 100s + debcommit 100s git commit -m 'extra patch made with quilt' 100s [master d0c1094] extra patch made with quilt 100s 3 files changed, 14 insertions(+) 100s create mode 100644 debian/patches/made-with-quilt 100s + revision=1 100s + t-refs-same-start 100s + unset t_ref_val 100s + t_ref_names=() 100s + t-ref-head 100s + local val 100s ++ git rev-parse HEAD 100s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s + local name=HEAD 100s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s + case "${t_ref_val-unset}" in 100s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s + t_ref_names+=("$name") 100s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 100s + local dgit=dgit 100s + pwd 100s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 100s + : ' 100s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 100s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian+tarball --dgit-view-save=split.b quilt-fixup 100s | git rev-parse --show-toplevel 100s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 100s | git config -z --get-regexp --local '.*' 100s | git config -z --get-regexp --local '.*' 100s | git config -z --get-regexp --global '.*' 100s | git config -z --get-regexp --system '.*' 100s format 3.0 (quilt), quilt mode baredebian+tarball 100s Format `3.0 (quilt)', need to check/update patch stack 100s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 100s => `' 100s + git diff --quiet HEAD 100s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 100s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 100s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 100s | git rev-parse 'HEAD~0' 100s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 100s | git symbolic-ref -q HEAD 100s => `refs/heads/master' 100s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 100s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 100s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 100s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 100s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 100s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 84199fb7b133e11d102be657cb37073ea29695ca8f44cce39db41a9e80a16427 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 100s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 100s splitbrain cache miss 100s CD work 100s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 100s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s + git checkout -q -b dgit-view 100s examining quilt state (multiple patches, baredebian+tarball mode) 100s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 100s CD fake 100s | find -name .git -prune -print0 100s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 100s + git checkout -f d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -- debian 100s + git add -Af . 100s | git write-tree 100s => `13afe261a5f954761b36d126fa74b978765116a8' 100s fake orig tree object 13afe261a5f954761b36d126fa74b978765116a8 100s CD .. 100s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s CD ../fake 100s + git add -Af . 100s | git write-tree 100s => `09583ba28b17d629329903d2cfda3a22eceef550' 100s fake o+d/p tree object 13afe261a5f954761b36d126fa74b978765116a8 100s CD ../work 100s | git ls-tree --name-only -z d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 100s => `debian\x00' 100s CD .. 100s import considering example_1.0.orig.tar.xz Y .xz orig 100s + chmod -R '+rwX' _unpack-tar 100s CD _unpack-tar 100s | find -name .git -prune -print0 100s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 100s + git add -Af . 100s | git write-tree 100s => `122a22a7a62ec58750ccbb592db476469e4a92df' 100s | git ls-tree -z 122a22a7a62ec58750ccbb592db476469e4a92df 100s => `040000 tree caf096e042e2ca6a83cf87bd23de17e65f6513e7\x09example-1.0\x00' 100s one subtree caf096e042e2ca6a83cf87bd23de17e65f6513e7 100s CD .. 100s CD work 100s import clog search... 100s | dpkg-parsechangelog --format rfc822 --all 101s import clog 1.0-2 package changelog, entry no.1... 101s import clog 1.0-2 vs 1.0... 101s import clog 1.0-2 becomes r1 101s import clog 1.0-1 package changelog, entry no.2... 101s import clog 1.0-1 vs 1.0... 101s import clog 1.0-1 becomes r1 101s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 101s => `1530000001 +0000' 101s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 101s => `1431548802 +0000' 101s import tartrees authline dgit test git user 1530000001 +0000 101s import tartrees r1authline Ian Jackson 1431548802 +0000 101s import tartree example_1.0.orig.tar.xz caf096e042e2ca6a83cf87bd23de17e65f6513e7 101s | git hash-object -w -t commit --stdin 101s => b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 101s | git diff-tree -z --no-renames -r 13afe261a5f954761b36d126fa74b978765116a8 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 101s => `:100644 000000 94f588d88ada8ca51628feea02d735b931cc33d0 0000000000000000000000000000000000000000 D\x00debian/changelog\x00:100644 000000 45a4fb75db864000d01701c0f7a51864bd4daabf 0000000000000000000000000000000000000000 D\x00debian/compat\x00:100644 000000 4c00c7fc685c6829aecfee6271a2f5317a7d4abe 0000000000000000000000000000000000000000 D\x00debian/control\x00:100644 000000 cb55ff6b75a9b25cc5af43623528cb1f1c7e938a 0000000000000000000000000000000000000000 D\x00debian/example.install\x00:100644 000000 04057085da6dc22033ff51495d4505dd2afecd87 0000000000000000000000000000000000000000 D\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00:100644 000000 0e0492478e787fa12078ae87a22c5253641c12a2 0000000000000000000000000000000000000000 D\x00debian/patches/0002-Edit-the-.c-file.patch\x00:100644 000000 8aab1b8d48eeef16e2501a1a88b46da32dd4667f 0000000000000000000000000000000000000000 D\x00debian/patches/made-with-quilt\x00:100644 000000 47b57013afc48c2b0afa225e09b019bfb6e8cc25 0000000000000000000000000000000000000000 D\x00debian/patches/series\x00:100644 000000 1acc2e857cd2ed05d52453a9d2e2ee6046491f8a 0000000000000000000000000000000000000000 D\x00debian/patches/subdir/addnewups\x00:100755 100644 41e210551949a27c6848cc5d233bfb65f94e3a14 a941931010167fd6cd8c7ea895d3468f26e67bde M\x00debian/rules\x00:100644 000000 163aaf8d82b6c54f23c45f32895dbdfdcc27b047 0000000000000000000000000000000000000000 D\x00debian/source/format\x00' 101s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 => 0 101s | git diff-tree -z --no-renames --name-only -r b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 09583ba28b17d629329903d2cfda3a22eceef550 101s => `debian/changelog\x00debian/compat\x00debian/control\x00debian/example.install\x00debian/patches/0001-Add-a-new-upstream-file.patch\x00debian/patches/0002-Edit-the-.c-file.patch\x00debian/patches/made-with-quilt\x00debian/patches/series\x00debian/patches/subdir/addnewups\x00debian/rules\x00debian/source/format\x00lib.c\x00new-upstream-file\x00src.c\x00' 101s quiltify_trees_differ b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 09583ba28b17d629329903d2cfda3a22eceef550 => 1 101s | git diff-tree -z --no-renames --name-only -r 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 101s => `lib.c\x00new-upstream-file\x00src.c\x00' 101s quiltify_trees_differ 13afe261a5f954761b36d126fa74b978765116a8 09583ba28b17d629329903d2cfda3a22eceef550 => 1 101s differences @dl == ## ## == == ==. 101s dgit: base trees orig=13afe261a5f954761b36 o+d/p=09583ba28b17d6293299 101s dgit: quilt differences: src: == orig ## gitignores: == orig == 101s dgit: quilt differences: tarball ## o+d/p tarball == o+d/p 101s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 101s => `1530000001 +0000' 101s + git read-tree b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 101s + git rm --quiet -rf --cached --ignore-unmatch debian 101s + git read-tree --prefix=debian/ d0c109478cdb46a6564ea8f5ee5c36484a39f9c7:debian 101s | git write-tree 101s => `13afe261a5f954761b36d126fa74b978765116a8' 101s | git commit-tree 13afe261a5f954761b36d126fa74b978765116a8 -p d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 -p b19daf2eb67d21d4df6d1d2579f5c10aa47d7898 -m 'Combine debian/ with upstream source for 1.0 101s ' -m '' -m '[dgit (9.15) baredebian-merge 1.0-2 *orig*] 101s ' 101s => `4cbe51cf84ff3488a47d021c2a8f929c1f4abb1e' 101s + git reset -q --hard 4cbe51cf84ff3488a47d021c2a8f929c1f4abb1e 101s dgit view: creating patches-applied version using gbp pq 101s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 101s gbp:warning: Patch 'made-with-quilt' has no authorship information, using 'Ian Jackson ' 101s + git update-ref refs/heads/dgit-view HEAD 101s + git checkout -q dgit-view 101s | git rev-parse 'HEAD~0' 101s => `92b92aa41ba7c3aeb7a810e546915034852783c4' 101s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 101s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 101s => `660071e3c960767550c93733d62f96f36ec75cb6' 101s + git update-ref -m 'dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 84199fb7b133e11d102be657cb37073ea29695ca8f44cce39db41a9e80a16427 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 92b92aa41ba7c3aeb7a810e546915034852783c4 101s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 101s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save converted HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.b 92b92aa41ba7c3aeb7a810e546915034852783c4 101s dgit view: created (and left in refs/heads/split.b) 101s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 101s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 101s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 101s ' 101s + t-ref-head 101s + local val 101s ++ git rev-parse HEAD 101s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 101s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 101s + local name=HEAD 101s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 101s + case "${t_ref_val-unset}" in 101s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 101s + t_ref_names+=("$name") 101s + baredebian-test-core-push 101s + dpkg-buildpackage -uc -us --build=source 101s dpkg-buildpackage: info: source package example 101s dpkg-buildpackage: info: source version 1.0-2 101s dpkg-buildpackage: info: source distribution unstable 101s dpkg-buildpackage: info: source changed by dgit test git user 101s dpkg-source --before-build . 101s fakeroot debian/rules clean 101s EXAMPLE RULES TARGET clean 101s dh_clean 101s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 101s dpkg-source -b . 101s dpkg-source: info: using source format '3.0 (quilt)' 101s dpkg-source: info: building example using existing ./example_1.0.orig.tar.xz 101s dpkg-source: info: using patch list from debian/patches/series 101s dpkg-source: info: building example in example_1.0-2.debian.tar.xz 101s dpkg-source: info: building example in example_1.0-2.dsc 101s dpkg-genbuildinfo --build=source -O../example_1.0-2_source.buildinfo 101s dpkg-genchanges --build=source -O../example_1.0-2_source.changes 101s dpkg-genchanges: info: not including original source code in upload 101s dpkg-source --after-build . 102s dpkg-buildpackage: info: source-only, diff-only upload (original source NOT included) 102s + t-dgit -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 102s + local dgit=dgit 102s + pwd 102s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 102s + : ' 102s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 102s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wn --quilt=baredebian+tarball --dgit-view-save=split.p --new push 102s | git rev-parse --show-toplevel 102s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 102s | git config -z --get-regexp --local '.*' 102s | git config -z --get-regexp --local '.*' 102s | git config -z --get-regexp --global '.*' 102s | git config -z --get-regexp --system '.*' 102s format 3.0 (quilt), quilt mode baredebian+tarball 102s Format `3.0 (quilt)', need to check/update patch stack 102s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 102s => `' 102s + git diff --quiet HEAD 102s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 102s canonical suite name for unstable is sid 102s actually entering push 102s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 102s => `0' 102s + git config remote.dgit.skipdefaultupdate true 102s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 102s get_archive_dsc: nothing in archive, returning undef 102s no version available from the archive 102s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 102s => `' 102s previous reference hash= 102s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 102s => `' 102s fetch_from_archive: lastfetch= 102s nothing found! 102s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 102s + git check-ref-format archive/test-dummy/1.0-2 102s | git symbolic-ref -q HEAD 102s => `refs/heads/master' 102s | git rev-parse 'HEAD~0' 102s => `d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' 102s ffq_prev_branchinfo branch current refs/heads/master 102s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 102s => `' 102s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 102s => `' 102s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 102s QF linkorigs example_1.0.orig.tar.xz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.xz Y 102s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 102s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 102s dgit: split brain (separate dgit view) may be needed (--quilt=baredebian+tarball). 102s splitbrain cachekey dgit 9.15 1.0 baredebian+tarball d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 - 84199fb7b133e11d102be657cb37073ea29695ca8f44cce39db41a9e80a16427 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 102s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 102s CD work 102s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 102s + git reset -q --hard d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 102s + sh -ec 'cd "$1"; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example git update-ref -m 'dgit --dgit-view-save cache-hit HEAD=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7' refs/heads/split.p 92b92aa41ba7c3aeb7a810e546915034852783c4 102s dgit view: found cached (and left in refs/heads/split.p) 102s + git checkout -q -b dgit-view 92b92aa41ba7c3aeb7a810e546915034852783c4 102s splitbrain_pseudomerge... 102s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 102s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 102s => `' 102s + git diff --quiet HEAD 102s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.0-2' 102s => `' 102s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 102s checking that example_1.0-2.dsc corresponds to HEAD 102s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc 102s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0-2.dsc) 102s dpkg-source: info: extracting example in example-1.0 102s dpkg-source: info: unpacking example_1.0.orig.tar.xz 102s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 102s dpkg-source: info: using patch list from debian/patches/series 102s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 102s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 102s dpkg-source: info: applying subdir/addnewups 102s dpkg-source: info: applying made-with-quilt 102s CD example-1.0 102s | find -name .git -prune -print0 102s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 102s + git add -Af . 102s | git write-tree 102s => `09583ba28b17d629329903d2cfda3a22eceef550' 102s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 102s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 102s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 102s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 102s + git diff --quiet 09583ba28b17d629329903d2cfda3a22eceef550 92b92aa41ba7c3aeb7a810e546915034852783c4 102s files_compare_inputs example_1.0-2.dsc 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0.orig.tar.xz 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha256 example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0.orig.tar.xz 102s files_compare_inputs example_1.0-2.dsc Checksums-Sha1 example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2.dsc Files 102s files_compare_inputs example_1.0-2.dsc Files example_1.0.orig.tar.xz 102s files_compare_inputs example_1.0-2.dsc Files example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2_source.changes 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.dsc 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha256 example_1.0-2_source.buildinfo 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.dsc 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2_source.changes Checksums-Sha1 example_1.0-2_source.buildinfo 102s files_compare_inputs example_1.0-2_source.changes Files 102s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.dsc 102s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2.debian.tar.xz 102s files_compare_inputs example_1.0-2_source.changes Files example_1.0-2_source.buildinfo 102s checking origs needed (1.0)... 102s checking origs needed placement 'devel extra'... 102s origs example_1.0.orig.tar.xz | 9ff3b1cef499c0c890e9366b9da974c2 460 example_1.0.orig.tar.xz 102s origs example_1.0.orig.tar.xz is_orig 102s -| sh -ec 'cd "$1"; shift 102s 102s find -name "$1" -print0 | 102s xargs -0r sha256sum 102s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_1.0.orig.tar.xz 102s origs example_1.0.orig.tar.xz $#$have=-1 102s origs example_1.0.orig.tar.xz f.same=0 #f._differ=-1 102s origs example_1.0-2.debian.tar.xz | 33d973e7522208030e046b0e5a15006d 1336 example_1.0-2.debian.tar.xz 102s edited .changes for archive .orig contents: added example_1.0.orig.tar.xz 102s push_tagwants: $VAR1 = [ 102s '1.0-2', 102s '92b92aa41ba7c3aeb7a810e546915034852783c4', 102s 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 102s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 102s ]; 102s $VAR2 = [ 102s { 102s 'Tag' => 'archive/test-dummy/1.0-2', 102s 'TfSuffix' => '', 102s 'Objid' => '92b92aa41ba7c3aeb7a810e546915034852783c4', 102s 'View' => 'dgit', 102s 'TagFn' => sub { "DUMMY" }, 102s 'Tfn' => sub { "DUMMY" } 102s }, 102s { 102s 'Objid' => 'd0c109478cdb46a6564ea8f5ee5c36484a39f9c7', 102s 'TfSuffix' => '-maintview', 102s 'Tag' => 'test-dummy/1.0-2', 102s 'Tfn' => sub { "DUMMY" }, 102s 'TagFn' => sub { "DUMMY" }, 102s 'View' => 'maint' 102s } 102s ]; 102s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 102s => `1530000001 +0000' 102s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 102s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 102s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 102s => `5f97fac777e8b3f2b1f99597fb12fd73d119c41a' 102s + git verify-tag 5f97fac777e8b3f2b1f99597fb12fd73d119c41a 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s gpg: Signature made Mon Mar 31 12:19:56 2025 UTC 102s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 102s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 102s gpg: WARNING: This key is not certified with a trusted signature! 102s gpg: There is no indication that the signature belongs to the owner. 102s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 102s + git update-ref refs/tags/archive/test-dummy/1.0-2 5f97fac777e8b3f2b1f99597fb12fd73d119c41a 102s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 102s => `86a553341e99c0044d96c279a55d4b3f8d459daa' 102s + git verify-tag 86a553341e99c0044d96c279a55d4b3f8d459daa 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s gpg: Signature made Mon Mar 31 12:19:56 2025 UTC 102s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 102s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 102s gpg: WARNING: This key is not certified with a trusted signature! 102s gpg: There is no indication that the signature belongs to the owner. 102s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 102s + git update-ref refs/tags/test-dummy/1.0-2 86a553341e99c0044d96c279a55d4b3f8d459daa 102s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 102s => `0' 102s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 102s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 92b92aa41ba7c3aeb7a810e546915034852783c4:refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 refs/tags/test-dummy/1.0-2 102s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 102s * [new reference] 92b92aa41ba7c3aeb7a810e546915034852783c4 -> refs/dgit/sid 102s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 102s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 102s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 102s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.0-2_source.changes 102s signfile dsc ../example_1.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 102s 102s fixup_buildinfo ../example_1.0-2.dsc ../example_1.0-2_source.buildinfo 102s signfile buildinfo ../example_1.0-2_source.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 103s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 103s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 103s 103s fixup_changes dsc ../example_1.0-2.dsc ../example_1.0-2_source.changes 103s fixup_changes buildinfo ../example_1.0-2_source.buildinfo ../example_1.0-2_source.changes 103s signfile changes ../example_1.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 103s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 103s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 103s 103s Successfully signed dsc, buildinfo, changes files 103s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.0-2_source.changes 103s gpg: ../example_1.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 103s gpg: ../example_1.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 103s D: Setting host argument. 103s Checking signature on .changes 103s Checking signature on .dsc 103s Uploading to test-dummy (via local to localhost): 103s Successfully uploaded packages. 103s dgit ok: pushed and uploaded 1.0-2 103s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 103s del_lrfetchrefs... 103s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 103s ' 103s + baredebian-test-core-postpush 103s + git merge-base --is-ancestor HEAD split.p 103s + '[' '' ']' 103s + git clean -xdff 103s Removing .gitignore 103s Removing .pc/ 103s Removing debian/files 103s Removing docs/ 103s Removing example 103s Removing lib.c 103s Removing new-upstream-file 103s Removing src.c 103s + t-splitbrain-pushed-good-start 103s + dep14tag=refs/tags/test-dummy/1.0-2 103s ++ t-v-tag 103s ++ echo refs/tags/archive/test-dummy/1.0-2 103s + dgittag=refs/tags/archive/test-dummy/1.0-2 103s + t-output '' git status --porcelain 103s + printf %s '' 103s + shift 103s + git status --porcelain 103s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 103s + t-ref-head 103s + local val 103s ++ git rev-parse HEAD 103s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t-ref-same-val HEAD d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + local name=HEAD 103s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t_ref_names+=("$name") 103s + t-refs-same refs/tags/test-dummy/1.0-2 103s + local g 103s + for g in $* 103s + t-ref-same refs/tags/test-dummy/1.0-2 103s + local name=refs/tags/test-dummy/1.0-2 103s + local val 103s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 103s ++ local ref=refs/tags/test-dummy/1.0-2 103s ++ case "$ref" in 103s ++ git show-ref -d refs/tags/test-dummy/1.0-2 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + local name=refs/tags/test-dummy/1.0-2 103s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t_ref_names+=("$name") 103s + set -e 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 103s + t-refs-same refs/tags/test-dummy/1.0-2 103s + local g 103s + for g in $* 103s + t-ref-same refs/tags/test-dummy/1.0-2 103s + local name=refs/tags/test-dummy/1.0-2 103s + local val 103s ++ t-git-get-ref refs/tags/test-dummy/1.0-2 103s ++ local ref=refs/tags/test-dummy/1.0-2 103s ++ case "$ref" in 103s ++ git show-ref -d refs/tags/test-dummy/1.0-2 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/tags/test-dummy/1.0-2\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t-ref-same-val refs/tags/test-dummy/1.0-2 d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + local name=refs/tags/test-dummy/1.0-2 103s + local val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=d0c109478cdb46a6564ea8f5ee5c36484a39f9c7 103s + t_ref_names+=("$name") 103s + git merge-base --is-ancestor refs/tags/test-dummy/1.0-2 refs/tags/archive/test-dummy/1.0-2 103s + t-refs-same-start 103s + unset t_ref_val 103s + t_ref_names=() 103s + t-ref-same refs/heads/split.p 103s + local name=refs/heads/split.p 103s + local val 103s ++ t-git-get-ref refs/heads/split.p 103s ++ local ref=refs/heads/split.p 103s ++ case "$ref" in 103s ++ git show-ref -d refs/heads/split.p 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/heads/split.p\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val refs/heads/split.p 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=refs/heads/split.p 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s ++ t-git-get-ref refs/heads/split.b 103s ++ local ref=refs/heads/split.b 103s ++ case "$ref" in 103s ++ git show-ref -d refs/heads/split.b 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/heads/split.b\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + local split_b=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "$split_b" in 103s + t-pushed-good-core 103s + t-ref-dsc-dgit 103s + t-incoming-dsc 103s + local dsc=example_1.0-2.dsc 103s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 103s + local val 103s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit 103s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 103s ++ local field=Dgit 103s ++ perl -e ' 103s use Dpkg::Control::Hash; 103s my $h = new Dpkg::Control::Hash allow_pgp=>1; 103s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc"); 103s my $val = $h->{"Dgit"},"\n"; 103s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc Dgit" unless defined $val; 103s print $val,"\n"; 103s ' 103s + val='92b92aa41ba7c3aeb7a810e546915034852783c4 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 103s ++ perl -e ' 103s $_=shift @ARGV; 103s die "Dgit $_ ?" unless m/^\w+\b/; 103s print $&,"\n" or die $!; 103s ' '92b92aa41ba7c3aeb7a810e546915034852783c4 test-dummy archive/test-dummy/1.0-2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s ++ t-v-tag 103s ++ echo refs/tags/archive/test-dummy/1.0-2 103s + t-refs-same refs/tags/archive/test-dummy/1.0-2 refs/remotes/dgit/dgit/sid 103s + local g 103s + for g in $* 103s + t-ref-same refs/tags/archive/test-dummy/1.0-2 103s + local name=refs/tags/archive/test-dummy/1.0-2 103s + local val 103s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 103s ++ local ref=refs/tags/archive/test-dummy/1.0-2 103s ++ case "$ref" in 103s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=refs/tags/archive/test-dummy/1.0-2 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s + for g in $* 103s + t-ref-same refs/remotes/dgit/dgit/sid 103s + local name=refs/remotes/dgit/dgit/sid 103s + local val 103s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 103s ++ local ref=refs/remotes/dgit/dgit/sid 103s ++ case "$ref" in 103s ++ git show-ref -d refs/remotes/dgit/dgit/sid 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val refs/remotes/dgit/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=refs/remotes/dgit/dgit/sid 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 103s + local val 103s + for g in $* 103s ++ t-git-get-ref refs/heads/dgit/unstable 103s ++ local ref=refs/heads/dgit/unstable 103s ++ case "$ref" in 103s ++ git show-ref -d refs/heads/dgit/unstable 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s ++ test 1 = 1 103s + val= 103s + '[' x '!=' x ']' 103s + for g in $* 103s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 103s ++ local ref=refs/remotes/dgit/dgit/unstable 103s ++ case "$ref" in 103s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s ++ test 1 = 1 103s + val= 103s + '[' x '!=' x ']' 103s + set -e 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 103s ++ t-v-tag 103s ++ echo refs/tags/archive/test-dummy/1.0-2 103s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/1.0-2 103s + local g 103s + for g in $* 103s + t-ref-same refs/dgit/sid 103s + local name=refs/dgit/sid 103s + local val 103s ++ t-git-get-ref refs/dgit/sid 103s ++ local ref=refs/dgit/sid 103s ++ case "$ref" in 103s ++ git show-ref -d refs/dgit/sid 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val refs/dgit/sid 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=refs/dgit/sid 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s + for g in $* 103s + t-ref-same refs/tags/archive/test-dummy/1.0-2 103s + local name=refs/tags/archive/test-dummy/1.0-2 103s + local val 103s ++ t-git-get-ref refs/tags/archive/test-dummy/1.0-2 103s ++ local ref=refs/tags/archive/test-dummy/1.0-2 103s ++ case "$ref" in 103s ++ git show-ref -d refs/tags/archive/test-dummy/1.0-2 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.0-2\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s + val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t-ref-same-val refs/tags/archive/test-dummy/1.0-2 92b92aa41ba7c3aeb7a810e546915034852783c4 103s + local name=refs/tags/archive/test-dummy/1.0-2 103s + local val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + case "${t_ref_val-unset}" in 103s + t_ref_val=92b92aa41ba7c3aeb7a810e546915034852783c4 103s + t_ref_names+=("$name") 103s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 103s + t-refs-notexist refs/dgit/unstable 103s + local val 103s + for g in $* 103s ++ t-git-get-ref refs/dgit/unstable 103s ++ local ref=refs/dgit/unstable 103s ++ case "$ref" in 103s ++ git show-ref -d refs/dgit/unstable 103s ++ perl -ne ' 103s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 103s END { print "$x\n" if length $x; } 103s ' 103s ++ test 1 = 1 103s + val= 103s + '[' x '!=' x ']' 103s ++ t-v-tag 103s ++ echo refs/tags/archive/test-dummy/1.0-2 103s + git verify-tag refs/tags/archive/test-dummy/1.0-2 103s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 103s gpg: Signature made Mon Mar 31 12:19:56 2025 UTC 103s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 103s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 103s gpg: WARNING: This key is not certified with a trusted signature! 103s gpg: There is no indication that the signature belongs to the owner. 103s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 103s + t-incoming-dsc 103s + local dsc=example_1.0-2.dsc 103s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc 103s + t-splitbrain-pushed-good--unpack 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 103s + rm -rf t-unpack 103s + mkdir t-unpack 103s + cd t-unpack 103s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 103s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 103s + dpkg-source -x example_1.0-2.dsc 103s gpgv: Signature made Mon Mar 31 12:19:56 2025 UTC 103s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 103s gpgv: Can't check signature: No public key 103s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 103s dpkg-source: info: extracting example in example-1.0 103s dpkg-source: info: unpacking example_1.0.orig.tar.xz 103s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 103s dpkg-source: info: using patch list from debian/patches/series 103s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 103s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 103s dpkg-source: info: applying subdir/addnewups 103s dpkg-source: info: applying made-with-quilt 103s + cd example-1.0/. 103s + git init 103s hint: Using 'master' as the name for the initial branch. This default branch name 103s hint: is subject to change. To configure the initial branch name to use in all 103s hint: of your new repositories, which will suppress this warning, call: 103s hint: 103s hint: git config --global init.defaultBranch 103s hint: 103s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 103s hint: 'development'. The just-created branch can be renamed via this command: 103s hint: 103s hint: git branch -m 103s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 103s + git fetch ../../example 'refs/tags/*:refs/tags/*' 103s From ../../example 103s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 103s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 103s + t-splitbrain-pushed-good--checkdiff refs/tags/archive/test-dummy/1.0-2 103s + local tag=refs/tags/archive/test-dummy/1.0-2 103s + t-splitbrain-pushed-good--checkprep 103s + git add -Af . 103s + git rm --cached -r --ignore-unmatch .pc 103s rm '.pc/.quilt_patches' 103s rm '.pc/.quilt_series' 103s rm '.pc/.version' 103s rm '.pc/0001-Add-a-new-upstream-file.patch/new-upstream-file' 103s rm '.pc/0002-Edit-the-.c-file.patch/src.c' 103s rm '.pc/applied-patches' 103s rm '.pc/made-with-quilt/src.c' 103s rm '.pc/subdir/addnewups/lib.c' 103s + t-output '' git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 103s + printf %s '' 103s + shift 103s + git diff --stat --cached refs/tags/archive/test-dummy/1.0-2 103s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 103s + t-splitbrain-pushed-good--unpack 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 103s + rm -rf t-unpack 103s + mkdir t-unpack 103s + cd t-unpack 103s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/*.orig*.tar*' . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0.orig.tar.xz . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.dsc . 103s + ln -s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.debian.tar.xz . 103s + ln -s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.0-2.tar*' . 103s + dpkg-source -x example_1.0-2.dsc 103s gpgv: Signature made Mon Mar 31 12:19:56 2025 UTC 103s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 103s gpgv: Can't check signature: No public key 103s dpkg-source: warning: cannot verify signature ./example_1.0-2.dsc 103s dpkg-source: info: extracting example in example-1.0 103s dpkg-source: info: unpacking example_1.0.orig.tar.xz 103s dpkg-source: info: unpacking example_1.0-2.debian.tar.xz 103s dpkg-source: info: using patch list from debian/patches/series 103s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 103s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 103s dpkg-source: info: applying subdir/addnewups 103s dpkg-source: info: applying made-with-quilt 103s + cd example-1.0/. 103s + git init 103s hint: Using 'master' as the name for the initial branch. This default branch name 103s hint: is subject to change. To configure the initial branch name to use in all 103s hint: of your new repositories, which will suppress this warning, call: 103s hint: 103s hint: git config --global init.defaultBranch 103s hint: 103s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 103s hint: 'development'. The just-created branch can be renamed via this command: 103s hint: 103s hint: git branch -m 103s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t-unpack/example-1.0/.git/ 103s + git fetch ../../example 'refs/tags/*:refs/tags/*' 103s From ../../example 103s * [new tag] archive/test-dummy/1.0-2 -> archive/test-dummy/1.0-2 103s * [new tag] test-dummy/1.0-2 -> test-dummy/1.0-2 103s + find . -mindepth 1 -maxdepth 1 '!' -path ./debian '!' -path ./.git -print0 103s + xargs -0r rm -rf -- 103s + t-splitbrain-pushed-good-end-made-dep14 103s + t-splitbrain-pushed-good--checkdiff refs/tags/test-dummy/1.0-2 103s + local tag=refs/tags/test-dummy/1.0-2 103s + t-splitbrain-pushed-good--checkprep 103s + git add -Af . 103s + git rm --cached -r --ignore-unmatch .pc 103s + t-output '' git diff --stat --cached refs/tags/test-dummy/1.0-2 103s + printf %s '' 103s + shift 103s + git diff --stat --cached refs/tags/test-dummy/1.0-2 103s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 103s + t-ok 103s + : ======================================== 103s + t-check-only-bpd 103s + '[' .. = .. ']' 103s + return 103s + t-fscks 103s + shopt -s nullglob 103s + for d in $tmp/*/.git $tmp/git/*.git 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 103s + t-git-fsck 103s ++ git rev-parse --git-dir 103s + local fsckerrs=.git/dgit-test-fsck.errs 103s + set +e 103s + LC_MESSAGES=C 103s + git fsck --no-dangling --strict 103s + tee .git/dgit-test-fsck.errs 103s + ps='0 0' 103s + set -e 103s + local pats 103s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 103s + test '0 0' = '0 0' 103s + pats+=(-e 'notice: HEAD points to an unborn branch') 103s + pats+=(-e 'notice: No default references') 103s + set +e 103s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 103s + rc=1 103s + set -e 103s + case $rc in 103s + for d in $tmp/*/.git $tmp/git/*.git 103s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 103s + t-git-fsck 103s ++ git rev-parse --git-dir 103s + local fsckerrs=./dgit-test-fsck.errs 103s + set +e 103s + LC_MESSAGES=C 103s + git fsck --no-dangling --strict 103s + tee ./dgit-test-fsck.errs 103s notice: HEAD points to an unborn branch (master) 103s + ps='0 0' 103s + set -e 103s + local pats 103s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 103s + test '0 0' = '0 0' 103s + pats+=(-e 'notice: HEAD points to an unborn branch') 103s + pats+=(-e 'notice: No default references') 103s + set +e 103s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 103s + rc=1 103s + set -e 103s + case $rc in 103s + t-save-artifacts 103s + artifacts=/tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts 103s + '[' x/tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts = x ']' 103s + '[' xtmp = x ']' 103s + GZIP=-1v 103s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/baredebian-tarball-artifacts/baredebian-tarball.tar.gz '--exclude=*.tar' . 103s gzip: warning: GZIP environment variable is deprecated; use an alias or script 103s 79.0% 103s + echo ok. 103s ok. 103s + rc=0 103s + set +x 103s + set +e 103s + pwd 103s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 103s + '[' x '!=' x ']' 103s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 103s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 103s + set -e 103s + test 0 = 0 104s autopkgtest [12:19:58]: test baredebian-tarball: -----------------------] 104s baredebian-tarball PASS 104s autopkgtest [12:19:58]: test baredebian-tarball: - - - - - - - - - - results - - - - - - - - - - 104s autopkgtest [12:19:58]: test build-modes-gbp: preparing testbed 162s autopkgtest [12:20:56]: testbed dpkg architecture: amd64 162s autopkgtest [12:20:56]: testbed apt version: 2.4.13 162s autopkgtest [12:20:56]: @@@@@@@@@@@@@@@@@@@@ test bed setup 162s autopkgtest [12:20:56]: testbed release detected to be: jammy 162s autopkgtest [12:20:56]: updating testbed package index (apt update) 162s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 162s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 162s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 162s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 162s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 162s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 162s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 162s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 162s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 162s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 162s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 162s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 162s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 162s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 162s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 162s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 162s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 166s Fetched 1719 kB in 1s (3323 kB/s) 167s Reading package lists... 167s autopkgtest [12:21:01]: upgrading testbed (apt dist-upgrade and autopurge) 167s Reading package lists... 167s Building dependency tree... 167s Reading state information... 168s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 168s Starting 2 pkgProblemResolver with broken count: 0 168s Done 168s Entering ResolveByKeep 168s 168s The following packages will be upgraded: 168s apt apt-utils libapt-pkg6.0 168s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 168s Need to get 2486 kB of archives. 168s After this operation, 0 B of additional disk space will be used. 168s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 169s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 169s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 169s Fetched 2486 kB in 0s (19.0 MB/s) 169s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 169s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 169s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 169s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 169s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 169s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 169s Unpacking apt (2.4.14) over (2.4.13) ... 169s Setting up apt (2.4.14) ... 170s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 170s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 170s Unpacking apt-utils (2.4.14) over (2.4.13) ... 170s Setting up apt-utils (2.4.14) ... 170s Processing triggers for man-db (2.10.2-1) ... 170s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 171s Reading package lists... 172s Building dependency tree... 172s Reading state information... 172s Starting pkgProblemResolver with broken count: 0 172s Starting 2 pkgProblemResolver with broken count: 0 172s Done 172s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 172s autopkgtest [12:21:06]: rebooting testbed after setup commands that affected boot 185s Reading package lists... 185s Building dependency tree... 185s Reading state information... 185s Starting pkgProblemResolver with broken count: 0 186s Starting 2 pkgProblemResolver with broken count: 0 186s Done 186s The following NEW packages will be installed: 186s autoconf automake autopoint autotools-dev bc build-essential 186s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 186s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 186s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 186s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 186s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 186s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 186s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 186s libdynaloader-functions-perl libencode-locale-perl liberror-perl 186s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 186s libfile-homedir-perl libfile-listing-perl libfile-stripnondeterminism-perl 186s libfile-touch-perl libfile-which-perl libgcc-11-dev libgomp1 186s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 186s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 186s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 186s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 186s liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 186s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 186s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 186s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 186s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 186s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 186s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 186s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 186s python3-dateutil python3-debian python3-gpg rpcsvc-proto sqlite3 wdiff 186s 0 upgraded, 113 newly installed, 0 to remove and 0 not upgraded. 186s Need to get 72.8 MB of archives. 186s After this operation, 247 MB of additional disk space will be used. 186s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 186s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 186s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 186s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 186s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 186s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 186s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 186s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 186s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 186s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 186s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 186s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 186s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 186s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 186s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 186s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 186s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 186s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 186s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 186s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 186s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 186s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 186s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 186s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 186s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 186s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 186s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 186s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 186s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 186s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 186s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 186s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 186s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 186s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 186s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 186s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 186s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 186s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 186s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 186s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 186s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 186s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 186s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 186s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 186s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 186s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 186s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 186s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 186s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 186s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 186s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 186s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 186s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 186s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 186s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 187s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 187s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 187s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 187s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 187s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 187s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 187s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 187s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 187s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 187s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 187s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 187s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 187s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 187s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 187s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 187s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 187s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 187s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 187s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 187s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 187s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 187s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 187s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 187s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 187s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 187s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 187s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 187s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 187s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 187s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 187s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 187s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 187s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 187s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 187s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 187s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 187s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 187s Get:93 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 187s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 187s Get:95 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 187s Get:96 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 187s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 187s Get:98 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 187s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 187s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 187s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 187s Get:102 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 187s Get:103 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 187s Get:104 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 187s Get:105 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 187s Get:106 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 187s Get:107 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 187s Get:108 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 187s Get:109 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 187s Get:110 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 187s Get:111 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 187s Get:112 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 187s Get:113 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 187s Fetched 72.8 MB in 1s (98.6 MB/s) 187s Selecting previously unselected package m4. 188s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 188s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 188s Unpacking m4 (1.4.18-5ubuntu2) ... 188s Selecting previously unselected package autoconf. 188s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 188s Unpacking autoconf (2.71-2) ... 188s Selecting previously unselected package autotools-dev. 188s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 188s Unpacking autotools-dev (20220109.1) ... 188s Selecting previously unselected package automake. 188s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 188s Unpacking automake (1:1.16.5-1.3) ... 188s Selecting previously unselected package autopoint. 188s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 188s Unpacking autopoint (0.21-4ubuntu4) ... 188s Selecting previously unselected package bc. 188s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 188s Unpacking bc (1.07.1-3build1) ... 188s Selecting previously unselected package libc-dev-bin. 188s Preparing to unpack .../006-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 188s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 188s Selecting previously unselected package linux-libc-dev:amd64. 188s Preparing to unpack .../007-linux-libc-dev_5.15.0-135.146_amd64.deb ... 188s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 188s Selecting previously unselected package libcrypt-dev:amd64. 188s Preparing to unpack .../008-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 188s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 188s Selecting previously unselected package rpcsvc-proto. 188s Preparing to unpack .../009-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 188s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 188s Selecting previously unselected package libtirpc-dev:amd64. 188s Preparing to unpack .../010-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 188s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 188s Selecting previously unselected package libnsl-dev:amd64. 188s Preparing to unpack .../011-libnsl-dev_1.3.0-2build2_amd64.deb ... 188s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 188s Selecting previously unselected package libc6-dev:amd64. 188s Preparing to unpack .../012-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 188s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 188s Selecting previously unselected package gcc-11-base:amd64. 188s Preparing to unpack .../013-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libisl23:amd64. 188s Preparing to unpack .../014-libisl23_0.24-2build1_amd64.deb ... 188s Unpacking libisl23:amd64 (0.24-2build1) ... 188s Selecting previously unselected package libmpc3:amd64. 188s Preparing to unpack .../015-libmpc3_1.2.1-2build1_amd64.deb ... 188s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 188s Selecting previously unselected package cpp-11. 188s Preparing to unpack .../016-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package cpp. 188s Preparing to unpack .../017-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 188s Unpacking cpp (4:11.2.0-1ubuntu1) ... 188s Selecting previously unselected package libcc1-0:amd64. 188s Preparing to unpack .../018-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libgomp1:amd64. 188s Preparing to unpack .../019-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libitm1:amd64. 188s Preparing to unpack .../020-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libatomic1:amd64. 188s Preparing to unpack .../021-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libasan6:amd64. 188s Preparing to unpack .../022-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package liblsan0:amd64. 188s Preparing to unpack .../023-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libtsan0:amd64. 188s Preparing to unpack .../024-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libubsan1:amd64. 188s Preparing to unpack .../025-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libquadmath0:amd64. 188s Preparing to unpack .../026-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package libgcc-11-dev:amd64. 188s Preparing to unpack .../027-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 188s Selecting previously unselected package gcc-11. 188s Preparing to unpack .../028-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 188s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 189s Selecting previously unselected package gcc. 189s Preparing to unpack .../029-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 189s Unpacking gcc (4:11.2.0-1ubuntu1) ... 189s Selecting previously unselected package libstdc++-11-dev:amd64. 189s Preparing to unpack .../030-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 189s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 189s Selecting previously unselected package g++-11. 189s Preparing to unpack .../031-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 189s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 189s Selecting previously unselected package g++. 189s Preparing to unpack .../032-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 189s Unpacking g++ (4:11.2.0-1ubuntu1) ... 189s Selecting previously unselected package build-essential. 189s Preparing to unpack .../033-build-essential_12.9ubuntu3_amd64.deb ... 189s Unpacking build-essential (12.9ubuntu3) ... 189s Selecting previously unselected package libdebhelper-perl. 189s Preparing to unpack .../034-libdebhelper-perl_13.6ubuntu1_all.deb ... 189s Unpacking libdebhelper-perl (13.6ubuntu1) ... 189s Selecting previously unselected package libtool. 189s Preparing to unpack .../035-libtool_2.4.6-15build2_all.deb ... 189s Unpacking libtool (2.4.6-15build2) ... 189s Selecting previously unselected package dh-autoreconf. 189s Preparing to unpack .../036-dh-autoreconf_20_all.deb ... 189s Unpacking dh-autoreconf (20) ... 189s Selecting previously unselected package libarchive-zip-perl. 189s Preparing to unpack .../037-libarchive-zip-perl_1.68-1_all.deb ... 189s Unpacking libarchive-zip-perl (1.68-1) ... 189s Selecting previously unselected package libsub-override-perl. 189s Preparing to unpack .../038-libsub-override-perl_0.09-2_all.deb ... 189s Unpacking libsub-override-perl (0.09-2) ... 189s Selecting previously unselected package libfile-stripnondeterminism-perl. 189s Preparing to unpack .../039-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 189s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 189s Selecting previously unselected package dh-strip-nondeterminism. 189s Preparing to unpack .../040-dh-strip-nondeterminism_1.13.0-1_all.deb ... 189s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 189s Selecting previously unselected package debugedit. 189s Preparing to unpack .../041-debugedit_1%3a5.0-4build1_amd64.deb ... 189s Unpacking debugedit (1:5.0-4build1) ... 189s Selecting previously unselected package dwz. 189s Preparing to unpack .../042-dwz_0.14-1build2_amd64.deb ... 189s Unpacking dwz (0.14-1build2) ... 189s Selecting previously unselected package gettext. 189s Preparing to unpack .../043-gettext_0.21-4ubuntu4_amd64.deb ... 189s Unpacking gettext (0.21-4ubuntu4) ... 189s Selecting previously unselected package intltool-debian. 189s Preparing to unpack .../044-intltool-debian_0.35.0+20060710.5_all.deb ... 189s Unpacking intltool-debian (0.35.0+20060710.5) ... 189s Selecting previously unselected package po-debconf. 189s Preparing to unpack .../045-po-debconf_1.0.21+nmu1_all.deb ... 189s Unpacking po-debconf (1.0.21+nmu1) ... 189s Selecting previously unselected package debhelper. 189s Preparing to unpack .../046-debhelper_13.6ubuntu1_all.deb ... 189s Unpacking debhelper (13.6ubuntu1) ... 189s Selecting previously unselected package libfakeroot:amd64. 189s Preparing to unpack .../047-libfakeroot_1.28-1ubuntu1_amd64.deb ... 189s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 189s Selecting previously unselected package fakeroot. 189s Preparing to unpack .../048-fakeroot_1.28-1ubuntu1_amd64.deb ... 189s Unpacking fakeroot (1.28-1ubuntu1) ... 189s Selecting previously unselected package libfile-dirlist-perl. 189s Preparing to unpack .../049-libfile-dirlist-perl_0.05-2_all.deb ... 189s Unpacking libfile-dirlist-perl (0.05-2) ... 189s Selecting previously unselected package libfile-which-perl. 189s Preparing to unpack .../050-libfile-which-perl_1.23-1_all.deb ... 189s Unpacking libfile-which-perl (1.23-1) ... 189s Selecting previously unselected package libfile-homedir-perl. 189s Preparing to unpack .../051-libfile-homedir-perl_1.006-1_all.deb ... 189s Unpacking libfile-homedir-perl (1.006-1) ... 189s Selecting previously unselected package libfile-touch-perl. 189s Preparing to unpack .../052-libfile-touch-perl_0.12-1_all.deb ... 189s Unpacking libfile-touch-perl (0.12-1) ... 189s Selecting previously unselected package libio-pty-perl. 189s Preparing to unpack .../053-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 189s Unpacking libio-pty-perl (1:1.15-2build2) ... 189s Selecting previously unselected package libipc-run-perl. 189s Preparing to unpack .../054-libipc-run-perl_20200505.0-1_all.deb ... 189s Unpacking libipc-run-perl (20200505.0-1) ... 189s Selecting previously unselected package libclass-method-modifiers-perl. 189s Preparing to unpack .../055-libclass-method-modifiers-perl_2.13-1_all.deb ... 189s Unpacking libclass-method-modifiers-perl (2.13-1) ... 189s Selecting previously unselected package libclass-xsaccessor-perl. 189s Preparing to unpack .../056-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 189s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 189s Selecting previously unselected package libb-hooks-op-check-perl. 189s Preparing to unpack .../057-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 189s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 189s Selecting previously unselected package libdynaloader-functions-perl. 189s Preparing to unpack .../058-libdynaloader-functions-perl_0.003-1.1_all.deb ... 189s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 189s Selecting previously unselected package libdevel-callchecker-perl. 189s Preparing to unpack .../059-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 189s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 189s Selecting previously unselected package libparams-classify-perl. 189s Preparing to unpack .../060-libparams-classify-perl_0.015-1build5_amd64.deb ... 189s Unpacking libparams-classify-perl (0.015-1build5) ... 189s Selecting previously unselected package libmodule-runtime-perl. 189s Preparing to unpack .../061-libmodule-runtime-perl_0.016-1_all.deb ... 189s Unpacking libmodule-runtime-perl (0.016-1) ... 189s Selecting previously unselected package libimport-into-perl. 189s Preparing to unpack .../062-libimport-into-perl_1.002005-1_all.deb ... 189s Unpacking libimport-into-perl (1.002005-1) ... 189s Selecting previously unselected package librole-tiny-perl. 189s Preparing to unpack .../063-librole-tiny-perl_2.002004-1_all.deb ... 189s Unpacking librole-tiny-perl (2.002004-1) ... 189s Selecting previously unselected package libsub-quote-perl. 189s Preparing to unpack .../064-libsub-quote-perl_2.006006-1_all.deb ... 189s Unpacking libsub-quote-perl (2.006006-1) ... 189s Selecting previously unselected package libmoo-perl. 189s Preparing to unpack .../065-libmoo-perl_2.005004-3_all.deb ... 189s Unpacking libmoo-perl (2.005004-3) ... 189s Selecting previously unselected package libencode-locale-perl. 189s Preparing to unpack .../066-libencode-locale-perl_1.05-1.1_all.deb ... 189s Unpacking libencode-locale-perl (1.05-1.1) ... 189s Selecting previously unselected package libtimedate-perl. 189s Preparing to unpack .../067-libtimedate-perl_2.3300-2_all.deb ... 189s Unpacking libtimedate-perl (2.3300-2) ... 189s Selecting previously unselected package libhttp-date-perl. 189s Preparing to unpack .../068-libhttp-date-perl_6.05-1_all.deb ... 189s Unpacking libhttp-date-perl (6.05-1) ... 189s Selecting previously unselected package libfile-listing-perl. 189s Preparing to unpack .../069-libfile-listing-perl_6.14-1_all.deb ... 189s Unpacking libfile-listing-perl (6.14-1) ... 189s Selecting previously unselected package libhtml-tagset-perl. 189s Preparing to unpack .../070-libhtml-tagset-perl_3.20-4_all.deb ... 189s Unpacking libhtml-tagset-perl (3.20-4) ... 189s Selecting previously unselected package liburi-perl. 189s Preparing to unpack .../071-liburi-perl_5.10-1_all.deb ... 189s Unpacking liburi-perl (5.10-1) ... 189s Selecting previously unselected package libhtml-parser-perl:amd64. 189s Preparing to unpack .../072-libhtml-parser-perl_3.76-1build2_amd64.deb ... 189s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 189s Selecting previously unselected package libhtml-tree-perl. 189s Preparing to unpack .../073-libhtml-tree-perl_5.07-2_all.deb ... 189s Unpacking libhtml-tree-perl (5.07-2) ... 189s Selecting previously unselected package libio-html-perl. 189s Preparing to unpack .../074-libio-html-perl_1.004-2_all.deb ... 189s Unpacking libio-html-perl (1.004-2) ... 189s Selecting previously unselected package liblwp-mediatypes-perl. 189s Preparing to unpack .../075-liblwp-mediatypes-perl_6.04-1_all.deb ... 189s Unpacking liblwp-mediatypes-perl (6.04-1) ... 189s Selecting previously unselected package libhttp-message-perl. 189s Preparing to unpack .../076-libhttp-message-perl_6.36-1_all.deb ... 189s Unpacking libhttp-message-perl (6.36-1) ... 189s Selecting previously unselected package libhttp-cookies-perl. 190s Preparing to unpack .../077-libhttp-cookies-perl_6.10-1_all.deb ... 190s Unpacking libhttp-cookies-perl (6.10-1) ... 190s Selecting previously unselected package libhttp-negotiate-perl. 190s Preparing to unpack .../078-libhttp-negotiate-perl_6.01-1_all.deb ... 190s Unpacking libhttp-negotiate-perl (6.01-1) ... 190s Selecting previously unselected package perl-openssl-defaults:amd64. 190s Preparing to unpack .../079-perl-openssl-defaults_5build2_amd64.deb ... 190s Unpacking perl-openssl-defaults:amd64 (5build2) ... 190s Selecting previously unselected package libnet-ssleay-perl:amd64. 190s Preparing to unpack .../080-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 190s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 190s Selecting previously unselected package libio-socket-ssl-perl. 190s Preparing to unpack .../081-libio-socket-ssl-perl_2.074-2_all.deb ... 190s Unpacking libio-socket-ssl-perl (2.074-2) ... 190s Selecting previously unselected package libnet-http-perl. 190s Preparing to unpack .../082-libnet-http-perl_6.22-1_all.deb ... 190s Unpacking libnet-http-perl (6.22-1) ... 190s Selecting previously unselected package liblwp-protocol-https-perl. 190s Preparing to unpack .../083-liblwp-protocol-https-perl_6.10-1_all.deb ... 190s Unpacking liblwp-protocol-https-perl (6.10-1) ... 190s Selecting previously unselected package libtry-tiny-perl. 190s Preparing to unpack .../084-libtry-tiny-perl_0.31-1_all.deb ... 190s Unpacking libtry-tiny-perl (0.31-1) ... 190s Selecting previously unselected package libwww-robotrules-perl. 190s Preparing to unpack .../085-libwww-robotrules-perl_6.02-1_all.deb ... 190s Unpacking libwww-robotrules-perl (6.02-1) ... 190s Selecting previously unselected package libwww-perl. 190s Preparing to unpack .../086-libwww-perl_6.61-1_all.deb ... 190s Unpacking libwww-perl (6.61-1) ... 190s Selecting previously unselected package patchutils. 190s Preparing to unpack .../087-patchutils_0.4.2-1build2_amd64.deb ... 190s Unpacking patchutils (0.4.2-1build2) ... 190s Selecting previously unselected package wdiff. 190s Preparing to unpack .../088-wdiff_1.2.2-2build3_amd64.deb ... 190s Unpacking wdiff (1.2.2-2build3) ... 190s Selecting previously unselected package devscripts. 190s Preparing to unpack .../089-devscripts_2.22.1ubuntu1_amd64.deb ... 190s Unpacking devscripts (2.22.1ubuntu1) ... 190s Selecting previously unselected package liberror-perl. 190s Preparing to unpack .../090-liberror-perl_0.17029-1_all.deb ... 190s Unpacking liberror-perl (0.17029-1) ... 190s Selecting previously unselected package git-man. 190s Preparing to unpack .../091-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 190s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 190s Selecting previously unselected package git. 190s Preparing to unpack .../092-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 190s Unpacking git (1:2.34.1-1ubuntu1.12) ... 190s Selecting previously unselected package python3-dateutil. 190s Preparing to unpack .../093-python3-dateutil_2.8.1-6_all.deb ... 190s Unpacking python3-dateutil (2.8.1-6) ... 190s Selecting previously unselected package git-buildpackage. 190s Preparing to unpack .../094-git-buildpackage_0.9.25_all.deb ... 190s Unpacking git-buildpackage (0.9.25) ... 190s Selecting previously unselected package libexporter-tiny-perl. 190s Preparing to unpack .../095-libexporter-tiny-perl_1.002002-1_all.deb ... 190s Unpacking libexporter-tiny-perl (1.002002-1) ... 190s Selecting previously unselected package liblist-moreutils-xs-perl. 190s Preparing to unpack .../096-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 190s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 190s Selecting previously unselected package liblist-moreutils-perl. 190s Preparing to unpack .../097-liblist-moreutils-perl_0.430-2_all.deb ... 190s Unpacking liblist-moreutils-perl (0.430-2) ... 190s Selecting previously unselected package python3-debian. 190s Preparing to unpack .../098-python3-debian_0.1.43ubuntu1.1_all.deb ... 190s Unpacking python3-debian (0.1.43ubuntu1.1) ... 190s Selecting previously unselected package python3-gpg. 190s Preparing to unpack .../099-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 190s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 190s Selecting previously unselected package dput. 190s Preparing to unpack .../100-dput_1.1.0ubuntu2.1_all.deb ... 190s Unpacking dput (1.1.0ubuntu2.1) ... 190s Selecting previously unselected package libjson-perl. 190s Preparing to unpack .../101-libjson-perl_4.04000-1_all.deb ... 190s Unpacking libjson-perl (4.04000-1) ... 190s Selecting previously unselected package libtext-glob-perl. 190s Preparing to unpack .../102-libtext-glob-perl_0.11-2_all.deb ... 190s Unpacking libtext-glob-perl (0.11-2) ... 190s Selecting previously unselected package libwww-curl-perl. 190s Preparing to unpack .../103-libwww-curl-perl_4.17-7build2_amd64.deb ... 190s Unpacking libwww-curl-perl (4.17-7build2) ... 190s Selecting previously unselected package libtext-csv-perl. 190s Preparing to unpack .../104-libtext-csv-perl_2.01-1_all.deb ... 190s Unpacking libtext-csv-perl (2.01-1) ... 190s Selecting previously unselected package dgit. 190s Preparing to unpack .../105-dgit_9.15_all.deb ... 190s Unpacking dgit (9.15) ... 190s Selecting previously unselected package libdbi-perl:amd64. 190s Preparing to unpack .../106-libdbi-perl_1.643-3build3_amd64.deb ... 190s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 190s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 190s Preparing to unpack .../107-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 190s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 190s Selecting previously unselected package sqlite3. 190s Preparing to unpack .../108-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 190s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 190s Selecting previously unselected package chiark-utils-bin. 190s Preparing to unpack .../109-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 190s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 190s Selecting previously unselected package dgit-infrastructure. 190s Preparing to unpack .../110-dgit-infrastructure_9.15_all.deb ... 190s Unpacking dgit-infrastructure (9.15) ... 190s Selecting previously unselected package libfaketime:amd64. 190s Preparing to unpack .../111-libfaketime_0.9.8-9_amd64.deb ... 190s Unpacking libfaketime:amd64 (0.9.8-9) ... 190s Selecting previously unselected package faketime. 190s Preparing to unpack .../112-faketime_0.9.8-9_amd64.deb ... 190s Unpacking faketime (0.9.8-9) ... 190s Setting up wdiff (1.2.2-2build3) ... 190s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 190s Setting up libfile-which-perl (1.23-1) ... 190s Setting up libdynaloader-functions-perl (0.003-1.1) ... 190s Setting up libtext-glob-perl (0.11-2) ... 190s Setting up libclass-method-modifiers-perl (2.13-1) ... 190s Setting up libio-pty-perl (1:1.15-2build2) ... 190s Setting up libarchive-zip-perl (1.68-1) ... 190s Setting up libhtml-tagset-perl (3.20-4) ... 190s Setting up libdebhelper-perl (13.6ubuntu1) ... 190s Setting up liblwp-mediatypes-perl (6.04-1) ... 190s Setting up libtry-tiny-perl (0.31-1) ... 190s Setting up perl-openssl-defaults:amd64 (5build2) ... 190s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 190s Setting up bc (1.07.1-3build1) ... 190s Setting up m4 (1.4.18-5ubuntu2) ... 190s Setting up libwww-curl-perl (4.17-7build2) ... 190s Setting up libencode-locale-perl (1.05-1.1) ... 190s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 190s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 190s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 190s Setting up chiark-utils-bin (6.1.2+nmu1) ... 190s Setting up fakeroot (1.28-1ubuntu1) ... 190s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 190s Setting up liberror-perl (0.17029-1) ... 190s Setting up patchutils (0.4.2-1build2) ... 190s Setting up autotools-dev (20220109.1) ... 190s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 190s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 190s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 191s Setting up python3-debian (0.1.43ubuntu1.1) ... 191s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up libmpc3:amd64 (1.2.1-2build1) ... 191s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up libio-html-perl (1.004-2) ... 191s Setting up autopoint (0.21-4ubuntu4) ... 191s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 191s Setting up libipc-run-perl (20200505.0-1) ... 191s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 191s Setting up autoconf (2.71-2) ... 191s Setting up libtimedate-perl (2.3300-2) ... 191s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up dwz (0.14-1build2) ... 191s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 191s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 191s Setting up libjson-perl (4.04000-1) ... 191s Setting up librole-tiny-perl (2.002004-1) ... 191s Setting up debugedit (1:5.0-4build1) ... 191s Setting up libsub-override-perl (0.09-2) ... 191s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 191s Setting up python3-dateutil (2.8.1-6) ... 191s Setting up libsub-quote-perl (2.006006-1) ... 191s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 191s Setting up libexporter-tiny-perl (1.002002-1) ... 191s Setting up libfile-dirlist-perl (0.05-2) ... 191s Setting up libisl23:amd64 (0.24-2build1) ... 191s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 191s Setting up libfile-homedir-perl (1.006-1) ... 191s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up liburi-perl (5.10-1) ... 191s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 191s Setting up libfile-touch-perl (0.12-1) ... 191s Setting up libdbi-perl:amd64 (1.643-3build3) ... 191s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 191s Setting up libfaketime:amd64 (0.9.8-9) ... 191s Setting up libtext-csv-perl (2.01-1) ... 191s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 191s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 191s Setting up automake (1:1.16.5-1.3) ... 191s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 191s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 191s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 191s Setting up faketime (0.9.8-9) ... 191s Setting up libhttp-date-perl (6.05-1) ... 191s Setting up gettext (0.21-4ubuntu4) ... 191s Setting up libfile-listing-perl (6.14-1) ... 191s Setting up liblist-moreutils-perl (0.430-2) ... 191s Setting up libnet-http-perl (6.22-1) ... 191s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 191s Setting up dput (1.1.0ubuntu2.1) ... 191s Setting up intltool-debian (0.35.0+20060710.5) ... 191s Setting up git (1:2.34.1-1ubuntu1.12) ... 191s Setting up dh-strip-nondeterminism (1.13.0-1) ... 191s Setting up libwww-robotrules-perl (6.02-1) ... 191s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 191s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 191s Setting up cpp (4:11.2.0-1ubuntu1) ... 191s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 191s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 191s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 191s Setting up libio-socket-ssl-perl (2.074-2) ... 191s Setting up libhttp-message-perl (6.36-1) ... 191s Setting up libhttp-negotiate-perl (6.01-1) ... 191s Setting up libhttp-cookies-perl (6.10-1) ... 191s Setting up libtool (2.4.6-15build2) ... 191s Setting up po-debconf (1.0.21+nmu1) ... 191s Setting up libhtml-tree-perl (5.07-2) ... 191s Setting up libparams-classify-perl (0.015-1build5) ... 191s Setting up gcc (4:11.2.0-1ubuntu1) ... 191s Setting up dh-autoreconf (20) ... 191s Setting up libmodule-runtime-perl (0.016-1) ... 191s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 191s Setting up dgit-infrastructure (9.15) ... 191s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 191s Setting up libimport-into-perl (1.002005-1) ... 191s Setting up libmoo-perl (2.005004-3) ... 191s Setting up debhelper (13.6ubuntu1) ... 191s Setting up g++ (4:11.2.0-1ubuntu1) ... 191s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 191s Setting up build-essential (12.9ubuntu3) ... 191s Setting up liblwp-protocol-https-perl (6.10-1) ... 191s Setting up libwww-perl (6.61-1) ... 191s Setting up devscripts (2.22.1ubuntu1) ... 191s Setting up git-buildpackage (0.9.25) ... 191s Setting up dgit (9.15) ... 191s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 191s Processing triggers for man-db (2.10.2-1) ... 192s Processing triggers for install-info (6.8-4build1) ... 193s autopkgtest [12:21:27]: test build-modes-gbp: [----------------------- 193s ++ set -o pipefail 193s ++ . tests/lib-core 193s ++ . tests/lib-restricts 193s ++ trap ' 193s rc=$? 193s set +x 193s test $rc = 0 || echo " 193s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 193s 193s Most relevant logs are just before assignment rc=$rc 193s Will now do cleanup etc. 193s " 193s set -x 193s set +e 193s pwd 193s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 193s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 193s set -e 193s test $rc = 0 || t-report-failure 193s ' EXIT 193s ++ t-filter-out-git-hyphen-dir 193s ++ local pathent 193s +++ type -p git-rev-parse 193s +++ : 193s ++ pathent= 193s ++ case "$pathent" in 193s ++ return 193s ++ t-set-intree 193s ++ '[' x = x ']' 193s ++ return 193s ++ : -D 193s ++ export DGIT_TEST_DEBUG 193s ++ : x 193s ++ export DGIT_TEST_DEBPUSH_DEBUG 193s ++ : 193s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 193s ++ GIT_COMMITTER_DATE='1530000000 +0100' 193s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 193s ++ GIT_AUTHOR_DATE='1530000000 +0100' 193s ++ export LC_CTYPE=C.UTF-8 193s ++ LC_CTYPE=C.UTF-8 193s ++ unset CDPATH 193s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 193s ++ FILTER_BRANCH_SQUELCH_WARNING=1 193s +++ pwd 193s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 193s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ testname=build-modes-gbp 193s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ bpd=.. 193s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 193s ++ '[' x '!=' x ']' 193s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s +++ pwd 193s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ t-set-using-tmp 193s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 193s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 193s ++ export 'DEBFULLNAME=dgit test git user' 193s ++ DEBFULLNAME='dgit test git user' 193s ++ git config --global user.email dgit-test@debian.example.net 193s ++ git config --global user.name 'dgit test git user' 193s ++ git config --global protocol.ext.allow always 193s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 193s ++ env -0 193s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 193s ++ export DEBCHANGE_VENDOR=dpkg 193s ++ DEBCHANGE_VENDOR=dpkg 193s ++ unset VISUAL 193s ++ unset GIT_EDITOR 193s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 193s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 193s ++ cat 193s ++ schroot=build 193s ++ : aq 193s ++ : archive/test-dummy 193s ++ : sid:unstable 193s ++ t-git-config dgit.default.old-dsc-distro test-dummy 193s ++ git config --global dgit.default.old-dsc-distro test-dummy 193s ++ for import in ${autoimport-gnupg} 193s ++ case "$0" in 193s ++ t-setup-import gnupg 193s ++ local setupname=gnupg 193s ++ local setupsrc 193s ++ local lock 193s ++ '[' x = x ']' 193s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 193s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 193s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 193s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 193s cd "$1"; shift 193s setupname="$1"; shift 193s simport="$1"; shift 193s if [ -e "$simport" ]; then exit 0; fi 193s env - "$@" \ 193s "tests/setup/$setupname" 193s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 193s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 193s + shift 193s + setupname=gnupg 193s + shift 193s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 193s + shift 193s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 193s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/build-modes-gbp-stderr --stdout=/tmp/autopkgtest.ztMUxl/build-modes-gbp-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/build-modes-gbp -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/build-modes-gbp' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 193s ++ set -o pipefail 193s ++ . tests/lib-core 193s ++ . tests/lib-restricts 193s ++ trap ' 193s rc=$? 193s set +x 193s test $rc = 0 || echo " 193s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 193s 193s Most relevant logs are just before assignment rc=$rc 193s Will now do cleanup etc. 193s " 193s set -x 193s set +e 193s pwd 193s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 193s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 193s set -e 193s test $rc = 0 || t-report-failure 193s ' EXIT 193s ++ t-filter-out-git-hyphen-dir 193s ++ local pathent 193s +++ type -p git-rev-parse 193s +++ : 193s ++ pathent= 193s ++ case "$pathent" in 193s ++ return 193s ++ t-set-intree 193s ++ '[' x = x ']' 193s ++ return 193s ++ : -D 193s ++ export DGIT_TEST_DEBUG 193s ++ : x 193s ++ export DGIT_TEST_DEBPUSH_DEBUG 193s ++ : 193s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 193s ++ GIT_COMMITTER_DATE='1530000000 +0100' 193s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 193s ++ GIT_AUTHOR_DATE='1530000000 +0100' 193s ++ export LC_CTYPE=C.UTF-8 193s ++ LC_CTYPE=C.UTF-8 193s ++ unset CDPATH 193s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 193s ++ FILTER_BRANCH_SQUELCH_WARNING=1 193s +++ pwd 193s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 193s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ testname=gnupg 193s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 193s ++ bpd=.. 193s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 193s ++ '[' x '!=' x ']' 193s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s +++ pwd 193s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ t-set-using-tmp 193s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 193s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 193s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 193s ++ export 'DEBFULLNAME=dgit test git user' 193s ++ DEBFULLNAME='dgit test git user' 193s ++ git config --global user.email dgit-test@debian.example.net 193s ++ git config --global user.name 'dgit test git user' 193s ++ git config --global protocol.ext.allow always 193s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 193s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 193s ++ export DEBCHANGE_VENDOR=dpkg 193s ++ DEBCHANGE_VENDOR=dpkg 193s ++ unset VISUAL 193s ++ unset GIT_EDITOR 193s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 193s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 193s ++ cat 193s ++ schroot=build 193s ++ : aq 193s ++ : archive/test-dummy 193s ++ : sid:unstable 193s ++ t-git-config dgit.default.old-dsc-distro test-dummy 193s ++ git config --global dgit.default.old-dsc-distro test-dummy 193s ++ for import in ${autoimport-gnupg} 193s ++ case "$0" in 193s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 193s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 193s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 193s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 193s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 193s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 193s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 193s + setup=' 193s export GNUPGHOME=$tmp/gnupg 193s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 193s 193s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 193s ssb rsa2048 2013-11-17 [E] 193s 193s sec rsa2048 2014-01-26 [SC] 193s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 193s uid [ultimate] Populus Romanus (test key) 193s ssb rsa2048 2014-01-26 [E] 193s 193s sec rsa2048 2014-01-26 [SC] 193s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 193s uid [ unknown] Hannibal (test key) 193s ssb rsa2048 2014-01-26 [E] 193s 193s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 193s export GNUPGHOME=$tmp/gnupg 193s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 193s 193s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 193s "sha256sum" => "$2", 193s "component" => "$3", 193s "filename" => "$4", 193s }; 193s END { 193s my $json = JSON->new->canonical(); 193s print $json->encode(\@v) or die $!; 193s } 193s ' 193s + t-aq-archive-updated new example 193s + local suite=new 193s + local p=example 193s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 193s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 193s + perl -wne ' 193s use JSON; 193s use strict; 193s our @v; 193s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 193s push @v, { 193s "version" => "$1", 193s "sha256sum" => "$2", 193s "component" => "$3", 193s "filename" => "$4", 193s }; 193s END { 193s my $json = JSON->new->canonical(); 193s print $json->encode(\@v) or die $!; 193s } 193s ' 193s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 193s + cat 193s + jsondelim=' },' 193s + cat 193s + t-git-none 193s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 193s + set -e 193s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 193s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 193s + t-worktree 1.0 193s + rm -rf example 193s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0 193s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 193s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 193s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 193s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 193s + cd example 193s + git show-ref --verify --quiet refs/heads/master 193s + cd .. 193s + cd example 193s + git checkout -b bad-build-deps indep-arch 193s Switched to a new branch 'bad-build-deps' 193s + perl -pe 's/Build-Depends.*/$&, x-dgit-no-such-package/' -i debian/control 193s + git commit -a -m bad-build-deps 193s [bad-build-deps d09bc55] bad-build-deps 193s 1 file changed, 1 insertion(+), 1 deletion(-) 193s + bm-prep-ownpackage-branches 'indep-arch bad-build-deps' 193s + cat 193s + chmod +x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git 193s + bm_branches='indep-arch bad-build-deps' 193s + zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' /usr/share/doc/dpkg-dev/changelog.gz 193s gzip: /usr/share/doc/dpkg-dev/changelog.gz: No such file or directory 193s + dpkgbuildpackage_deps_for_clean=false 193s + cleanmodes_default='git none' 193s + cleanmodes_default+=' dpkg-source,no-check' 193s + cleanmodes_default+=' dpkg-source-d,no-check' 193s + cleanmodes_all='git none dpkg-source,no-check dpkg-source-d,no-check git-ff check' 193s + cleanmodes_all+=' git,always git,always' 193s + cleanmodes='git none dpkg-source,no-check dpkg-source-d,no-check' 193s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 193s + bm-guess-e-source-e-targets 'gbp-build -S' 193s + local 'some_act=gbp-build -S' 193s + case "$some_act" in 193s + e_source=true 193s + e_targets=' ' 193s + real_act='gbp-build -S --git-ignore-branch' 193s + bm-act-iterate 193s + for cleanmode in $cleanmodes 193s + for branch in $bm_branches 193s + bm-run-one 193s + local 'args= --clean=git gbp-build -S --git-ignore-branch' 193s + bmid='gbp-build -S,git,indep-arch' 193s + bmid=gbp-build_-S,git,indep-arch 193s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 193s + heading='===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 193s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 193s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.expected 193s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.results 193s + bm-compute-expected 193s + require_fail=unexpect 193s + tolerate_fail=unexpect 193s + exec 193s + echo '===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 193s + local eff_cleanmode=git 193s + case "$e_targets" in 193s + eff_cleanmode=Cgit 193s + case "$act" in 193s + case $eff_cleanmode in 193s + echo 'BUILD-MODES PROGRAM git clean -dn' 193s + case $eff_cleanmode in 193s + '[' 'x ' '!=' x ']' 193s + bm-build-deps-ok 193s + case "$branch" in 193s + return 0 193s + bm-report-test 'SOURCE FILE' true 193s + local 'desc=SOURCE FILE' 193s + shift 193s + true 193s + echo 'SOURCE FILE EXISTS' 193s + bm-report-test 'SOURCE IN CHANGES' true 193s + local 'desc=SOURCE IN CHANGES' 193s + shift 193s + true 193s + echo 'SOURCE IN CHANGES EXISTS' 193s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 193s + local 'desc=DEBS IN CHANGES' 193s + shift 193s + expr ' ' : '.*binary.*' 193s 0 193s + echo 'DEBS IN CHANGES MISSING' 193s + exec 193s + git checkout indep-arch 193s Switched to branch 'indep-arch' 193s + git clean -xdf 193s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 193s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 193s + set +o pipefail 193s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 193s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 193s + local dgit=dgit 193s + pwd 193s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 193s + : ' 193s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 193s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 193s | git rev-parse --show-toplevel 193s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 193s | git config -z --get-regexp --local '.*' 193s | git config -z --get-regexp --local '.*' 193s | git config -z --get-regexp --global '.*' 193s | git config -z --get-regexp --system '.*' 193s format , quilt mode gbp 193s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 193s warning: could not open directory 'debian/source/': No such file or directory 193s => `' 193s + git diff --quiet HEAD 193s massage split -S. 193s massage done 1 -S. 193s format , quilt mode gbp 193s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 193s warning: could not open directory 'debian/source/': No such file or directory 193s => `' 193s + git diff --quiet HEAD 193s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -dn 193s BUILD-MODES PROGRAM git clean -dn 193s => `' 193s | git rev-parse 'HEAD~0' 193s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 193s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 193s CD work 193s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 193s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 193s CD .. 193s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 194s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 194s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 194s dpkg-source: info: using source format '1.0' 194s dpkg-source: info: building example in example_1.0.tar.gz 194s dpkg-source: info: building example in example_1.0.dsc 194s CD work 194s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 194s package seems new, not specifying -v 194s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 194s dpkg-genchanges: info: including full source code in upload 194s CD .. 194s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 194s renaming (Files) example_1.0.tar.gz 194s renaming (dsc) example_1.0.dsc 194s renaming (changes) example_1.0_source.changes 194s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s dgit ok: build successful 194s 194s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 194s ' 194s + local 'ps=0 0' 194s + set -o pipefail 194s + exec 194s + echo '===== [gbp-build_-S,git,indep-arch] dgit --clean=git gbp-build -S --git-ignore-branch =====' 194s + case $ps in 194s + actual_status=success 194s + case "$require_fail-$tolerate_fail-$actual_status" in 194s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.output 194s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + local 'desc=SOURCE FILE' 194s + shift 194s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + echo 'SOURCE FILE EXISTS' 194s + '[' success = success ']' 194s + local changes 194s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + case "$changes" in 194s + perl -ne 'print if m/^files:/i ... m/^\S/' 194s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + quirk-clean-fixup 194s + case $cleanmode in 194s + '[' success = failure ']' 194s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,indep-arch.results 194s + for branch in $bm_branches 194s + bm-run-one 194s + local 'args= --clean=git gbp-build -S --git-ignore-branch' 194s + bmid='gbp-build -S,git,bad-build-deps' 194s + bmid=gbp-build_-S,git,bad-build-deps 194s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 194s + heading='===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 194s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 194s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.expected 194s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.results 194s + bm-compute-expected 194s + require_fail=unexpect 194s + tolerate_fail=unexpect 194s + exec 194s + echo '===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 194s + local eff_cleanmode=git 194s + case "$e_targets" in 194s + eff_cleanmode=Cgit 194s + case "$act" in 194s + case $eff_cleanmode in 194s + echo 'BUILD-MODES PROGRAM git clean -dn' 194s + case $eff_cleanmode in 194s + '[' 'x ' '!=' x ']' 194s + bm-build-deps-ok 194s + case "$branch" in 194s + return 1 194s + tolerate_fail=tolerate 194s + bm-report-test 'SOURCE FILE' true 194s + local 'desc=SOURCE FILE' 194s + shift 194s + true 194s + echo 'SOURCE FILE EXISTS' 194s + bm-report-test 'SOURCE IN CHANGES' true 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + true 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + expr ' ' : '.*binary.*' 194s 0 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + git checkout bad-build-deps 194s Switched to branch 'bad-build-deps' 194s + git clean -xdf 194s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + set +o pipefail 194s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 194s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 194s + local dgit=dgit 194s + pwd 194s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s + : ' 194s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 194s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -S --git-ignore-branch 194s | git rev-parse --show-toplevel 194s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 194s | git config -z --get-regexp --local '.*' 194s | git config -z --get-regexp --local '.*' 194s | git config -z --get-regexp --global '.*' 194s | git config -z --get-regexp --system '.*' 194s format , quilt mode gbp 194s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s warning: could not open directory 'debian/source/': No such file or directory 194s => `' 194s + git diff --quiet HEAD 194s massage split -S. 194s massage done 1 -S. 194s format , quilt mode gbp 194s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s warning: could not open directory 'debian/source/': No such file or directory 194s => `' 194s + git diff --quiet HEAD 194s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -dn 194s BUILD-MODES PROGRAM git clean -dn 194s => `' 194s | git rev-parse 'HEAD~0' 194s => `d09bc55f43bc5586103335d232c16bd041247bd1' 194s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 194s CD work 194s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 194s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 194s CD .. 194s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 194s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 194s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 194s dpkg-source: info: using source format '1.0' 194s dpkg-source: info: building example in example_1.0.tar.gz 194s dpkg-source: info: building example in example_1.0.dsc 194s CD work 194s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 194s package seems new, not specifying -v 194s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 194s dpkg-genchanges: info: including full source code in upload 194s CD .. 194s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 194s renaming (Files) example_1.0.tar.gz 194s renaming (dsc) example_1.0.dsc 194s renaming (changes) example_1.0_source.changes 194s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s dgit ok: build successful 194s 194s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 194s ' 194s + local 'ps=0 0' 194s + set -o pipefail 194s + exec 194s + echo '===== [gbp-build_-S,git,bad-build-deps] dgit --clean=git gbp-build -S --git-ignore-branch =====' 194s + case $ps in 194s + actual_status=success 194s + case "$require_fail-$tolerate_fail-$actual_status" in 194s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.output 194s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + local 'desc=SOURCE FILE' 194s + shift 194s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + echo 'SOURCE FILE EXISTS' 194s + '[' success = success ']' 194s + local changes 194s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + case "$changes" in 194s + perl -ne 'print if m/^files:/i ... m/^\S/' 194s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + quirk-clean-fixup 194s + case $cleanmode in 194s + '[' success = failure ']' 194s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,git,bad-build-deps.results 194s + for cleanmode in $cleanmodes 194s + for branch in $bm_branches 194s + bm-run-one 194s + local 'args= --clean=none gbp-build -S --git-ignore-branch' 194s + bmid='gbp-build -S,none,indep-arch' 194s + bmid=gbp-build_-S,none,indep-arch 194s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 194s + heading='===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 194s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 194s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.expected 194s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.results 194s + bm-compute-expected 194s + require_fail=unexpect 194s + tolerate_fail=unexpect 194s + exec 194s + echo '===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 194s + local eff_cleanmode=none 194s + case "$e_targets" in 194s + eff_cleanmode=Cnone 194s + case "$act" in 194s + case $eff_cleanmode in 194s + case $eff_cleanmode in 194s + '[' 'x ' '!=' x ']' 194s + bm-build-deps-ok 194s + case "$branch" in 194s + return 0 194s + bm-report-test 'SOURCE FILE' true 194s + local 'desc=SOURCE FILE' 194s + shift 194s + true 194s + echo 'SOURCE FILE EXISTS' 194s + bm-report-test 'SOURCE IN CHANGES' true 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + true 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + expr ' ' : '.*binary.*' 194s 0 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + git checkout indep-arch 194s Switched to branch 'indep-arch' 194s + git clean -xdf 194s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + set +o pipefail 194s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 194s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 194s + local dgit=dgit 194s + pwd 194s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s + : ' 194s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 194s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 194s | git rev-parse --show-toplevel 194s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 194s | git config -z --get-regexp --local '.*' 194s | git config -z --get-regexp --local '.*' 194s | git config -z --get-regexp --global '.*' 194s | git config -z --get-regexp --system '.*' 194s format , quilt mode gbp 194s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s warning: could not open directory 'debian/source/': No such file or directory 194s => `' 194s + git diff --quiet HEAD 194s massage split -S. 194s massage done 1 -S. 194s format , quilt mode gbp 194s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 194s warning: could not open directory 'debian/source/': No such file or directory 194s => `' 194s + git diff --quiet HEAD 194s | git rev-parse 'HEAD~0' 194s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 194s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 194s CD work 194s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 194s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 194s CD .. 194s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 194s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 194s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 194s dpkg-source: info: using source format '1.0' 194s dpkg-source: info: building example in example_1.0.tar.gz 194s dpkg-source: info: building example in example_1.0.dsc 194s CD work 194s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 194s package seems new, not specifying -v 194s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 194s dpkg-genchanges: info: including full source code in upload 194s CD .. 194s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 194s renaming (Files) example_1.0.tar.gz 194s renaming (dsc) example_1.0.dsc 194s renaming (changes) example_1.0_source.changes 194s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s dgit ok: build successful 194s 194s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 194s ' 194s + local 'ps=0 0' 194s + set -o pipefail 194s + exec 194s + echo '===== [gbp-build_-S,none,indep-arch] dgit --clean=none gbp-build -S --git-ignore-branch =====' 194s + case $ps in 194s + actual_status=success 194s + case "$require_fail-$tolerate_fail-$actual_status" in 194s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.output 194s + '[' 1 = 1 ']' 194s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + local 'desc=SOURCE FILE' 194s + shift 194s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 194s + echo 'SOURCE FILE EXISTS' 194s + '[' success = success ']' 194s + local changes 194s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 194s + case "$changes" in 194s + perl -ne 'print if m/^files:/i ... m/^\S/' 194s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + quirk-clean-fixup 194s + case $cleanmode in 194s + '[' success = failure ']' 194s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,indep-arch.results 194s + for branch in $bm_branches 194s + bm-run-one 194s + local 'args= --clean=none gbp-build -S --git-ignore-branch' 194s + bmid='gbp-build -S,none,bad-build-deps' 194s + bmid=gbp-build_-S,none,bad-build-deps 194s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 194s + heading='===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 194s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 194s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.expected 194s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.results 194s + bm-compute-expected 194s + require_fail=unexpect 194s + tolerate_fail=unexpect 194s + exec 194s + echo '===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 194s + local eff_cleanmode=none 194s + case "$e_targets" in 194s + eff_cleanmode=Cnone 194s + case "$act" in 194s + case $eff_cleanmode in 194s + case $eff_cleanmode in 194s + '[' 'x ' '!=' x ']' 194s + bm-build-deps-ok 194s + case "$branch" in 194s + return 1 194s + tolerate_fail=tolerate 194s + bm-report-test 'SOURCE FILE' true 194s + local 'desc=SOURCE FILE' 194s + shift 194s + true 194s + echo 'SOURCE FILE EXISTS' 194s + bm-report-test 'SOURCE IN CHANGES' true 194s + local 'desc=SOURCE IN CHANGES' 194s + shift 194s + true 194s + echo 'SOURCE IN CHANGES EXISTS' 194s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 194s + local 'desc=DEBS IN CHANGES' 194s + shift 194s + expr ' ' : '.*binary.*' 194s 0 194s + echo 'DEBS IN CHANGES MISSING' 194s + exec 194s + git checkout bad-build-deps 194s Switched to branch 'bad-build-deps' 194s + git clean -xdf 194s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 194s + set +o pipefail 194s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 194s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 194s + local dgit=dgit 194s + pwd 194s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 194s + : ' 194s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 194s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -S --git-ignore-branch 195s | git rev-parse --show-toplevel 195s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --global '.*' 195s | git config -z --get-regexp --system '.*' 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s massage split -S. 195s massage done 1 -S. 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s | git rev-parse 'HEAD~0' 195s => `d09bc55f43bc5586103335d232c16bd041247bd1' 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 195s CD work 195s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 195s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 195s CD .. 195s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 195s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 195s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 195s dpkg-source: info: using source format '1.0' 195s dpkg-source: info: building example in example_1.0.tar.gz 195s dpkg-source: info: building example in example_1.0.dsc 195s CD work 195s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 195s package seems new, not specifying -v 195s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 195s dpkg-genchanges: info: including full source code in upload 195s CD .. 195s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 195s renaming (Files) example_1.0.tar.gz 195s renaming (dsc) example_1.0.dsc 195s renaming (changes) example_1.0_source.changes 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 195s dgit ok: build successful 195s 195s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 195s ' 195s + local 'ps=0 0' 195s + set -o pipefail 195s + exec 195s + echo '===== [gbp-build_-S,none,bad-build-deps] dgit --clean=none gbp-build -S --git-ignore-branch =====' 195s + case $ps in 195s + actual_status=success 195s + case "$require_fail-$tolerate_fail-$actual_status" in 195s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.output 195s + '[' 1 = 1 ']' 195s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + local 'desc=SOURCE FILE' 195s + shift 195s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + echo 'SOURCE FILE EXISTS' 195s + '[' success = success ']' 195s + local changes 195s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + case "$changes" in 195s + perl -ne 'print if m/^files:/i ... m/^\S/' 195s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + quirk-clean-fixup 195s + case $cleanmode in 195s + '[' success = failure ']' 195s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,none,bad-build-deps.results 195s + for cleanmode in $cleanmodes 195s + for branch in $bm_branches 195s + bm-run-one 195s + local 'args= --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch' 195s + bmid='gbp-build -S,dpkg-source,no-check,indep-arch' 195s + bmid=gbp-build_-S,dpkg-source,no-check,indep-arch 195s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 195s + heading='===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 195s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.expected 195s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 195s + bm-compute-expected 195s + require_fail=unexpect 195s + tolerate_fail=unexpect 195s + exec 195s + echo '===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + local eff_cleanmode=dpkg-source,no-check 195s + case "$e_targets" in 195s + eff_cleanmode=Cdpkg-source,no-check 195s + case "$act" in 195s + case $eff_cleanmode in 195s + case $eff_cleanmode in 195s + '[' 'x ' '!=' x ']' 195s + bm-build-deps-ok 195s + case "$branch" in 195s + return 0 195s + bm-report-test 'SOURCE FILE' true 195s + local 'desc=SOURCE FILE' 195s + shift 195s + true 195s + echo 'SOURCE FILE EXISTS' 195s + bm-report-test 'SOURCE IN CHANGES' true 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + true 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + expr ' ' : '.*binary.*' 195s 0 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + git checkout indep-arch 195s Switched to branch 'indep-arch' 195s + git clean -xdf 195s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 195s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 195s + set +o pipefail 195s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 195s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 195s + local dgit=dgit 195s + pwd 195s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 195s + : ' 195s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 195s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 195s | git rev-parse --show-toplevel 195s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --global '.*' 195s | git config -z --get-regexp --system '.*' 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s massage split -S. 195s massage done 1 -S. 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s | git rev-parse 'HEAD~0' 195s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 195s CD work 195s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 195s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 195s CD .. 195s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 195s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 195s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 195s dpkg-source: info: using source format '1.0' 195s dpkg-source: info: building example in example_1.0.tar.gz 195s dpkg-source: info: building example in example_1.0.dsc 195s CD work 195s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 195s package seems new, not specifying -v 195s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 195s dpkg-genchanges: info: including full source code in upload 195s CD .. 195s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 195s renaming (Files) example_1.0.tar.gz 195s renaming (dsc) example_1.0.dsc 195s renaming (changes) example_1.0_source.changes 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 195s dgit ok: build successful 195s 195s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 195s ' 195s + local 'ps=0 0' 195s + set -o pipefail 195s + exec 195s + echo '===== [gbp-build_-S,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + case $ps in 195s + actual_status=success 195s + case "$require_fail-$tolerate_fail-$actual_status" in 195s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.output 195s + '[' 1 = 1 ']' 195s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + local 'desc=SOURCE FILE' 195s + shift 195s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + echo 'SOURCE FILE EXISTS' 195s + '[' success = success ']' 195s + local changes 195s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + case "$changes" in 195s + perl -ne 'print if m/^files:/i ... m/^\S/' 195s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + quirk-clean-fixup 195s + case $cleanmode in 195s + perl -i.unfixed -ne ' 195s print unless 195s $_ eq $last && 195s $_ eq "EXAMPLE RULES TARGET clean\n"; 195s $last = $_; 195s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 195s + '[' success = failure ']' 195s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,indep-arch.results 195s + for branch in $bm_branches 195s + bm-run-one 195s + local 'args= --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch' 195s + bmid='gbp-build -S,dpkg-source,no-check,bad-build-deps' 195s + bmid=gbp-build_-S,dpkg-source,no-check,bad-build-deps 195s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 195s + heading='===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 195s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.expected 195s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 195s + bm-compute-expected 195s + require_fail=unexpect 195s + tolerate_fail=unexpect 195s + exec 195s + echo '===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + local eff_cleanmode=dpkg-source,no-check 195s + case "$e_targets" in 195s + eff_cleanmode=Cdpkg-source,no-check 195s + case "$act" in 195s + case $eff_cleanmode in 195s + case $eff_cleanmode in 195s + '[' 'x ' '!=' x ']' 195s + bm-build-deps-ok 195s + case "$branch" in 195s + return 1 195s + tolerate_fail=tolerate 195s + bm-report-test 'SOURCE FILE' true 195s + local 'desc=SOURCE FILE' 195s + shift 195s + true 195s + echo 'SOURCE FILE EXISTS' 195s + bm-report-test 'SOURCE IN CHANGES' true 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + true 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + expr ' ' : '.*binary.*' 195s 0 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + git checkout bad-build-deps 195s Switched to branch 'bad-build-deps' 195s + git clean -xdf 195s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 195s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 195s + set +o pipefail 195s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 195s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 195s + local dgit=dgit 195s + pwd 195s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 195s + : ' 195s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 195s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch 195s | git rev-parse --show-toplevel 195s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --local '.*' 195s | git config -z --get-regexp --global '.*' 195s | git config -z --get-regexp --system '.*' 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s massage split -S. 195s massage done 1 -S. 195s format , quilt mode gbp 195s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 195s warning: could not open directory 'debian/source/': No such file or directory 195s => `' 195s + git diff --quiet HEAD 195s | git rev-parse 'HEAD~0' 195s => `d09bc55f43bc5586103335d232c16bd041247bd1' 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 195s CD work 195s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 195s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 195s CD .. 195s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 195s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 195s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 195s dpkg-source: info: using source format '1.0' 195s dpkg-source: info: building example in example_1.0.tar.gz 195s dpkg-source: info: building example in example_1.0.dsc 195s CD work 195s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 195s package seems new, not specifying -v 195s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 195s dpkg-genchanges: info: including full source code in upload 195s CD .. 195s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 195s renaming (Files) example_1.0.tar.gz 195s renaming (dsc) example_1.0.dsc 195s renaming (changes) example_1.0_source.changes 195s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 195s dgit ok: build successful 195s 195s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 195s ' 195s + local 'ps=0 0' 195s + set -o pipefail 195s + exec 195s + echo '===== [gbp-build_-S,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -S --git-ignore-branch =====' 195s + case $ps in 195s + actual_status=success 195s + case "$require_fail-$tolerate_fail-$actual_status" in 195s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.output 195s + '[' 1 = 1 ']' 195s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + local 'desc=SOURCE FILE' 195s + shift 195s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 195s + echo 'SOURCE FILE EXISTS' 195s + '[' success = success ']' 195s + local changes 195s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 195s + case "$changes" in 195s + perl -ne 'print if m/^files:/i ... m/^\S/' 195s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + quirk-clean-fixup 195s + case $cleanmode in 195s + perl -i.unfixed -ne ' 195s print unless 195s $_ eq $last && 195s $_ eq "EXAMPLE RULES TARGET clean\n"; 195s $last = $_; 195s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 195s + '[' success = failure ']' 195s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source,no-check,bad-build-deps.results 195s + for cleanmode in $cleanmodes 195s + for branch in $bm_branches 195s + bm-run-one 195s + local 'args= --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch' 195s + bmid='gbp-build -S,dpkg-source-d,no-check,indep-arch' 195s + bmid=gbp-build_-S,dpkg-source-d,no-check,indep-arch 195s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 195s + heading='===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 195s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 195s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.expected 195s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 195s + bm-compute-expected 195s + require_fail=unexpect 195s + tolerate_fail=unexpect 195s + exec 195s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 195s + local eff_cleanmode=dpkg-source-d,no-check 195s + case "$e_targets" in 195s + eff_cleanmode=Cdpkg-source-d,no-check 195s + case "$act" in 195s + case $eff_cleanmode in 195s + case $eff_cleanmode in 195s + '[' 'x ' '!=' x ']' 195s + bm-build-deps-ok 195s + case "$branch" in 195s + return 0 195s + bm-report-test 'SOURCE FILE' true 195s + local 'desc=SOURCE FILE' 195s + shift 195s + true 195s + echo 'SOURCE FILE EXISTS' 195s + bm-report-test 'SOURCE IN CHANGES' true 195s + local 'desc=SOURCE IN CHANGES' 195s + shift 195s + true 195s + echo 'SOURCE IN CHANGES EXISTS' 195s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 195s + local 'desc=DEBS IN CHANGES' 195s + shift 195s + expr ' ' : '.*binary.*' 195s 0 195s + echo 'DEBS IN CHANGES MISSING' 195s + exec 195s + git checkout indep-arch 196s Switched to branch 'indep-arch' 196s + git clean -xdf 196s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + set +o pipefail 196s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 196s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 196s + local dgit=dgit 196s + pwd 196s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 196s + : ' 196s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 196s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 196s | git rev-parse --show-toplevel 196s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --global '.*' 196s | git config -z --get-regexp --system '.*' 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s massage split -S. 196s massage done 1 -S. 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s | git rev-parse 'HEAD~0' 196s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 196s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 196s CD work 196s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 196s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 196s CD .. 196s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 196s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 196s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 196s dpkg-source: info: using source format '1.0' 196s dpkg-source: info: building example in example_1.0.tar.gz 196s dpkg-source: info: building example in example_1.0.dsc 196s CD work 196s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 196s package seems new, not specifying -v 196s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 196s dpkg-genchanges: info: including full source code in upload 196s CD .. 196s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 196s renaming (Files) example_1.0.tar.gz 196s renaming (dsc) example_1.0.dsc 196s renaming (changes) example_1.0_source.changes 196s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 196s dgit ok: build successful 196s 196s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 196s ' 196s + local 'ps=0 0' 196s + set -o pipefail 196s + exec 196s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 196s + case $ps in 196s + actual_status=success 196s + case "$require_fail-$tolerate_fail-$actual_status" in 196s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.output 196s + '[' 1 = 1 ']' 196s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 196s + local 'desc=SOURCE FILE' 196s + shift 196s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 196s + echo 'SOURCE FILE EXISTS' 196s + '[' success = success ']' 196s + local changes 196s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 196s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 196s + case "$changes" in 196s + perl -ne 'print if m/^files:/i ... m/^\S/' 196s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + local 'desc=SOURCE IN CHANGES' 196s + shift 196s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 196s + echo 'SOURCE IN CHANGES EXISTS' 196s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + local 'desc=DEBS IN CHANGES' 196s + shift 196s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + echo 'DEBS IN CHANGES MISSING' 196s + exec 196s + quirk-clean-fixup 196s + case $cleanmode in 196s + perl -i.unfixed -ne ' 196s print unless 196s $_ eq $last && 196s $_ eq "EXAMPLE RULES TARGET clean\n"; 196s $last = $_; 196s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 196s + '[' success = failure ']' 196s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,indep-arch.results 196s + for branch in $bm_branches 196s + bm-run-one 196s + local 'args= --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch' 196s + bmid='gbp-build -S,dpkg-source-d,no-check,bad-build-deps' 196s + bmid=gbp-build_-S,dpkg-source-d,no-check,bad-build-deps 196s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 196s + heading='===== [gbp-build_-S,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 196s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 196s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.expected 196s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 196s + bm-compute-expected 196s + require_fail=unexpect 196s + tolerate_fail=unexpect 196s + exec 196s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 196s + local eff_cleanmode=dpkg-source-d,no-check 196s + case "$e_targets" in 196s + eff_cleanmode=Cdpkg-source-d,no-check 196s + case "$act" in 196s + case $eff_cleanmode in 196s + case $eff_cleanmode in 196s + '[' 'x ' '!=' x ']' 196s + bm-build-deps-ok 196s + case "$branch" in 196s + return 1 196s + tolerate_fail=tolerate 196s + bm-report-test 'SOURCE FILE' true 196s + local 'desc=SOURCE FILE' 196s + shift 196s + true 196s + echo 'SOURCE FILE EXISTS' 196s + bm-report-test 'SOURCE IN CHANGES' true 196s + local 'desc=SOURCE IN CHANGES' 196s + shift 196s + true 196s + echo 'SOURCE IN CHANGES EXISTS' 196s + bm-report-test 'DEBS IN CHANGES' expr ' ' : '.*binary.*' 196s + local 'desc=DEBS IN CHANGES' 196s + shift 196s + expr ' ' : '.*binary.*' 196s 0 196s + echo 'DEBS IN CHANGES MISSING' 196s + exec 196s + git checkout bad-build-deps 196s Switched to branch 'bad-build-deps' 196s + git clean -xdf 196s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + set +o pipefail 196s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 196s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 196s + local dgit=dgit 196s + pwd 196s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 196s + : ' 196s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 196s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch 196s | git rev-parse --show-toplevel 196s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --global '.*' 196s | git config -z --get-regexp --system '.*' 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s massage split -S. 196s massage done 1 -S. 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s | git rev-parse 'HEAD~0' 196s => `d09bc55f43bc5586103335d232c16bd041247bd1' 196s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 196s CD work 196s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 196s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 196s CD .. 196s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 196s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 196s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 196s dpkg-source: info: using source format '1.0' 196s dpkg-source: info: building example in example_1.0.tar.gz 196s dpkg-source: info: building example in example_1.0.dsc 196s CD work 196s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 196s package seems new, not specifying -v 196s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 196s dpkg-genchanges: info: including full source code in upload 196s CD .. 196s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 196s renaming (Files) example_1.0.tar.gz 196s renaming (dsc) example_1.0.dsc 196s renaming (changes) example_1.0_source.changes 196s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 196s dgit ok: build successful 196s 196s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 196s ' 196s + local 'ps=0 0' 196s + set -o pipefail 196s + exec 196s + echo '===== [gbp-build_-S,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -S --git-ignore-branch =====' 196s + case $ps in 196s + actual_status=success 196s + case "$require_fail-$tolerate_fail-$actual_status" in 196s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.output 196s + '[' 1 = 1 ']' 196s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 196s + local 'desc=SOURCE FILE' 196s + shift 196s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 196s + echo 'SOURCE FILE EXISTS' 196s + '[' success = success ']' 196s + local changes 196s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 196s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes 196s + case "$changes" in 196s + perl -ne 'print if m/^files:/i ... m/^\S/' 196s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + local 'desc=SOURCE IN CHANGES' 196s + shift 196s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s dfa974eaf4bfa9d67cc18cee1b69b830 585 devel extra example_1.0.dsc 196s + echo 'SOURCE IN CHANGES EXISTS' 196s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + local 'desc=DEBS IN CHANGES' 196s + shift 196s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_source.changes.files 196s + echo 'DEBS IN CHANGES MISSING' 196s + exec 196s + quirk-clean-fixup 196s + case $cleanmode in 196s + perl -i.unfixed -ne ' 196s print unless 196s $_ eq $last && 196s $_ eq "EXAMPLE RULES TARGET clean\n"; 196s $last = $_; 196s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 196s + '[' success = failure ']' 196s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-S,dpkg-source-d,no-check,bad-build-deps.results 196s + : bm-act-iterate done. 196s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 196s + bm-guess-e-source-e-targets 'gbp-build -b' 196s + local 'some_act=gbp-build -b' 196s + case "$some_act" in 196s + e_source=false 196s + e_targets='build binary' 196s + real_act='gbp-build -b --git-ignore-branch' 196s + bm-act-iterate 196s + for cleanmode in $cleanmodes 196s + for branch in $bm_branches 196s + bm-run-one 196s + local 'args= --clean=git gbp-build -b --git-ignore-branch' 196s + bmid='gbp-build -b,git,indep-arch' 196s + bmid=gbp-build_-b,git,indep-arch 196s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 196s + heading='===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 196s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 196s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.expected 196s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.results 196s + bm-compute-expected 196s + require_fail=unexpect 196s + tolerate_fail=unexpect 196s + exec 196s + echo '===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 196s + local eff_cleanmode=git 196s + case "$e_targets" in 196s + case "$act" in 196s + case $eff_cleanmode in 196s + echo 'BUILD-MODES PROGRAM git clean -xdf' 196s + case $eff_cleanmode in 196s + '[' 'xbuild binary' '!=' x ']' 196s + bm-build-deps-ok 196s + case "$branch" in 196s + return 0 196s + for t in $e_targets 196s + bm-build-deps-ok 196s + case "$branch" in 196s + return 0 196s + echo 'EXAMPLE RULES TARGET build' 196s + for t in $e_targets 196s + bm-build-deps-ok 196s + case "$branch" in 196s + return 0 196s + echo 'EXAMPLE RULES TARGET binary' 196s + bm-report-test 'SOURCE FILE' false 196s + local 'desc=SOURCE FILE' 196s + shift 196s + false 196s + echo 'SOURCE FILE MISSING' 196s + bm-report-test 'SOURCE IN CHANGES' false 196s + local 'desc=SOURCE IN CHANGES' 196s + shift 196s + false 196s + echo 'SOURCE IN CHANGES MISSING' 196s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 196s + local 'desc=DEBS IN CHANGES' 196s + shift 196s + expr 'build binary' : '.*binary.*' 196s 12 196s + echo 'DEBS IN CHANGES EXISTS' 196s + exec 196s + git checkout indep-arch 196s Switched to branch 'indep-arch' 196s + git clean -xdf 196s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 196s + set +o pipefail 196s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 196s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 196s + local dgit=dgit 196s + pwd 196s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 196s + : ' 196s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 196s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 196s | git rev-parse --show-toplevel 196s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --local '.*' 196s | git config -z --get-regexp --global '.*' 196s | git config -z --get-regexp --system '.*' 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s massage split -b. 196s massage done 2 -b. 196s format , quilt mode gbp 196s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 196s warning: could not open directory 'debian/source/': No such file or directory 196s => `' 196s + git diff --quiet HEAD 196s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 196s BUILD-MODES PROGRAM git clean -xdf 196s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 196s package seems new, not specifying -v 196s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 196s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 196s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 196s gbp:info: Performing the build 197s dpkg-buildpackage: info: source package example 197s dpkg-buildpackage: info: source version 1.0 197s dpkg-buildpackage: info: source distribution unstable 197s dpkg-buildpackage: info: source changed by Ian Jackson 197s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 197s dpkg-buildpackage: info: host architecture amd64 197s debian/rules build 197s EXAMPLE RULES TARGET build 197s fakeroot debian/rules binary 197s EXAMPLE RULES TARGET binary 197s dh_install 197s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 197s dh_gencontrol 197s dh_builddeb 197s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 197s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 197s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 197s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 197s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 197s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 197s dpkg-genchanges: info: binary-only upload (no source code included) 197s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 197s dpkg-buildpackage: info: binary-only upload (no source included) 197s dgit ok: build successful 197s 197s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 197s ' 197s + local 'ps=0 0' 197s + set -o pipefail 197s + exec 197s + echo '===== [gbp-build_-b,git,indep-arch] dgit --clean=git gbp-build -b --git-ignore-branch =====' 197s + case $ps in 197s + actual_status=success 197s + case "$require_fail-$tolerate_fail-$actual_status" in 197s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.output 197s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 197s + local 'desc=SOURCE FILE' 197s + shift 197s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 197s + echo 'SOURCE FILE MISSING' 197s + '[' success = success ']' 197s + local changes 197s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 197s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 197s + case "$changes" in 197s + perl -ne 'print if m/^files:/i ... m/^\S/' 197s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 197s + local 'desc=SOURCE IN CHANGES' 197s + shift 197s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 197s + echo 'SOURCE IN CHANGES MISSING' 197s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 197s + local 'desc=DEBS IN CHANGES' 197s + shift 197s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 197s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 197s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 197s + echo 'DEBS IN CHANGES EXISTS' 197s + exec 197s + quirk-clean-fixup 197s + case $cleanmode in 197s + '[' success = failure ']' 197s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,indep-arch.results 197s + for branch in $bm_branches 197s + bm-run-one 197s + local 'args= --clean=git gbp-build -b --git-ignore-branch' 197s + bmid='gbp-build -b,git,bad-build-deps' 197s + bmid=gbp-build_-b,git,bad-build-deps 197s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 197s + heading='===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 197s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 197s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.expected 197s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.results 197s + bm-compute-expected 197s + require_fail=unexpect 197s + tolerate_fail=unexpect 197s + exec 197s + echo '===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 197s + local eff_cleanmode=git 197s + case "$e_targets" in 197s + case "$act" in 197s + case $eff_cleanmode in 197s + echo 'BUILD-MODES PROGRAM git clean -xdf' 197s + case $eff_cleanmode in 197s + '[' 'xbuild binary' '!=' x ']' 197s + bm-build-deps-ok 197s + case "$branch" in 197s + return 1 197s + tolerate_fail=tolerate 197s + for t in $e_targets 197s + bm-build-deps-ok 197s + case "$branch" in 197s + return 1 197s + require_fail=required 197s + echo 'EXAMPLE RULES TARGET build' 197s + for t in $e_targets 197s + bm-build-deps-ok 197s + case "$branch" in 197s + return 1 197s + require_fail=required 197s + echo 'EXAMPLE RULES TARGET binary' 197s + bm-report-test 'SOURCE FILE' false 197s + local 'desc=SOURCE FILE' 197s + shift 197s + false 197s + echo 'SOURCE FILE MISSING' 197s + bm-report-test 'SOURCE IN CHANGES' false 197s + local 'desc=SOURCE IN CHANGES' 197s + shift 197s + false 197s + echo 'SOURCE IN CHANGES MISSING' 197s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 197s + local 'desc=DEBS IN CHANGES' 197s + shift 197s + expr 'build binary' : '.*binary.*' 197s 12 197s + echo 'DEBS IN CHANGES EXISTS' 197s + exec 197s + git checkout bad-build-deps 197s Switched to branch 'bad-build-deps' 197s + git clean -xdf 197s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 197s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 197s + set +o pipefail 197s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 197s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 197s + local dgit=dgit 197s + pwd 197s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 197s + : ' 197s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 197s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -b --git-ignore-branch 197s | git rev-parse --show-toplevel 197s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 197s | git config -z --get-regexp --local '.*' 197s | git config -z --get-regexp --local '.*' 197s | git config -z --get-regexp --global '.*' 197s | git config -z --get-regexp --system '.*' 197s format , quilt mode gbp 197s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 197s warning: could not open directory 'debian/source/': No such file or directory 197s => `' 197s + git diff --quiet HEAD 197s massage split -b. 197s massage done 2 -b. 197s format , quilt mode gbp 197s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 197s warning: could not open directory 'debian/source/': No such file or directory 197s => `' 197s + git diff --quiet HEAD 197s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 197s BUILD-MODES PROGRAM git clean -xdf 197s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 197s package seems new, not specifying -v 197s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 197s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 197s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 197s gbp:info: Performing the build 197s dpkg-buildpackage: info: source package example 197s dpkg-buildpackage: info: source version 1.0 197s dpkg-buildpackage: info: source distribution unstable 197s dpkg-buildpackage: info: source changed by Ian Jackson 198s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 198s dpkg-buildpackage: info: host architecture amd64 198s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 198s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 198s dpkg-buildpackage: warning: (Use -d flag to override.) 198s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 198s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 198s 198s dgit: error: subprocess failed with error exit status 1 198s + local 'ps=255 0' 198s + set -o pipefail 198s + exec 198s + echo '===== [gbp-build_-b,git,bad-build-deps] dgit --clean=git gbp-build -b --git-ignore-branch =====' 198s + case $ps in 198s + actual_status=failure 198s + echo 'OPERATION FAILED' 198s + case "$require_fail-$tolerate_fail-$actual_status" in 198s + echo 'REQUIRED FAILURE' 198s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,git,bad-build-deps.output 198s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 198s + local 'desc=SOURCE FILE' 198s + shift 198s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 198s + echo 'SOURCE FILE MISSING' 198s + '[' failure = success ']' 198s + exec 198s + quirk-clean-fixup 198s + case $cleanmode in 198s + '[' failure = failure ']' 198s + for cleanmode in $cleanmodes 198s + for branch in $bm_branches 198s + bm-run-one 198s + local 'args= --clean=none gbp-build -b --git-ignore-branch' 198s + bmid='gbp-build -b,none,indep-arch' 198s + bmid=gbp-build_-b,none,indep-arch 198s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 198s + heading='===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 198s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 198s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.expected 198s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.results 198s + bm-compute-expected 198s + require_fail=unexpect 198s + tolerate_fail=unexpect 198s + exec 198s + echo '===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 198s + local eff_cleanmode=none 198s + case "$e_targets" in 198s + case "$act" in 198s + case $eff_cleanmode in 198s + case $eff_cleanmode in 198s + '[' 'xbuild binary' '!=' x ']' 198s + bm-build-deps-ok 198s + case "$branch" in 198s + return 0 198s + for t in $e_targets 198s + bm-build-deps-ok 198s + case "$branch" in 198s + return 0 198s + echo 'EXAMPLE RULES TARGET build' 198s + for t in $e_targets 198s + bm-build-deps-ok 198s + case "$branch" in 198s + return 0 198s + echo 'EXAMPLE RULES TARGET binary' 198s + bm-report-test 'SOURCE FILE' false 198s + local 'desc=SOURCE FILE' 198s + shift 198s + false 198s + echo 'SOURCE FILE MISSING' 198s + bm-report-test 'SOURCE IN CHANGES' false 198s + local 'desc=SOURCE IN CHANGES' 198s + shift 198s + false 198s + echo 'SOURCE IN CHANGES MISSING' 198s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 198s + local 'desc=DEBS IN CHANGES' 198s + shift 198s + expr 'build binary' : '.*binary.*' 198s 12 198s + echo 'DEBS IN CHANGES EXISTS' 198s + exec 198s + git checkout indep-arch 198s Switched to branch 'indep-arch' 198s + git clean -xdf 198s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 198s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 198s + set +o pipefail 198s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 198s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 198s + local dgit=dgit 198s + pwd 198s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 198s + : ' 198s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 198s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 198s | git rev-parse --show-toplevel 198s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 198s | git config -z --get-regexp --local '.*' 198s | git config -z --get-regexp --local '.*' 198s | git config -z --get-regexp --global '.*' 198s | git config -z --get-regexp --system '.*' 198s format , quilt mode gbp 198s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 198s warning: could not open directory 'debian/source/': No such file or directory 198s => `' 198s + git diff --quiet HEAD 198s massage split -b. 198s massage done 2 -b. 198s format , quilt mode gbp 198s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 198s warning: could not open directory 'debian/source/': No such file or directory 198s => `' 198s + git diff --quiet HEAD 198s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 198s package seems new, not specifying -v 198s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 198s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 198s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 198s gbp:info: Performing the build 198s dpkg-buildpackage: info: source package example 198s dpkg-buildpackage: info: source version 1.0 198s dpkg-buildpackage: info: source distribution unstable 198s dpkg-buildpackage: info: source changed by Ian Jackson 198s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 198s dpkg-buildpackage: info: host architecture amd64 198s debian/rules build 198s EXAMPLE RULES TARGET build 198s fakeroot debian/rules binary 198s EXAMPLE RULES TARGET binary 198s dh_install 198s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 198s dh_gencontrol 198s dh_builddeb 198s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 198s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 198s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 198s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 198s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 198s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 199s dpkg-genchanges: info: binary-only upload (no source code included) 199s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 199s dpkg-buildpackage: info: binary-only upload (no source included) 199s dgit ok: build successful 199s 199s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 199s ' 199s + local 'ps=0 0' 199s + set -o pipefail 199s + exec 199s + echo '===== [gbp-build_-b,none,indep-arch] dgit --clean=none gbp-build -b --git-ignore-branch =====' 199s + case $ps in 199s + actual_status=success 199s + case "$require_fail-$tolerate_fail-$actual_status" in 199s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.output 199s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 199s + local 'desc=SOURCE FILE' 199s + shift 199s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 199s + echo 'SOURCE FILE MISSING' 199s + '[' success = success ']' 199s + local changes 199s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 199s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 199s + case "$changes" in 199s + perl -ne 'print if m/^files:/i ... m/^\S/' 199s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 199s + local 'desc=SOURCE IN CHANGES' 199s + shift 199s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 199s + echo 'SOURCE IN CHANGES MISSING' 199s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 199s + local 'desc=DEBS IN CHANGES' 199s + shift 199s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 199s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 199s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 199s + echo 'DEBS IN CHANGES EXISTS' 199s + exec 199s + quirk-clean-fixup 199s + case $cleanmode in 199s + '[' success = failure ']' 199s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,indep-arch.results 199s + for branch in $bm_branches 199s + bm-run-one 199s + local 'args= --clean=none gbp-build -b --git-ignore-branch' 199s + bmid='gbp-build -b,none,bad-build-deps' 199s + bmid=gbp-build_-b,none,bad-build-deps 199s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 199s + heading='===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 199s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 199s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.expected 199s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.results 199s + bm-compute-expected 199s + require_fail=unexpect 199s + tolerate_fail=unexpect 199s + exec 199s + echo '===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 199s + local eff_cleanmode=none 199s + case "$e_targets" in 199s + case "$act" in 199s + case $eff_cleanmode in 199s + case $eff_cleanmode in 199s + '[' 'xbuild binary' '!=' x ']' 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 1 199s + tolerate_fail=tolerate 199s + for t in $e_targets 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 1 199s + require_fail=required 199s + echo 'EXAMPLE RULES TARGET build' 199s + for t in $e_targets 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 1 199s + require_fail=required 199s + echo 'EXAMPLE RULES TARGET binary' 199s + bm-report-test 'SOURCE FILE' false 199s + local 'desc=SOURCE FILE' 199s + shift 199s + false 199s + echo 'SOURCE FILE MISSING' 199s + bm-report-test 'SOURCE IN CHANGES' false 199s + local 'desc=SOURCE IN CHANGES' 199s + shift 199s + false 199s + echo 'SOURCE IN CHANGES MISSING' 199s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 199s + local 'desc=DEBS IN CHANGES' 199s + shift 199s + expr 'build binary' : '.*binary.*' 199s 12 199s + echo 'DEBS IN CHANGES EXISTS' 199s + exec 199s + git checkout bad-build-deps 199s Switched to branch 'bad-build-deps' 199s + git clean -xdf 199s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 199s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 199s + set +o pipefail 199s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 199s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 199s + local dgit=dgit 199s + pwd 199s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 199s + : ' 199s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 199s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -b --git-ignore-branch 199s | git rev-parse --show-toplevel 199s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 199s | git config -z --get-regexp --local '.*' 199s | git config -z --get-regexp --local '.*' 199s | git config -z --get-regexp --global '.*' 199s | git config -z --get-regexp --system '.*' 199s format , quilt mode gbp 199s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 199s warning: could not open directory 'debian/source/': No such file or directory 199s => `' 199s + git diff --quiet HEAD 199s massage split -b. 199s massage done 2 -b. 199s format , quilt mode gbp 199s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 199s warning: could not open directory 'debian/source/': No such file or directory 199s => `' 199s + git diff --quiet HEAD 199s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 199s package seems new, not specifying -v 199s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 199s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 199s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 199s gbp:info: Performing the build 199s dpkg-buildpackage: info: source package example 199s dpkg-buildpackage: info: source version 1.0 199s dpkg-buildpackage: info: source distribution unstable 199s dpkg-buildpackage: info: source changed by Ian Jackson 199s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 199s dpkg-buildpackage: info: host architecture amd64 199s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 199s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 199s dpkg-buildpackage: warning: (Use -d flag to override.) 199s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 199s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 199s 199s dgit: error: subprocess failed with error exit status 1 199s + local 'ps=255 0' 199s + set -o pipefail 199s + exec 199s + echo '===== [gbp-build_-b,none,bad-build-deps] dgit --clean=none gbp-build -b --git-ignore-branch =====' 199s + case $ps in 199s + actual_status=failure 199s + echo 'OPERATION FAILED' 199s + case "$require_fail-$tolerate_fail-$actual_status" in 199s + echo 'REQUIRED FAILURE' 199s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,none,bad-build-deps.output 199s + '[' 1 = 1 ']' 199s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 199s + local 'desc=SOURCE FILE' 199s + shift 199s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 199s + echo 'SOURCE FILE MISSING' 199s + '[' failure = success ']' 199s + exec 199s + quirk-clean-fixup 199s + case $cleanmode in 199s + '[' failure = failure ']' 199s + for cleanmode in $cleanmodes 199s + for branch in $bm_branches 199s + bm-run-one 199s + local 'args= --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch' 199s + bmid='gbp-build -b,dpkg-source,no-check,indep-arch' 199s + bmid=gbp-build_-b,dpkg-source,no-check,indep-arch 199s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 199s + heading='===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 199s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 199s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.expected 199s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 199s + bm-compute-expected 199s + require_fail=unexpect 199s + tolerate_fail=unexpect 199s + exec 199s + echo '===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 199s + local eff_cleanmode=dpkg-source,no-check 199s + case "$e_targets" in 199s + case "$act" in 199s + case $eff_cleanmode in 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 0 199s + echo 'EXAMPLE RULES TARGET clean' 199s + case $eff_cleanmode in 199s + '[' 'xbuild binary' '!=' x ']' 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 0 199s + for t in $e_targets 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 0 199s + echo 'EXAMPLE RULES TARGET build' 199s + for t in $e_targets 199s + bm-build-deps-ok 199s + case "$branch" in 199s + return 0 199s + echo 'EXAMPLE RULES TARGET binary' 199s + bm-report-test 'SOURCE FILE' false 199s + local 'desc=SOURCE FILE' 199s + shift 199s + false 199s + echo 'SOURCE FILE MISSING' 199s + bm-report-test 'SOURCE IN CHANGES' false 199s + local 'desc=SOURCE IN CHANGES' 199s + shift 199s + false 199s + echo 'SOURCE IN CHANGES MISSING' 199s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 199s + local 'desc=DEBS IN CHANGES' 199s + shift 199s + expr 'build binary' : '.*binary.*' 199s 12 199s + echo 'DEBS IN CHANGES EXISTS' 199s + exec 199s + git checkout indep-arch 199s Switched to branch 'indep-arch' 199s + git clean -xdf 199s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 199s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 199s + set +o pipefail 199s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 199s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 199s + local dgit=dgit 199s + pwd 199s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 199s + : ' 199s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 199s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 199s | git rev-parse --show-toplevel 199s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 199s | git config -z --get-regexp --local '.*' 199s | git config -z --get-regexp --local '.*' 199s | git config -z --get-regexp --global '.*' 199s | git config -z --get-regexp --system '.*' 199s format , quilt mode gbp 199s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 199s warning: could not open directory 'debian/source/': No such file or directory 199s => `' 199s + git diff --quiet HEAD 199s massage split -b. 199s massage done 2 -b. 199s format , quilt mode gbp 199s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 199s warning: could not open directory 'debian/source/': No such file or directory 199s => `' 199s + git diff --quiet HEAD 199s 199s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 199s dgit: Have to apply the patches - making the tree dirty. 199s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 199s 199s + dpkg-source --before-build . 199s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 199s dpkg-buildpackage: info: source package example 199s dpkg-buildpackage: info: source version 1.0 199s dpkg-buildpackage: info: source distribution unstable 199s dpkg-buildpackage: info: source changed by Ian Jackson 200s fakeroot debian/rules clean 200s EXAMPLE RULES TARGET clean 200s dh_clean 200s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 200s dgit: Unapplying patches again to tidy up the tree. 200s + dpkg-source --after-build . 200s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 200s package seems new, not specifying -v 200s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 200s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 200s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 200s gbp:info: Performing the build 200s dpkg-buildpackage: info: source package example 200s dpkg-buildpackage: info: source version 1.0 200s dpkg-buildpackage: info: source distribution unstable 200s dpkg-buildpackage: info: source changed by Ian Jackson 200s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 200s dpkg-buildpackage: info: host architecture amd64 200s debian/rules build 200s EXAMPLE RULES TARGET build 200s fakeroot debian/rules binary 200s EXAMPLE RULES TARGET binary 200s dh_install 200s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 200s dh_gencontrol 200s dh_builddeb 200s + exec /usr/bin/dpkg-deb+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 200s -Znone --build debian/example-indep .. 200s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 200s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 200s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 200s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 200s dpkg-genchanges: info: binary-only upload (no source code included) 200s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 200s dpkg-buildpackage: info: binary-only upload (no source included) 200s dgit ok: build successful 200s 200s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 200s ' 200s + local 'ps=0 0' 200s + set -o pipefail 200s + exec 200s + echo '===== [gbp-build_-b,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 200s + case $ps in 200s + actual_status=success 200s + case "$require_fail-$tolerate_fail-$actual_status" in 200s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.output 200s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 200s + local 'desc=SOURCE FILE' 200s + shift 200s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 200s + echo 'SOURCE FILE MISSING' 200s + '[' success = success ']' 200s + local changes 200s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 200s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 200s + case "$changes" in 200s + perl -ne 'print if m/^files:/i ... m/^\S/' 200s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 200s + local 'desc=SOURCE IN CHANGES' 200s + shift 200s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 200s + echo 'SOURCE IN CHANGES MISSING' 200s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 200s + local 'desc=DEBS IN CHANGES' 200s + shift 200s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 200s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 200s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 200s + echo 'DEBS IN CHANGES EXISTS' 200s + exec 200s + quirk-clean-fixup 200s + case $cleanmode in 200s + perl -i.unfixed -ne ' 200s print unless 200s $_ eq $last && 200s $_ eq "EXAMPLE RULES TARGET clean\n"; 200s $last = $_; 200s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 201s + '[' success = failure ']' 201s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,indep-arch.results 201s + for branch in $bm_branches 201s + bm-run-one 201s + local 'args= --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch' 201s + bmid='gbp-build -b,dpkg-source,no-check,bad-build-deps' 201s + bmid=gbp-build_-b,dpkg-source,no-check,bad-build-deps 201s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 201s + heading='===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 201s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 201s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.expected 201s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.results 201s + bm-compute-expected 201s + require_fail=unexpect 201s + tolerate_fail=unexpect 201s + exec 201s + echo '===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 201s + local eff_cleanmode=dpkg-source,no-check 201s + case "$e_targets" in 201s + case "$act" in 201s + case $eff_cleanmode in 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 1 201s + tolerate_fail=tolerate 201s + echo 'EXAMPLE RULES TARGET clean' 201s + case $eff_cleanmode in 201s + '[' 'xbuild binary' '!=' x ']' 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 1 201s + tolerate_fail=tolerate 201s + for t in $e_targets 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 1 201s + require_fail=required 201s + echo 'EXAMPLE RULES TARGET build' 201s + for t in $e_targets 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 1 201s + require_fail=required 201s + echo 'EXAMPLE RULES TARGET binary' 201s + bm-report-test 'SOURCE FILE' false 201s + local 'desc=SOURCE FILE' 201s + shift 201s + false 201s + echo 'SOURCE FILE MISSING' 201s + bm-report-test 'SOURCE IN CHANGES' false 201s + local 'desc=SOURCE IN CHANGES' 201s + shift 201s + false 201s + echo 'SOURCE IN CHANGES MISSING' 201s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 201s + local 'desc=DEBS IN CHANGES' 201s + shift 201s + expr 'build binary' : '.*binary.*' 201s 12 201s + echo 'DEBS IN CHANGES EXISTS' 201s + exec 201s + git checkout bad-build-deps 201s Switched to branch 'bad-build-deps' 201s + git clean -xdf 201s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 201s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 201s + set +o pipefail 201s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 201s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 201s + local dgit=dgit 201s + pwd 201s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 201s + : ' 201s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 201s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch 201s | git rev-parse --show-toplevel 201s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 201s | git config -z --get-regexp --local '.*' 201s | git config -z --get-regexp --local '.*' 201s | git config -z --get-regexp --global '.*' 201s | git config -z --get-regexp --system '.*' 201s format , quilt mode gbp 201s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 201s warning: could not open directory 'debian/source/': No such file or directory 201s => `' 201s + git diff --quiet HEAD 201s massage split -b. 201s massage done 2 -b. 201s format , quilt mode gbp 201s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 201s warning: could not open directory 'debian/source/': No such file or directory 201s => `' 201s + git diff --quiet HEAD 201s 201s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 201s dgit: Have to apply the patches - making the tree dirty. 201s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 201s 201s + dpkg-source --before-build . 201s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 201s dpkg-buildpackage: info: source package example 201s dpkg-buildpackage: info: source version 1.0 201s dpkg-buildpackage: info: source distribution unstable 201s dpkg-buildpackage: info: source changed by Ian Jackson 201s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 201s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 201s dpkg-buildpackage: warning: (Use -d flag to override.) 201s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 201s 201s dgit: error: subprocess failed with error exit status 3 201s + local 'ps=255 0' 201s + set -o pipefail 201s + exec 201s + echo '===== [gbp-build_-b,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -b --git-ignore-branch =====' 201s + case $ps in 201s + actual_status=failure 201s + echo 'OPERATION FAILED' 201s + case "$require_fail-$tolerate_fail-$actual_status" in 201s + echo 'REQUIRED FAILURE' 201s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.output 201s + '[' 1 = 1 ']' 201s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 201s + local 'desc=SOURCE FILE' 201s + shift 201s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 201s + echo 'SOURCE FILE MISSING' 201s + '[' failure = success ']' 201s + exec 201s + quirk-clean-fixup 201s + case $cleanmode in 201s + perl -i.unfixed -ne ' 201s print unless 201s $_ eq $last && 201s $_ eq "EXAMPLE RULES TARGET clean\n"; 201s $last = $_; 201s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source,no-check,bad-build-deps.results 201s + '[' failure = failure ']' 201s + for cleanmode in $cleanmodes 201s + for branch in $bm_branches 201s + bm-run-one 201s + local 'args= --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch' 201s + bmid='gbp-build -b,dpkg-source-d,no-check,indep-arch' 201s + bmid=gbp-build_-b,dpkg-source-d,no-check,indep-arch 201s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 201s + heading='===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 201s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 201s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.expected 201s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 201s + bm-compute-expected 201s + require_fail=unexpect 201s + tolerate_fail=unexpect 201s + exec 201s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 201s + local eff_cleanmode=dpkg-source-d,no-check 201s + case "$e_targets" in 201s + case "$act" in 201s + case $eff_cleanmode in 201s + echo 'EXAMPLE RULES TARGET clean' 201s + case $eff_cleanmode in 201s + '[' 'xbuild binary' '!=' x ']' 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 0 201s + for t in $e_targets 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 0 201s + echo 'EXAMPLE RULES TARGET build' 201s + for t in $e_targets 201s + bm-build-deps-ok 201s + case "$branch" in 201s + return 0 201s + echo 'EXAMPLE RULES TARGET binary' 201s + bm-report-test 'SOURCE FILE' false 201s + local 'desc=SOURCE FILE' 201s + shift 201s + false 201s + echo 'SOURCE FILE MISSING' 201s + bm-report-test 'SOURCE IN CHANGES' false 201s + local 'desc=SOURCE IN CHANGES' 201s + shift 201s + false 201s + echo 'SOURCE IN CHANGES MISSING' 201s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 201s + local 'desc=DEBS IN CHANGES' 201s + shift 201s + expr 'build binary' : '.*binary.*' 201s 12 201s + echo 'DEBS IN CHANGES EXISTS' 201s + exec 201s + git checkout indep-arch 201s Switched to branch 'indep-arch' 201s + git clean -xdf 201s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 201s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 201s + set +o pipefail 201s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 201s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 201s + local dgit=dgit 201s + pwd 201s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 201s + : ' 201s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 201s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 201s | git rev-parse --show-toplevel 201s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 201s | git config -z --get-regexp --local '.*' 201s | git config -z --get-regexp --local '.*' 201s | git config -z --get-regexp --global '.*' 201s | git config -z --get-regexp --system '.*' 201s format , quilt mode gbp 201s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 201s warning: could not open directory 'debian/source/': No such file or directory 201s => `' 201s + git diff --quiet HEAD 201s massage split -b. 201s massage done 2 -b. 201s format , quilt mode gbp 201s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 201s warning: could not open directory 'debian/source/': No such file or directory 201s => `' 201s + git diff --quiet HEAD 201s 201s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 201s dgit: Have to apply the patches - making the tree dirty. 201s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 201s 201s + dpkg-source --before-build . 201s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 201s dpkg-buildpackage: info: source package example 201s dpkg-buildpackage: info: source version 1.0 201s dpkg-buildpackage: info: source distribution unstable 201s dpkg-buildpackage: info: source changed by Ian Jackson 201s fakeroot debian/rules clean 201s EXAMPLE RULES TARGET clean 201s dh_clean 201s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 201s dgit: Unapplying patches again to tidy up the tree. 201s + dpkg-source --after-build . 201s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 201s package seems new, not specifying -v 201s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 201s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 201s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 201s gbp:info: Performing the build 202s dpkg-buildpackage: info: source package example 202s dpkg-buildpackage: info: source version 1.0 202s dpkg-buildpackage: info: source distribution unstable 202s dpkg-buildpackage: info: source changed by Ian Jackson 202s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 202s dpkg-buildpackage: info: host architecture amd64 202s debian/rules build 202s EXAMPLE RULES TARGET build 202s fakeroot debian/rules binary 202s EXAMPLE RULES TARGET binary 202s dh_install 202s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 202s dh_gencontrol 202s dh_builddeb 202s + exec+ /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 202s exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 202s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 202s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 202s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 202s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 202s dpkg-genchanges: info: binary-only upload (no source code included) 202s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 202s dpkg-buildpackage: info: binary-only upload (no source included) 202s dgit ok: build successful 202s 202s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 202s ' 202s + local 'ps=0 0' 202s + set -o pipefail 202s + exec 202s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 202s + case $ps in 202s + actual_status=success 202s + case "$require_fail-$tolerate_fail-$actual_status" in 202s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.output 202s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 202s + local 'desc=SOURCE FILE' 202s + shift 202s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 202s + echo 'SOURCE FILE MISSING' 202s + '[' success = success ']' 202s + local changes 202s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 202s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 202s + case "$changes" in 202s + perl -ne 'print if m/^files:/i ... m/^\S/' 202s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 202s + local 'desc=SOURCE IN CHANGES' 202s + shift 202s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 202s + echo 'SOURCE IN CHANGES MISSING' 202s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 202s + local 'desc=DEBS IN CHANGES' 202s + shift 202s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 202s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 202s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 202s + echo 'DEBS IN CHANGES EXISTS' 202s + exec 202s + quirk-clean-fixup 202s + case $cleanmode in 202s + perl -i.unfixed -ne ' 202s print unless 202s $_ eq $last && 202s $_ eq "EXAMPLE RULES TARGET clean\n"; 202s $last = $_; 202s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 202s + '[' success = failure ']' 202s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,indep-arch.results 202s + for branch in $bm_branches 202s + bm-run-one 202s + local 'args= --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch' 202s + bmid='gbp-build -b,dpkg-source-d,no-check,bad-build-deps' 202s + bmid=gbp-build_-b,dpkg-source-d,no-check,bad-build-deps 202s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 202s + heading='===== [gbp-build_-b,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 202s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 202s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.expected 202s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.results 202s + bm-compute-expected 202s + require_fail=unexpect 202s + tolerate_fail=unexpect 202s + exec 202s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 202s + local eff_cleanmode=dpkg-source-d,no-check 202s + case "$e_targets" in 202s + case "$act" in 202s + case $eff_cleanmode in 202s + echo 'EXAMPLE RULES TARGET clean' 202s + case $eff_cleanmode in 202s + '[' 'xbuild binary' '!=' x ']' 202s + bm-build-deps-ok 202s + case "$branch" in 202s + return 1 202s + tolerate_fail=tolerate 202s + for t in $e_targets 202s + bm-build-deps-ok 202s + case "$branch" in 202s + return 1 202s + require_fail=required 202s + echo 'EXAMPLE RULES TARGET build' 202s + for t in $e_targets 202s + bm-build-deps-ok 202s + case "$branch" in 202s + return 1 202s + require_fail=required 202s + echo 'EXAMPLE RULES TARGET binary' 202s + bm-report-test 'SOURCE FILE' false 202s + local 'desc=SOURCE FILE' 202s + shift 202s + false 202s + echo 'SOURCE FILE MISSING' 202s + bm-report-test 'SOURCE IN CHANGES' false 202s + local 'desc=SOURCE IN CHANGES' 202s + shift 202s + false 202s + echo 'SOURCE IN CHANGES MISSING' 202s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 202s + local 'desc=DEBS IN CHANGES' 202s + shift 202s + expr 'build binary' : '.*binary.*' 202s 12 202s + echo 'DEBS IN CHANGES EXISTS' 202s + exec 202s + git checkout bad-build-deps 202s Switched to branch 'bad-build-deps' 202s + git clean -xdf 202s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 202s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 202s + set +o pipefail 202s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 202s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 202s + local dgit=dgit 202s + pwd 202s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 202s + : ' 202s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 202s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch 202s | git rev-parse --show-toplevel 202s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 202s | git config -z --get-regexp --local '.*' 202s | git config -z --get-regexp --local '.*' 202s | git config -z --get-regexp --global '.*' 202s | git config -z --get-regexp --system '.*' 202s format , quilt mode gbp 202s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 202s warning: could not open directory 'debian/source/': No such file or directory 202s => `' 202s + git diff --quiet HEAD 202s massage split -b. 202s massage done 2 -b. 202s format , quilt mode gbp 202s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 202s warning: could not open directory 'debian/source/': No such file or directory 202s => `' 202s + git diff --quiet HEAD 202s 202s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 202s dgit: Have to apply the patches - making the tree dirty. 202s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 202s 202s + dpkg-source --before-build . 202s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 202s dpkg-buildpackage: info: source package example 202s dpkg-buildpackage: info: source version 1.0 202s dpkg-buildpackage: info: source distribution unstable 202s dpkg-buildpackage: info: source changed by Ian Jackson 202s fakeroot debian/rules clean 202s EXAMPLE RULES TARGET clean 202s dh_clean 203s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 203s dgit: Unapplying patches again to tidy up the tree. 203s + dpkg-source --after-build . 203s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 203s package seems new, not specifying -v 203s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 203s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 203s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 203s gbp:info: Performing the build 203s dpkg-buildpackage: info: source package example 203s dpkg-buildpackage: info: source version 1.0 203s dpkg-buildpackage: info: source distribution unstable 203s dpkg-buildpackage: info: source changed by Ian Jackson 203s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 203s dpkg-buildpackage: info: host architecture amd64 203s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 203s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 203s dpkg-buildpackage: warning: (Use -d flag to override.) 203s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 203s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-cleaner=true --git-ignore-branch 203s 203s dgit: error: subprocess failed with error exit status 1 203s + local 'ps=255 0' 203s + set -o pipefail 203s + exec 203s + echo '===== [gbp-build_-b,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -b --git-ignore-branch =====' 203s + case $ps in 203s + actual_status=failure 203s + echo 'OPERATION FAILED' 203s + case "$require_fail-$tolerate_fail-$actual_status" in 203s + echo 'REQUIRED FAILURE' 203s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.output 203s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 203s + local 'desc=SOURCE FILE' 203s + shift 203s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 203s + echo 'SOURCE FILE MISSING' 203s + '[' failure = success ']' 203s + exec 203s + quirk-clean-fixup 203s + case $cleanmode in 203s + perl -i.unfixed -ne ' 203s print unless 203s $_ eq $last && 203s $_ eq "EXAMPLE RULES TARGET clean\n"; 203s $last = $_; 203s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-b,dpkg-source-d,no-check,bad-build-deps.results 203s + '[' failure = failure ']' 203s + : bm-act-iterate done. 203s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 203s + bm-guess-e-source-e-targets 'gbp-build -B' 203s + local 'some_act=gbp-build -B' 203s + case "$some_act" in 203s + e_source=false 203s + e_targets='build-arch binary-arch' 203s + real_act='gbp-build -B --git-ignore-branch' 203s + bm-act-iterate 203s + for cleanmode in $cleanmodes 203s + for branch in $bm_branches 203s + bm-run-one 203s + local 'args= --clean=git gbp-build -B --git-ignore-branch' 203s + bmid='gbp-build -B,git,indep-arch' 203s + bmid=gbp-build_-B,git,indep-arch 203s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 203s + heading='===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 203s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 203s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.expected 203s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.results 203s + bm-compute-expected 203s + require_fail=unexpect 203s + tolerate_fail=unexpect 203s + exec 203s + echo '===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 203s + local eff_cleanmode=git 203s + case "$e_targets" in 203s + case "$act" in 203s + case $eff_cleanmode in 203s + echo 'BUILD-MODES PROGRAM git clean -xdf' 203s + case $eff_cleanmode in 203s + '[' 'xbuild-arch binary-arch' '!=' x ']' 203s + bm-build-deps-ok 203s + case "$branch" in 203s + return 0 203s + for t in $e_targets 203s + bm-build-deps-ok 203s + case "$branch" in 203s + return 0 203s + echo 'EXAMPLE RULES TARGET build-arch' 203s + for t in $e_targets 203s + bm-build-deps-ok 203s + case "$branch" in 203s + return 0 203s + echo 'EXAMPLE RULES TARGET binary-arch' 203s + bm-report-test 'SOURCE FILE' false 203s + local 'desc=SOURCE FILE' 203s + shift 203s + false 203s + echo 'SOURCE FILE MISSING' 203s + bm-report-test 'SOURCE IN CHANGES' false 203s + local 'desc=SOURCE IN CHANGES' 203s + shift 203s + false 203s + echo 'SOURCE IN CHANGES MISSING' 203s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 203s + local 'desc=DEBS IN CHANGES' 203s + shift 203s + expr 'build-arch binary-arch' : '.*binary.*' 203s 22 203s + echo 'DEBS IN CHANGES EXISTS' 203s + exec 203s + git checkout indep-arch 203s Switched to branch 'indep-arch' 203s + git clean -xdf 203s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 203s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 203s + set +o pipefail 203s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 203s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 203s + local dgit=dgit 203s + pwd 203s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 203s + : ' 203s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 203s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 203s | git rev-parse --show-toplevel 203s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 203s | git config -z --get-regexp --local '.*' 203s | git config -z --get-regexp --local '.*' 203s | git config -z --get-regexp --global '.*' 203s | git config -z --get-regexp --system '.*' 203s format , quilt mode gbp 203s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 203s warning: could not open directory 'debian/source/': No such file or directory 203s => `' 203s + git diff --quiet HEAD 203s massage split -B. 203s massage done 2 -B. 203s format , quilt mode gbp 203s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 203s warning: could not open directory 'debian/source/': No such file or directory 203s => `' 203s + git diff --quiet HEAD 203s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 203s BUILD-MODES PROGRAM git clean -xdf 203s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 203s package seems new, not specifying -v 203s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 203s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 203s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 203s gbp:info: Performing the build 203s dpkg-buildpackage: info: source package example 203s dpkg-buildpackage: info: source version 1.0 203s dpkg-buildpackage: info: source distribution unstable 203s dpkg-buildpackage: info: source changed by Ian Jackson 203s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 203s dpkg-buildpackage: info: host architecture amd64 203s debian/rules build-arch 203s EXAMPLE RULES TARGET build-arch 203s fakeroot debian/rules binary-arch 203s EXAMPLE RULES TARGET binary-arch 203s dh_install 203s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 203s dh_gencontrol 204s dh_builddeb 204s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 204s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 204s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 204s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 204s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 204s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 204s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 204s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 204s dpkg-buildpackage: info: binary-only upload (no source included) 204s dgit ok: build successful 204s 204s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 204s ' 204s + local 'ps=0 0' 204s + set -o pipefail 204s + exec 204s + echo '===== [gbp-build_-B,git,indep-arch] dgit --clean=git gbp-build -B --git-ignore-branch =====' 204s + case $ps in 204s + actual_status=success 204s + case "$require_fail-$tolerate_fail-$actual_status" in 204s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.output 204s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 204s + local 'desc=SOURCE FILE' 204s + shift 204s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 204s + echo 'SOURCE FILE MISSING' 204s + '[' success = success ']' 204s + local changes 204s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 204s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 204s + case "$changes" in 204s + perl -ne 'print if m/^files:/i ... m/^\S/' 204s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 204s + local 'desc=SOURCE IN CHANGES' 204s + shift 204s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 204s + echo 'SOURCE IN CHANGES MISSING' 204s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 204s + local 'desc=DEBS IN CHANGES' 204s + shift 204s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 204s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 204s + echo 'DEBS IN CHANGES EXISTS' 204s + exec 204s + quirk-clean-fixup 204s + case $cleanmode in 204s + '[' success = failure ']' 204s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,indep-arch.results 204s + for branch in $bm_branches 204s + bm-run-one 204s + local 'args= --clean=git gbp-build -B --git-ignore-branch' 204s + bmid='gbp-build -B,git,bad-build-deps' 204s + bmid=gbp-build_-B,git,bad-build-deps 204s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 204s + heading='===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 204s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 204s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.expected 204s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.results 204s + bm-compute-expected 204s + require_fail=unexpect 204s + tolerate_fail=unexpect 204s + exec 204s + echo '===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 204s + local eff_cleanmode=git 204s + case "$e_targets" in 204s + case "$act" in 204s + case $eff_cleanmode in 204s + echo 'BUILD-MODES PROGRAM git clean -xdf' 204s + case $eff_cleanmode in 204s + '[' 'xbuild-arch binary-arch' '!=' x ']' 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 1 204s + tolerate_fail=tolerate 204s + for t in $e_targets 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 1 204s + require_fail=required 204s + echo 'EXAMPLE RULES TARGET build-arch' 204s + for t in $e_targets 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 1 204s + require_fail=required 204s + echo 'EXAMPLE RULES TARGET binary-arch' 204s + bm-report-test 'SOURCE FILE' false 204s + local 'desc=SOURCE FILE' 204s + shift 204s + false 204s + echo 'SOURCE FILE MISSING' 204s + bm-report-test 'SOURCE IN CHANGES' false 204s + local 'desc=SOURCE IN CHANGES' 204s + shift 204s + false 204s + echo 'SOURCE IN CHANGES MISSING' 204s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 204s + local 'desc=DEBS IN CHANGES' 204s + shift 204s + expr 'build-arch binary-arch' : '.*binary.*' 204s 22 204s + echo 'DEBS IN CHANGES EXISTS' 204s + exec 204s + git checkout bad-build-deps 204s Switched to branch 'bad-build-deps' 204s + git clean -xdf 204s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 204s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 204s + set +o pipefail 204s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 204s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 204s + local dgit=dgit 204s + pwd 204s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 204s + : ' 204s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 204s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -B --git-ignore-branch 204s | git rev-parse --show-toplevel 204s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 204s | git config -z --get-regexp --local '.*' 204s | git config -z --get-regexp --local '.*' 204s | git config -z --get-regexp --global '.*' 204s | git config -z --get-regexp --system '.*' 204s format , quilt mode gbp 204s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 204s warning: could not open directory 'debian/source/': No such file or directory 204s => `' 204s + git diff --quiet HEAD 204s massage split -B. 204s massage done 2 -B. 204s format , quilt mode gbp 204s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 204s warning: could not open directory 'debian/source/': No such file or directory 204s => `' 204s + git diff --quiet HEAD 204s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 204s BUILD-MODES PROGRAM git clean -xdf 204s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 204s package seems new, not specifying -v 204s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 204s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 204s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 204s gbp:info: Performing the build 204s dpkg-buildpackage: info: source package example 204s dpkg-buildpackage: info: source version 1.0 204s dpkg-buildpackage: info: source distribution unstable 204s dpkg-buildpackage: info: source changed by Ian Jackson 204s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 204s dpkg-buildpackage: info: host architecture amd64 204s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 204s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 204s dpkg-buildpackage: warning: (Use -d flag to override.) 204s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 204s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 204s 204s dgit: error: subprocess failed with error exit status 1 204s + local 'ps=255 0' 204s + set -o pipefail 204s + exec 204s + echo '===== [gbp-build_-B,git,bad-build-deps] dgit --clean=git gbp-build -B --git-ignore-branch =====' 204s + case $ps in 204s + actual_status=failure 204s + echo 'OPERATION FAILED' 204s + case "$require_fail-$tolerate_fail-$actual_status" in 204s + echo 'REQUIRED FAILURE' 204s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,git,bad-build-deps.output 204s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 204s + local 'desc=SOURCE FILE' 204s + shift 204s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 204s + echo 'SOURCE FILE MISSING' 204s + '[' failure = success ']' 204s + exec 204s + quirk-clean-fixup 204s + case $cleanmode in 204s + '[' failure = failure ']' 204s + for cleanmode in $cleanmodes 204s + for branch in $bm_branches 204s + bm-run-one 204s + local 'args= --clean=none gbp-build -B --git-ignore-branch' 204s + bmid='gbp-build -B,none,indep-arch' 204s + bmid=gbp-build_-B,none,indep-arch 204s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 204s + heading='===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 204s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 204s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.expected 204s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.results 204s + bm-compute-expected 204s + require_fail=unexpect 204s + tolerate_fail=unexpect 204s + exec 204s + echo '===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 204s + local eff_cleanmode=none 204s + case "$e_targets" in 204s + case "$act" in 204s + case $eff_cleanmode in 204s + case $eff_cleanmode in 204s + '[' 'xbuild-arch binary-arch' '!=' x ']' 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 0 204s + for t in $e_targets 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 0 204s + echo 'EXAMPLE RULES TARGET build-arch' 204s + for t in $e_targets 204s + bm-build-deps-ok 204s + case "$branch" in 204s + return 0 204s + echo 'EXAMPLE RULES TARGET binary-arch' 204s + bm-report-test 'SOURCE FILE' false 204s + local 'desc=SOURCE FILE' 204s + shift 204s + false 204s + echo 'SOURCE FILE MISSING' 204s + bm-report-test 'SOURCE IN CHANGES' false 204s + local 'desc=SOURCE IN CHANGES' 204s + shift 204s + false 204s + echo 'SOURCE IN CHANGES MISSING' 204s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 204s + local 'desc=DEBS IN CHANGES' 204s + shift 204s + expr 'build-arch binary-arch' : '.*binary.*' 204s 22 204s + echo 'DEBS IN CHANGES EXISTS' 204s + exec 204s + git checkout indep-arch 204s Switched to branch 'indep-arch' 204s + git clean -xdf 204s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 204s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 204s + set +o pipefail 204s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 204s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 204s + local dgit=dgit 204s + pwd 204s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 204s + : ' 204s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 204s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 204s | git rev-parse --show-toplevel 205s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 205s | git config -z --get-regexp --local '.*' 205s | git config -z --get-regexp --local '.*' 205s | git config -z --get-regexp --global '.*' 205s | git config -z --get-regexp --system '.*' 205s format , quilt mode gbp 205s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 205s warning: could not open directory 'debian/source/': No such file or directory 205s => `' 205s + git diff --quiet HEAD 205s massage split -B. 205s massage done 2 -B. 205s format , quilt mode gbp 205s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 205s warning: could not open directory 'debian/source/': No such file or directory 205s => `' 205s + git diff --quiet HEAD 205s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 205s package seems new, not specifying -v 205s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 205s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 205s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 205s gbp:info: Performing the build 205s dpkg-buildpackage: info: source package example 205s dpkg-buildpackage: info: source version 1.0 205s dpkg-buildpackage: info: source distribution unstable 205s dpkg-buildpackage: info: source changed by Ian Jackson 205s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 205s dpkg-buildpackage: info: host architecture amd64 205s debian/rules build-arch 205s EXAMPLE RULES TARGET build-arch 205s fakeroot debian/rules binary-arch 205s EXAMPLE RULES TARGET binary-arch 205s dh_install 205s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 205s dh_gencontrol 205s dh_builddeb 205s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 205s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 205s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 205s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 205s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 205s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 205s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 205s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 205s dpkg-buildpackage: info: binary-only upload (no source included) 205s dgit ok: build successful 205s 205s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 205s ' 205s + local 'ps=0 0' 205s + set -o pipefail 205s + exec 205s + echo '===== [gbp-build_-B,none,indep-arch] dgit --clean=none gbp-build -B --git-ignore-branch =====' 205s + case $ps in 205s + actual_status=success 205s + case "$require_fail-$tolerate_fail-$actual_status" in 205s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.output 205s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 205s + local 'desc=SOURCE FILE' 205s + shift 205s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 205s + echo 'SOURCE FILE MISSING' 205s + '[' success = success ']' 205s + local changes 205s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 205s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 205s + case "$changes" in 205s + perl -ne 'print if m/^files:/i ... m/^\S/' 205s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 205s + local 'desc=SOURCE IN CHANGES' 205s + shift 205s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 205s + echo 'SOURCE IN CHANGES MISSING' 205s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 205s + local 'desc=DEBS IN CHANGES' 205s + shift 205s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 205s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 205s + echo 'DEBS IN CHANGES EXISTS' 205s + exec 205s + quirk-clean-fixup 205s + case $cleanmode in 205s + '[' success = failure ']' 205s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,indep-arch.results 205s + for branch in $bm_branches 205s + bm-run-one 205s + local 'args= --clean=none gbp-build -B --git-ignore-branch' 205s + bmid='gbp-build -B,none,bad-build-deps' 205s + bmid=gbp-build_-B,none,bad-build-deps 205s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 205s + heading='===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 205s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 205s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.expected 205s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.results 205s + bm-compute-expected 205s + require_fail=unexpect 205s + tolerate_fail=unexpect 205s + exec 205s + echo '===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 205s + local eff_cleanmode=none 205s + case "$e_targets" in 205s + case "$act" in 205s + case $eff_cleanmode in 205s + case $eff_cleanmode in 205s + '[' 'xbuild-arch binary-arch' '!=' x ']' 205s + bm-build-deps-ok 205s + case "$branch" in 205s + return 1 205s + tolerate_fail=tolerate 205s + for t in $e_targets 205s + bm-build-deps-ok 205s + case "$branch" in 205s + return 1 205s + require_fail=required 205s + echo 'EXAMPLE RULES TARGET build-arch' 205s + for t in $e_targets 205s + bm-build-deps-ok 205s + case "$branch" in 205s + return 1 205s + require_fail=required 205s + echo 'EXAMPLE RULES TARGET binary-arch' 205s + bm-report-test 'SOURCE FILE' false 205s + local 'desc=SOURCE FILE' 205s + shift 205s + false 205s + echo 'SOURCE FILE MISSING' 205s + bm-report-test 'SOURCE IN CHANGES' false 205s + local 'desc=SOURCE IN CHANGES' 205s + shift 205s + false 205s + echo 'SOURCE IN CHANGES MISSING' 205s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 205s + local 'desc=DEBS IN CHANGES' 205s + shift 205s + expr 'build-arch binary-arch' : '.*binary.*' 205s 22 205s + echo 'DEBS IN CHANGES EXISTS' 205s + exec 205s + git checkout bad-build-deps 205s Switched to branch 'bad-build-deps' 205s + git clean -xdf 205s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 205s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 205s + set +o pipefail 205s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 205s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 205s + local dgit=dgit 205s + pwd 205s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 205s + : ' 205s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 205s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -B --git-ignore-branch 205s | git rev-parse --show-toplevel 205s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 205s | git config -z --get-regexp --local '.*' 205s | git config -z --get-regexp --local '.*' 205s | git config -z --get-regexp --global '.*' 205s | git config -z --get-regexp --system '.*' 205s format , quilt mode gbp 205s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 205s warning: could not open directory 'debian/source/': No such file or directory 205s => `' 205s + git diff --quiet HEAD 205s massage split -B. 205s massage done 2 -B. 205s format , quilt mode gbp 205s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 205s warning: could not open directory 'debian/source/': No such file or directory 205s => `' 205s + git diff --quiet HEAD 205s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 205s package seems new, not specifying -v 205s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 206s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 206s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 206s gbp:info: Performing the build 206s dpkg-buildpackage: info: source package example 206s dpkg-buildpackage: info: source version 1.0 206s dpkg-buildpackage: info: source distribution unstable 206s dpkg-buildpackage: info: source changed by Ian Jackson 206s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 206s dpkg-buildpackage: info: host architecture amd64 206s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 206s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 206s dpkg-buildpackage: warning: (Use -d flag to override.) 206s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 206s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 206s 206s dgit: error: subprocess failed with error exit status 1 206s + local 'ps=255 0' 206s + set -o pipefail 206s + exec 206s + echo '===== [gbp-build_-B,none,bad-build-deps] dgit --clean=none gbp-build -B --git-ignore-branch =====' 206s + case $ps in 206s + actual_status=failure 206s + echo 'OPERATION FAILED' 206s + case "$require_fail-$tolerate_fail-$actual_status" in 206s + echo 'REQUIRED FAILURE' 206s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,none,bad-build-deps.output 206s + '[' 1 = 1 ']' 206s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 206s + local 'desc=SOURCE FILE' 206s + shift 206s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 206s + echo 'SOURCE FILE MISSING' 206s + '[' failure = success ']' 206s + exec 206s + quirk-clean-fixup 206s + case $cleanmode in 206s + '[' failure = failure ']' 206s + for cleanmode in $cleanmodes 206s + for branch in $bm_branches 206s + bm-run-one 206s + local 'args= --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch' 206s + bmid='gbp-build -B,dpkg-source,no-check,indep-arch' 206s + bmid=gbp-build_-B,dpkg-source,no-check,indep-arch 206s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 206s + heading='===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 206s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 206s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.expected 206s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 206s + bm-compute-expected 206s + require_fail=unexpect 206s + tolerate_fail=unexpect 206s + exec 206s + echo '===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 206s + local eff_cleanmode=dpkg-source,no-check 206s + case "$e_targets" in 206s + case "$act" in 206s + case $eff_cleanmode in 206s + bm-build-deps-ok 206s + case "$branch" in 206s + return 0 206s + echo 'EXAMPLE RULES TARGET clean' 206s + case $eff_cleanmode in 206s + '[' 'xbuild-arch binary-arch' '!=' x ']' 206s + bm-build-deps-ok 206s + case "$branch" in 206s + return 0 206s + for t in $e_targets 206s + bm-build-deps-ok 206s + case "$branch" in 206s + return 0 206s + echo 'EXAMPLE RULES TARGET build-arch' 206s + for t in $e_targets 206s + bm-build-deps-ok 206s + case "$branch" in 206s + return 0 206s + echo 'EXAMPLE RULES TARGET binary-arch' 206s + bm-report-test 'SOURCE FILE' false 206s + local 'desc=SOURCE FILE' 206s + shift 206s + false 206s + echo 'SOURCE FILE MISSING' 206s + bm-report-test 'SOURCE IN CHANGES' false 206s + local 'desc=SOURCE IN CHANGES' 206s + shift 206s + false 206s + echo 'SOURCE IN CHANGES MISSING' 206s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 206s + local 'desc=DEBS IN CHANGES' 206s + shift 206s + expr 'build-arch binary-arch' : '.*binary.*' 206s 22 206s + echo 'DEBS IN CHANGES EXISTS' 206s + exec 206s + git checkout indep-arch 206s Switched to branch 'indep-arch' 206s + git clean -xdf 206s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 206s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 206s + set +o pipefail 206s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 206s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 206s + local dgit=dgit 206s + pwd 206s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 206s + : ' 206s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 206s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 206s | git rev-parse --show-toplevel 206s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 206s | git config -z --get-regexp --local '.*' 206s | git config -z --get-regexp --local '.*' 206s | git config -z --get-regexp --global '.*' 206s | git config -z --get-regexp --system '.*' 206s format , quilt mode gbp 206s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 206s warning: could not open directory 'debian/source/': No such file or directory 206s => `' 206s + git diff --quiet HEAD 206s massage split -B. 206s massage done 2 -B. 206s format , quilt mode gbp 206s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 206s warning: could not open directory 'debian/source/': No such file or directory 206s => `' 206s + git diff --quiet HEAD 206s 206s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 206s dgit: Have to apply the patches - making the tree dirty. 206s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 206s 206s + dpkg-source --before-build . 206s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 206s dpkg-buildpackage: info: source package example 206s dpkg-buildpackage: info: source version 1.0 206s dpkg-buildpackage: info: source distribution unstable 206s dpkg-buildpackage: info: source changed by Ian Jackson 206s fakeroot debian/rules clean 206s EXAMPLE RULES TARGET clean 206s dh_clean 206s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 206s dgit: Unapplying patches again to tidy up the tree. 206s + dpkg-source --after-build . 206s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 206s package seems new, not specifying -v 206s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 206s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 206s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 206s gbp:info: Performing the build 206s dpkg-buildpackage: info: source package example 206s dpkg-buildpackage: info: source version 1.0 206s dpkg-buildpackage: info: source distribution unstable 206s dpkg-buildpackage: info: source changed by Ian Jackson 206s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 206s dpkg-buildpackage: info: host architecture amd64 207s debian/rules build-arch 207s EXAMPLE RULES TARGET build-arch 207s fakeroot debian/rules binary-arch 207s EXAMPLE RULES TARGET binary-arch 207s dh_install 207s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 207s dh_gencontrol 207s dh_builddeb 207s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 207s + exec /usr/bin/dpkg-deb -Znone --build debian/example-archdpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 207s .. 207s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 207s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 207s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 207s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 207s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 207s dpkg-buildpackage: info: binary-only upload (no source included) 207s dgit ok: build successful 207s 207s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 207s ' 207s + local 'ps=0 0' 207s + set -o pipefail 207s + exec 207s + echo '===== [gbp-build_-B,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 207s + case $ps in 207s + actual_status=success 207s + case "$require_fail-$tolerate_fail-$actual_status" in 207s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.output 207s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 207s + local 'desc=SOURCE FILE' 207s + shift 207s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 207s + echo 'SOURCE FILE MISSING' 207s + '[' success = success ']' 207s + local changes 207s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 207s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 207s + case "$changes" in 207s + perl -ne 'print if m/^files:/i ... m/^\S/' 207s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 207s + local 'desc=SOURCE IN CHANGES' 207s + shift 207s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 207s + echo 'SOURCE IN CHANGES MISSING' 207s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 207s + local 'desc=DEBS IN CHANGES' 207s + shift 207s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 207s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 207s + echo 'DEBS IN CHANGES EXISTS' 207s + exec 207s + quirk-clean-fixup 207s + case $cleanmode in 207s + perl -i.unfixed -ne ' 207s print unless 207s $_ eq $last && 207s $_ eq "EXAMPLE RULES TARGET clean\n"; 207s $last = $_; 207s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 207s + '[' success = failure ']' 207s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,indep-arch.results 207s + for branch in $bm_branches 207s + bm-run-one 207s + local 'args= --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch' 207s + bmid='gbp-build -B,dpkg-source,no-check,bad-build-deps' 207s + bmid=gbp-build_-B,dpkg-source,no-check,bad-build-deps 207s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 207s + heading='===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 207s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 207s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.expected 207s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.results 207s + bm-compute-expected 207s + require_fail=unexpect 207s + tolerate_fail=unexpect 207s + exec 207s + echo '===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 207s + local eff_cleanmode=dpkg-source,no-check 207s + case "$e_targets" in 207s + case "$act" in 207s + case $eff_cleanmode in 207s + bm-build-deps-ok 207s + case "$branch" in 207s + return 1 207s + tolerate_fail=tolerate 207s + echo 'EXAMPLE RULES TARGET clean' 207s + case $eff_cleanmode in 207s + '[' 'xbuild-arch binary-arch' '!=' x ']' 207s + bm-build-deps-ok 207s + case "$branch" in 207s + return 1 207s + tolerate_fail=tolerate 207s + for t in $e_targets 207s + bm-build-deps-ok 207s + case "$branch" in 207s + return 1 207s + require_fail=required 207s + echo 'EXAMPLE RULES TARGET build-arch' 207s + for t in $e_targets 207s + bm-build-deps-ok 207s + case "$branch" in 207s + return 1 207s + require_fail=required 207s + echo 'EXAMPLE RULES TARGET binary-arch' 207s + bm-report-test 'SOURCE FILE' false 207s + local 'desc=SOURCE FILE' 207s + shift 207s + false 207s + echo 'SOURCE FILE MISSING' 207s + bm-report-test 'SOURCE IN CHANGES' false 207s + local 'desc=SOURCE IN CHANGES' 207s + shift 207s + false 207s + echo 'SOURCE IN CHANGES MISSING' 207s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 207s + local 'desc=DEBS IN CHANGES' 207s + shift 207s + expr 'build-arch binary-arch' : '.*binary.*' 207s 22 207s + echo 'DEBS IN CHANGES EXISTS' 207s + exec 207s + git checkout bad-build-deps 207s Switched to branch 'bad-build-deps' 207s + git clean -xdf 207s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 207s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 207s + set +o pipefail 207s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 207s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 207s + local dgit=dgit 207s + pwd 207s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 207s + : ' 207s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 207s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch 207s | git rev-parse --show-toplevel 207s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 207s | git config -z --get-regexp --local '.*' 207s | git config -z --get-regexp --local '.*' 207s | git config -z --get-regexp --global '.*' 207s | git config -z --get-regexp --system '.*' 207s format , quilt mode gbp 207s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 207s warning: could not open directory 'debian/source/': No such file or directory 207s => `' 207s + git diff --quiet HEAD 207s massage split -B. 207s massage done 2 -B. 207s format , quilt mode gbp 207s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 207s warning: could not open directory 'debian/source/': No such file or directory 207s => `' 207s + git diff --quiet HEAD 207s 207s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 207s dgit: Have to apply the patches - making the tree dirty. 207s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 207s 207s + dpkg-source --before-build . 207s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 207s dpkg-buildpackage: info: source package example 207s dpkg-buildpackage: info: source version 1.0 207s dpkg-buildpackage: info: source distribution unstable 207s dpkg-buildpackage: info: source changed by Ian Jackson 207s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 207s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 207s dpkg-buildpackage: warning: (Use -d flag to override.) 207s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 207s 207s dgit: error: subprocess failed with error exit status 3 208s + local 'ps=255 0' 208s + set -o pipefail 208s + exec 208s + echo '===== [gbp-build_-B,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -B --git-ignore-branch =====' 208s + case $ps in 208s + actual_status=failure 208s + echo 'OPERATION FAILED' 208s + case "$require_fail-$tolerate_fail-$actual_status" in 208s + echo 'REQUIRED FAILURE' 208s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.output 208s + '[' 1 = 1 ']' 208s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 208s + local 'desc=SOURCE FILE' 208s + shift 208s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 208s + echo 'SOURCE FILE MISSING' 208s + '[' failure = success ']' 208s + exec 208s + quirk-clean-fixup 208s + case $cleanmode in 208s + perl -i.unfixed -ne ' 208s print unless 208s $_ eq $last && 208s $_ eq "EXAMPLE RULES TARGET clean\n"; 208s $last = $_; 208s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source,no-check,bad-build-deps.results 208s + '[' failure = failure ']' 208s + for cleanmode in $cleanmodes 208s + for branch in $bm_branches 208s + bm-run-one 208s + local 'args= --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch' 208s + bmid='gbp-build -B,dpkg-source-d,no-check,indep-arch' 208s + bmid=gbp-build_-B,dpkg-source-d,no-check,indep-arch 208s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 208s + heading='===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 208s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 208s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.expected 208s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 208s + bm-compute-expected 208s + require_fail=unexpect 208s + tolerate_fail=unexpect 208s + exec 208s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 208s + local eff_cleanmode=dpkg-source-d,no-check 208s + case "$e_targets" in 208s + case "$act" in 208s + case $eff_cleanmode in 208s + echo 'EXAMPLE RULES TARGET clean' 208s + case $eff_cleanmode in 208s + '[' 'xbuild-arch binary-arch' '!=' x ']' 208s + bm-build-deps-ok 208s + case "$branch" in 208s + return 0 208s + for t in $e_targets 208s + bm-build-deps-ok 208s + case "$branch" in 208s + return 0 208s + echo 'EXAMPLE RULES TARGET build-arch' 208s + for t in $e_targets 208s + bm-build-deps-ok 208s + case "$branch" in 208s + return 0 208s + echo 'EXAMPLE RULES TARGET binary-arch' 208s + bm-report-test 'SOURCE FILE' false 208s + local 'desc=SOURCE FILE' 208s + shift 208s + false 208s + echo 'SOURCE FILE MISSING' 208s + bm-report-test 'SOURCE IN CHANGES' false 208s + local 'desc=SOURCE IN CHANGES' 208s + shift 208s + false 208s + echo 'SOURCE IN CHANGES MISSING' 208s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 208s + local 'desc=DEBS IN CHANGES' 208s + shift 208s + expr 'build-arch binary-arch' : '.*binary.*' 208s 22 208s + echo 'DEBS IN CHANGES EXISTS' 208s + exec 208s + git checkout indep-arch 208s Switched to branch 'indep-arch' 208s + git clean -xdf 208s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 208s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 208s + set +o pipefail 208s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 208s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 208s + local dgit=dgit 208s + pwd 208s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 208s + : ' 208s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 208s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 208s | git rev-parse --show-toplevel 208s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 208s | git config -z --get-regexp --local '.*' 208s | git config -z --get-regexp --local '.*' 208s | git config -z --get-regexp --global '.*' 208s | git config -z --get-regexp --system '.*' 208s format , quilt mode gbp 208s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 208s warning: could not open directory 'debian/source/': No such file or directory 208s => `' 208s + git diff --quiet HEAD 208s massage split -B. 208s massage done 2 -B. 208s format , quilt mode gbp 208s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 208s warning: could not open directory 'debian/source/': No such file or directory 208s => `' 208s + git diff --quiet HEAD 208s 208s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 208s dgit: Have to apply the patches - making the tree dirty. 208s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 208s 208s + dpkg-source --before-build . 208s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 208s dpkg-buildpackage: info: source package example 208s dpkg-buildpackage: info: source version 1.0 208s dpkg-buildpackage: info: source distribution unstable 208s dpkg-buildpackage: info: source changed by Ian Jackson 208s fakeroot debian/rules clean 208s EXAMPLE RULES TARGET clean 208s dh_clean 208s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 208s dgit: Unapplying patches again to tidy up the tree. 208s + dpkg-source --after-build . 208s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 208s package seems new, not specifying -v 208s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 208s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 208s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 208s gbp:info: Performing the build 208s dpkg-buildpackage: info: source package example 208s dpkg-buildpackage: info: source version 1.0 208s dpkg-buildpackage: info: source distribution unstable 208s dpkg-buildpackage: info: source changed by Ian Jackson 208s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 208s dpkg-buildpackage: info: host architecture amd64 208s debian/rules build-arch 208s EXAMPLE RULES TARGET build-arch 208s fakeroot debian/rules binary-arch 208s EXAMPLE RULES TARGET binary-arch 208s dh_install 208s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 208s dh_gencontrol 208s dh_builddeb 208s + + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 208s exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 208s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 208s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 208s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 209s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 209s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 209s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 209s dpkg-buildpackage: info: binary-only upload (no source included) 209s dgit ok: build successful 209s 209s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 209s ' 209s + local 'ps=0 0' 209s + set -o pipefail 209s + exec 209s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 209s + case $ps in 209s + actual_status=success 209s + case "$require_fail-$tolerate_fail-$actual_status" in 209s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.output 209s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 209s + local 'desc=SOURCE FILE' 209s + shift 209s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 209s + echo 'SOURCE FILE MISSING' 209s + '[' success = success ']' 209s + local changes 209s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 209s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes 209s + case "$changes" in 209s + perl -ne 'print if m/^files:/i ... m/^\S/' 209s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 209s + local 'desc=SOURCE IN CHANGES' 209s + shift 209s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 209s + echo 'SOURCE IN CHANGES MISSING' 209s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 209s + local 'desc=DEBS IN CHANGES' 209s + shift 209s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_amd64.changes.files 209s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 209s + echo 'DEBS IN CHANGES EXISTS' 209s + exec 209s + quirk-clean-fixup 209s + case $cleanmode in 209s + perl -i.unfixed -ne ' 209s print unless 209s $_ eq $last && 209s $_ eq "EXAMPLE RULES TARGET clean\n"; 209s $last = $_; 209s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 209s + '[' success = failure ']' 209s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,indep-arch.results 209s + for branch in $bm_branches 209s + bm-run-one 209s + local 'args= --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch' 209s + bmid='gbp-build -B,dpkg-source-d,no-check,bad-build-deps' 209s + bmid=gbp-build_-B,dpkg-source-d,no-check,bad-build-deps 209s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 209s + heading='===== [gbp-build_-B,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 209s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 209s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.expected 209s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.results 209s + bm-compute-expected 209s + require_fail=unexpect 209s + tolerate_fail=unexpect 209s + exec 209s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 209s + local eff_cleanmode=dpkg-source-d,no-check 209s + case "$e_targets" in 209s + case "$act" in 209s + case $eff_cleanmode in 209s + echo 'EXAMPLE RULES TARGET clean' 209s + case $eff_cleanmode in 209s + '[' 'xbuild-arch binary-arch' '!=' x ']' 209s + bm-build-deps-ok 209s + case "$branch" in 209s + return 1 209s + tolerate_fail=tolerate 209s + for t in $e_targets 209s + bm-build-deps-ok 209s + case "$branch" in 209s + return 1 209s + require_fail=required 209s + echo 'EXAMPLE RULES TARGET build-arch' 209s + for t in $e_targets 209s + bm-build-deps-ok 209s + case "$branch" in 209s + return 1 209s + require_fail=required 209s + echo 'EXAMPLE RULES TARGET binary-arch' 209s + bm-report-test 'SOURCE FILE' false 209s + local 'desc=SOURCE FILE' 209s + shift 209s + false 209s + echo 'SOURCE FILE MISSING' 209s + bm-report-test 'SOURCE IN CHANGES' false 209s + local 'desc=SOURCE IN CHANGES' 209s + shift 209s + false 209s + echo 'SOURCE IN CHANGES MISSING' 209s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 209s + local 'desc=DEBS IN CHANGES' 209s + shift 209s + expr 'build-arch binary-arch' : '.*binary.*' 209s 22 209s + echo 'DEBS IN CHANGES EXISTS' 209s + exec 209s + git checkout bad-build-deps 209s Switched to branch 'bad-build-deps' 209s + git clean -xdf 209s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 209s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 209s + set +o pipefail 209s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 209s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 209s + local dgit=dgit 209s + pwd 209s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 209s + : ' 209s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 209s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch 209s | git rev-parse --show-toplevel 209s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 209s | git config -z --get-regexp --local '.*' 209s | git config -z --get-regexp --local '.*' 209s | git config -z --get-regexp --global '.*' 209s | git config -z --get-regexp --system '.*' 209s format , quilt mode gbp 209s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 209s warning: could not open directory 'debian/source/': No such file or directory 209s => `' 209s + git diff --quiet HEAD 209s massage split -B. 209s massage done 2 -B. 209s format , quilt mode gbp 209s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 209s warning: could not open directory 'debian/source/': No such file or directory 209s => `' 209s + git diff --quiet HEAD 209s 209s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 209s dgit: Have to apply the patches - making the tree dirty. 209s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 209s 209s + dpkg-source --before-build . 209s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 209s dpkg-buildpackage: info: source package example 209s dpkg-buildpackage: info: source version 1.0 209s dpkg-buildpackage: info: source distribution unstable 209s dpkg-buildpackage: info: source changed by Ian Jackson 209s fakeroot debian/rules clean 209s EXAMPLE RULES TARGET clean 209s dh_clean 209s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 209s dgit: Unapplying patches again to tidy up the tree. 209s + dpkg-source --after-build . 209s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 209s package seems new, not specifying -v 209s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 209s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 209s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 209s gbp:info: Performing the build 209s dpkg-buildpackage: info: source package example 209s dpkg-buildpackage: info: source version 1.0 209s dpkg-buildpackage: info: source distribution unstable 209s dpkg-buildpackage: info: source changed by Ian Jackson 209s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 209s dpkg-buildpackage: info: host architecture amd64 210s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 210s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 210s dpkg-buildpackage: warning: (Use -d flag to override.) 210s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 210s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-cleaner=true --git-ignore-branch 210s 210s dgit: error: subprocess failed with error exit status 1 210s + local 'ps=255 0' 210s + set -o pipefail 210s + exec 210s + echo '===== [gbp-build_-B,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -B --git-ignore-branch =====' 210s + case $ps in 210s + actual_status=failure 210s + echo 'OPERATION FAILED' 210s + case "$require_fail-$tolerate_fail-$actual_status" in 210s + echo 'REQUIRED FAILURE' 210s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.output 210s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 210s + local 'desc=SOURCE FILE' 210s + shift 210s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 210s + echo 'SOURCE FILE MISSING' 210s + '[' failure = success ']' 210s + exec 210s + quirk-clean-fixup 210s + case $cleanmode in 210s + perl -i.unfixed -ne ' 210s print unless 210s $_ eq $last && 210s $_ eq "EXAMPLE RULES TARGET clean\n"; 210s $last = $_; 210s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-B,dpkg-source-d,no-check,bad-build-deps.results 210s + '[' failure = failure ']' 210s + : bm-act-iterate done. 210s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 210s + bm-guess-e-source-e-targets 'gbp-build -A' 210s + local 'some_act=gbp-build -A' 210s + case "$some_act" in 210s + e_source=false 210s + e_targets='build-indep binary-indep' 210s + real_act='gbp-build -A --git-ignore-branch' 210s + bm-act-iterate 210s + for cleanmode in $cleanmodes 210s + for branch in $bm_branches 210s + bm-run-one 210s + local 'args= --clean=git gbp-build -A --git-ignore-branch' 210s + bmid='gbp-build -A,git,indep-arch' 210s + bmid=gbp-build_-A,git,indep-arch 210s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 210s + heading='===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 210s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 210s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.expected 210s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.results 210s + bm-compute-expected 210s + require_fail=unexpect 210s + tolerate_fail=unexpect 210s + exec 210s + echo '===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 210s + local eff_cleanmode=git 210s + case "$e_targets" in 210s + case "$act" in 210s + case $eff_cleanmode in 210s + echo 'BUILD-MODES PROGRAM git clean -xdf' 210s + case $eff_cleanmode in 210s + '[' 'xbuild-indep binary-indep' '!=' x ']' 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 0 210s + for t in $e_targets 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 0 210s + echo 'EXAMPLE RULES TARGET build-indep' 210s + for t in $e_targets 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 0 210s + echo 'EXAMPLE RULES TARGET binary-indep' 210s + bm-report-test 'SOURCE FILE' false 210s + local 'desc=SOURCE FILE' 210s + shift 210s + false 210s + echo 'SOURCE FILE MISSING' 210s + bm-report-test 'SOURCE IN CHANGES' false 210s + local 'desc=SOURCE IN CHANGES' 210s + shift 210s + false 210s + echo 'SOURCE IN CHANGES MISSING' 210s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 210s + local 'desc=DEBS IN CHANGES' 210s + shift 210s + expr 'build-indep binary-indep' : '.*binary.*' 210s 24 210s + echo 'DEBS IN CHANGES EXISTS' 210s + exec 210s + git checkout indep-arch 210s Switched to branch 'indep-arch' 210s + git clean -xdf 210s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 210s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 210s + set +o pipefail 210s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 210s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 210s + local dgit=dgit 210s + pwd 210s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 210s + : ' 210s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 210s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 210s | git rev-parse --show-toplevel 210s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 210s | git config -z --get-regexp --local '.*' 210s | git config -z --get-regexp --local '.*' 210s | git config -z --get-regexp --global '.*' 210s | git config -z --get-regexp --system '.*' 210s format , quilt mode gbp 210s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 210s warning: could not open directory 'debian/source/': No such file or directory 210s => `' 210s + git diff --quiet HEAD 210s massage split -A. 210s massage done 2 -A. 210s format , quilt mode gbp 210s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 210s warning: could not open directory 'debian/source/': No such file or directory 210s => `' 210s + git diff --quiet HEAD 210s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 210s BUILD-MODES PROGRAM git clean -xdf 210s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 210s package seems new, not specifying -v 210s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 210s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 210s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 210s gbp:info: Performing the build 210s dpkg-buildpackage: info: source package example 210s dpkg-buildpackage: info: source version 1.0 210s dpkg-buildpackage: info: source distribution unstable 210s dpkg-buildpackage: info: source changed by Ian Jackson 210s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 210s debian/rules build-indep 210s EXAMPLE RULES TARGET build-indep 210s fakeroot debian/rules binary-indep 210s EXAMPLE RULES TARGET binary-indep 210s dh_install 210s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 210s dh_gencontrol 210s dh_builddeb 210s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 210s + exec /usr/bin/dpkg-deb -Znone --build debian/example-archdpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 210s .. 210s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 210s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 210s dpkg-genchanges --build=all -O../example_1.0_all.changes 210s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 210s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 210s dpkg-buildpackage: info: binary-only upload (no source included) 210s dgit ok: build successful 210s 210s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 210s ' 210s + local 'ps=0 0' 210s + set -o pipefail 210s + exec 210s + echo '===== [gbp-build_-A,git,indep-arch] dgit --clean=git gbp-build -A --git-ignore-branch =====' 210s + case $ps in 210s + actual_status=success 210s + case "$require_fail-$tolerate_fail-$actual_status" in 210s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.output 210s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 210s + local 'desc=SOURCE FILE' 210s + shift 210s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 210s + echo 'SOURCE FILE MISSING' 210s + '[' success = success ']' 210s + local changes 210s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 210s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 210s + case "$changes" in 210s + perl -ne 'print if m/^files:/i ... m/^\S/' 210s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 210s + local 'desc=SOURCE IN CHANGES' 210s + shift 210s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 210s + echo 'SOURCE IN CHANGES MISSING' 210s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 210s + local 'desc=DEBS IN CHANGES' 210s + shift 210s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 210s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 210s + echo 'DEBS IN CHANGES EXISTS' 210s + exec 210s + quirk-clean-fixup 210s + case $cleanmode in 210s + '[' success = failure ']' 210s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,indep-arch.results 210s + for branch in $bm_branches 210s + bm-run-one 210s + local 'args= --clean=git gbp-build -A --git-ignore-branch' 210s + bmid='gbp-build -A,git,bad-build-deps' 210s + bmid=gbp-build_-A,git,bad-build-deps 210s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 210s + heading='===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 210s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 210s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.expected 210s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.results 210s + bm-compute-expected 210s + require_fail=unexpect 210s + tolerate_fail=unexpect 210s + exec 210s + echo '===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 210s + local eff_cleanmode=git 210s + case "$e_targets" in 210s + case "$act" in 210s + case $eff_cleanmode in 210s + echo 'BUILD-MODES PROGRAM git clean -xdf' 210s + case $eff_cleanmode in 210s + '[' 'xbuild-indep binary-indep' '!=' x ']' 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 1 210s + tolerate_fail=tolerate 210s + for t in $e_targets 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 1 210s + require_fail=required 210s + echo 'EXAMPLE RULES TARGET build-indep' 210s + for t in $e_targets 210s + bm-build-deps-ok 210s + case "$branch" in 210s + return 1 210s + require_fail=required 210s + echo 'EXAMPLE RULES TARGET binary-indep' 210s + bm-report-test 'SOURCE FILE' false 210s + local 'desc=SOURCE FILE' 210s + shift 210s + false 210s + echo 'SOURCE FILE MISSING' 210s + bm-report-test 'SOURCE IN CHANGES' false 210s + local 'desc=SOURCE IN CHANGES' 210s + shift 210s + false 210s + echo 'SOURCE IN CHANGES MISSING' 210s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 210s + local 'desc=DEBS IN CHANGES' 210s + shift 210s + expr 'build-indep binary-indep' : '.*binary.*' 210s 24 210s + echo 'DEBS IN CHANGES EXISTS' 210s + exec 210s + git checkout bad-build-deps 210s Switched to branch 'bad-build-deps' 210s + git clean -xdf 211s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 211s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 211s + set +o pipefail 211s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 211s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 211s + local dgit=dgit 211s + pwd 211s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 211s + : ' 211s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 211s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -A --git-ignore-branch 211s | git rev-parse --show-toplevel 211s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 211s | git config -z --get-regexp --local '.*' 211s | git config -z --get-regexp --local '.*' 211s | git config -z --get-regexp --global '.*' 211s | git config -z --get-regexp --system '.*' 211s format , quilt mode gbp 211s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 211s warning: could not open directory 'debian/source/': No such file or directory 211s => `' 211s + git diff --quiet HEAD 211s massage split -A. 211s massage done 2 -A. 211s format , quilt mode gbp 211s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 211s warning: could not open directory 'debian/source/': No such file or directory 211s => `' 211s + git diff --quiet HEAD 211s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 211s BUILD-MODES PROGRAM git clean -xdf 211s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 211s package seems new, not specifying -v 211s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 211s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 211s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 211s gbp:info: Performing the build 211s dpkg-buildpackage: info: source package example 211s dpkg-buildpackage: info: source version 1.0 211s dpkg-buildpackage: info: source distribution unstable 211s dpkg-buildpackage: info: source changed by Ian Jackson 211s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 211s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 211s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 211s dpkg-buildpackage: warning: (Use -d flag to override.) 211s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 211s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 211s 211s dgit: error: subprocess failed with error exit status 1 211s + local 'ps=255 0' 211s + set -o pipefail 211s + exec 211s + echo '===== [gbp-build_-A,git,bad-build-deps] dgit --clean=git gbp-build -A --git-ignore-branch =====' 211s + case $ps in 211s + actual_status=failure 211s + echo 'OPERATION FAILED' 211s + case "$require_fail-$tolerate_fail-$actual_status" in 211s + echo 'REQUIRED FAILURE' 211s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,git,bad-build-deps.output 211s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 211s + local 'desc=SOURCE FILE' 211s + shift 211s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 211s + echo 'SOURCE FILE MISSING' 211s + '[' failure = success ']' 211s + exec 211s + quirk-clean-fixup 211s + case $cleanmode in 211s + '[' failure = failure ']' 211s + for cleanmode in $cleanmodes 211s + for branch in $bm_branches 211s + bm-run-one 211s + local 'args= --clean=none gbp-build -A --git-ignore-branch' 211s + bmid='gbp-build -A,none,indep-arch' 211s + bmid=gbp-build_-A,none,indep-arch 211s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 211s + heading='===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 211s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 211s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.expected 211s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.results 211s + bm-compute-expected 211s + require_fail=unexpect 211s + tolerate_fail=unexpect 211s + exec 211s + echo '===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 211s + local eff_cleanmode=none 211s + case "$e_targets" in 211s + case "$act" in 211s + case $eff_cleanmode in 211s + case $eff_cleanmode in 211s + '[' 'xbuild-indep binary-indep' '!=' x ']' 211s + bm-build-deps-ok 211s + case "$branch" in 211s + return 0 211s + for t in $e_targets 211s + bm-build-deps-ok 211s + case "$branch" in 211s + return 0 211s + echo 'EXAMPLE RULES TARGET build-indep' 211s + for t in $e_targets 211s + bm-build-deps-ok 211s + case "$branch" in 211s + return 0 211s + echo 'EXAMPLE RULES TARGET binary-indep' 211s + bm-report-test 'SOURCE FILE' false 211s + local 'desc=SOURCE FILE' 211s + shift 211s + false 211s + echo 'SOURCE FILE MISSING' 211s + bm-report-test 'SOURCE IN CHANGES' false 211s + local 'desc=SOURCE IN CHANGES' 211s + shift 211s + false 211s + echo 'SOURCE IN CHANGES MISSING' 211s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 211s + local 'desc=DEBS IN CHANGES' 211s + shift 211s + expr 'build-indep binary-indep' : '.*binary.*' 211s 24 211s + echo 'DEBS IN CHANGES EXISTS' 211s + exec 211s + git checkout indep-arch 211s Switched to branch 'indep-arch' 211s + git clean -xdf 211s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 211s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 211s + set +o pipefail 211s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 211s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 211s + local dgit=dgit 211s + pwd 211s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 211s + : ' 211s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 211s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 211s | git rev-parse --show-toplevel 211s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 211s | git config -z --get-regexp --local '.*' 211s | git config -z --get-regexp --local '.*' 211s | git config -z --get-regexp --global '.*' 211s | git config -z --get-regexp --system '.*' 211s format , quilt mode gbp 211s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 211s warning: could not open directory 'debian/source/': No such file or directory 211s => `' 211s + git diff --quiet HEAD 211s massage split -A. 211s massage done 2 -A. 211s format , quilt mode gbp 211s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 211s warning: could not open directory 'debian/source/': No such file or directory 211s => `' 211s + git diff --quiet HEAD 211s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 211s package seems new, not specifying -v 211s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 211s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 211s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 211s gbp:info: Performing the build 211s dpkg-buildpackage: info: source package example 211s dpkg-buildpackage: info: source version 1.0 211s dpkg-buildpackage: info: source distribution unstable 211s dpkg-buildpackage: info: source changed by Ian Jackson 211s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 211s debian/rules build-indep 211s EXAMPLE RULES TARGET build-indep 211s fakeroot debian/rules binary-indep 211s EXAMPLE RULES TARGET binary-indep 211s dh_install 211s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 211s dh_gencontrol 212s dh_builddeb 212s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 212s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 212s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 212s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 212s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 212s dpkg-genchanges --build=all -O../example_1.0_all.changes 212s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 212s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 212s dpkg-buildpackage: info: binary-only upload (no source included) 212s dgit ok: build successful 212s 212s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 212s ' 212s + local 'ps=0 0' 212s + set -o pipefail 212s + exec 212s + echo '===== [gbp-build_-A,none,indep-arch] dgit --clean=none gbp-build -A --git-ignore-branch =====' 212s + case $ps in 212s + actual_status=success 212s + case "$require_fail-$tolerate_fail-$actual_status" in 212s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.output 212s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 212s + local 'desc=SOURCE FILE' 212s + shift 212s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 212s + echo 'SOURCE FILE MISSING' 212s + '[' success = success ']' 212s + local changes 212s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 212s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 212s + case "$changes" in 212s + perl -ne 'print if m/^files:/i ... m/^\S/' 212s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 212s + local 'desc=SOURCE IN CHANGES' 212s + shift 212s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 212s + echo 'SOURCE IN CHANGES MISSING' 212s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 212s + local 'desc=DEBS IN CHANGES' 212s + shift 212s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 212s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 212s + echo 'DEBS IN CHANGES EXISTS' 212s + exec 212s + quirk-clean-fixup 212s + case $cleanmode in 212s + '[' success = failure ']' 212s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,indep-arch.results 212s + for branch in $bm_branches 212s + bm-run-one 212s + local 'args= --clean=none gbp-build -A --git-ignore-branch' 212s + bmid='gbp-build -A,none,bad-build-deps' 212s + bmid=gbp-build_-A,none,bad-build-deps 212s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 212s + heading='===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 212s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 212s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.expected 212s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.results 212s + bm-compute-expected 212s + require_fail=unexpect 212s + tolerate_fail=unexpect 212s + exec 212s + echo '===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 212s + local eff_cleanmode=none 212s + case "$e_targets" in 212s + case "$act" in 212s + case $eff_cleanmode in 212s + case $eff_cleanmode in 212s + '[' 'xbuild-indep binary-indep' '!=' x ']' 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 1 212s + tolerate_fail=tolerate 212s + for t in $e_targets 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 1 212s + require_fail=required 212s + echo 'EXAMPLE RULES TARGET build-indep' 212s + for t in $e_targets 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 1 212s + require_fail=required 212s + echo 'EXAMPLE RULES TARGET binary-indep' 212s + bm-report-test 'SOURCE FILE' false 212s + local 'desc=SOURCE FILE' 212s + shift 212s + false 212s + echo 'SOURCE FILE MISSING' 212s + bm-report-test 'SOURCE IN CHANGES' false 212s + local 'desc=SOURCE IN CHANGES' 212s + shift 212s + false 212s + echo 'SOURCE IN CHANGES MISSING' 212s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 212s + local 'desc=DEBS IN CHANGES' 212s + shift 212s + expr 'build-indep binary-indep' : '.*binary.*' 212s 24 212s + echo 'DEBS IN CHANGES EXISTS' 212s + exec 212s + git checkout bad-build-deps 212s Switched to branch 'bad-build-deps' 212s + git clean -xdf 212s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 212s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 212s + set +o pipefail 212s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 212s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 212s + local dgit=dgit 212s + pwd 212s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 212s + : ' 212s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 212s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -A --git-ignore-branch 212s | git rev-parse --show-toplevel 212s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 212s | git config -z --get-regexp --local '.*' 212s | git config -z --get-regexp --local '.*' 212s | git config -z --get-regexp --global '.*' 212s | git config -z --get-regexp --system '.*' 212s format , quilt mode gbp 212s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 212s warning: could not open directory 'debian/source/': No such file or directory 212s => `' 212s + git diff --quiet HEAD 212s massage split -A. 212s massage done 2 -A. 212s format , quilt mode gbp 212s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 212s warning: could not open directory 'debian/source/': No such file or directory 212s => `' 212s + git diff --quiet HEAD 212s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 212s package seems new, not specifying -v 212s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 212s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 212s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 212s gbp:info: Performing the build 212s dpkg-buildpackage: info: source package example 212s dpkg-buildpackage: info: source version 1.0 212s dpkg-buildpackage: info: source distribution unstable 212s dpkg-buildpackage: info: source changed by Ian Jackson 212s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 212s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 212s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 212s dpkg-buildpackage: warning: (Use -d flag to override.) 212s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 212s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 212s 212s dgit: error: subprocess failed with error exit status 1 212s + local 'ps=255 0' 212s + set -o pipefail 212s + exec 212s + echo '===== [gbp-build_-A,none,bad-build-deps] dgit --clean=none gbp-build -A --git-ignore-branch =====' 212s + case $ps in 212s + actual_status=failure 212s + echo 'OPERATION FAILED' 212s + case "$require_fail-$tolerate_fail-$actual_status" in 212s + echo 'REQUIRED FAILURE' 212s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,none,bad-build-deps.output 212s + '[' 1 = 1 ']' 212s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 212s + local 'desc=SOURCE FILE' 212s + shift 212s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 212s + echo 'SOURCE FILE MISSING' 212s + '[' failure = success ']' 212s + exec 212s + quirk-clean-fixup 212s + case $cleanmode in 212s + '[' failure = failure ']' 212s + for cleanmode in $cleanmodes 212s + for branch in $bm_branches 212s + bm-run-one 212s + local 'args= --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch' 212s + bmid='gbp-build -A,dpkg-source,no-check,indep-arch' 212s + bmid=gbp-build_-A,dpkg-source,no-check,indep-arch 212s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 212s + heading='===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 212s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 212s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.expected 212s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 212s + bm-compute-expected 212s + require_fail=unexpect 212s + tolerate_fail=unexpect 212s + exec 212s + echo '===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 212s + local eff_cleanmode=dpkg-source,no-check 212s + case "$e_targets" in 212s + case "$act" in 212s + case $eff_cleanmode in 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 0 212s + echo 'EXAMPLE RULES TARGET clean' 212s + case $eff_cleanmode in 212s + '[' 'xbuild-indep binary-indep' '!=' x ']' 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 0 212s + for t in $e_targets 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 0 212s + echo 'EXAMPLE RULES TARGET build-indep' 212s + for t in $e_targets 212s + bm-build-deps-ok 212s + case "$branch" in 212s + return 0 212s + echo 'EXAMPLE RULES TARGET binary-indep' 212s + bm-report-test 'SOURCE FILE' false 212s + local 'desc=SOURCE FILE' 212s + shift 212s + false 212s + echo 'SOURCE FILE MISSING' 212s + bm-report-test 'SOURCE IN CHANGES' false 212s + local 'desc=SOURCE IN CHANGES' 212s + shift 212s + false 212s + echo 'SOURCE IN CHANGES MISSING' 212s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 212s + local 'desc=DEBS IN CHANGES' 212s + shift 212s + expr 'build-indep binary-indep' : '.*binary.*' 212s 24 212s + echo 'DEBS IN CHANGES EXISTS' 212s + exec 212s + git checkout indep-arch 212s Switched to branch 'indep-arch' 212s + git clean -xdf 212s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 212s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 212s + set +o pipefail 212s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 212s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 212s + local dgit=dgit 212s + pwd 212s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 212s + : ' 212s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 212s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 213s | git rev-parse --show-toplevel 213s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 213s | git config -z --get-regexp --local '.*' 213s | git config -z --get-regexp --local '.*' 213s | git config -z --get-regexp --global '.*' 213s | git config -z --get-regexp --system '.*' 213s format , quilt mode gbp 213s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 213s warning: could not open directory 'debian/source/': No such file or directory 213s => `' 213s + git diff --quiet HEAD 213s massage split -A. 213s massage done 2 -A. 213s format , quilt mode gbp 213s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 213s warning: could not open directory 'debian/source/': No such file or directory 213s => `' 213s + git diff --quiet HEAD 213s 213s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 213s dgit: Have to apply the patches - making the tree dirty. 213s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 213s 213s + dpkg-source --before-build . 213s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 213s dpkg-buildpackage: info: source package example 213s dpkg-buildpackage: info: source version 1.0 213s dpkg-buildpackage: info: source distribution unstable 213s dpkg-buildpackage: info: source changed by Ian Jackson 213s fakeroot debian/rules clean 213s EXAMPLE RULES TARGET clean 213s dh_clean 213s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 213s dgit: Unapplying patches again to tidy up the tree. 213s + dpkg-source --after-build . 213s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 213s package seems new, not specifying -v 213s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 213s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 213s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 213s gbp:info: Performing the build 213s dpkg-buildpackage: info: source package example 213s dpkg-buildpackage: info: source version 1.0 213s dpkg-buildpackage: info: source distribution unstable 213s dpkg-buildpackage: info: source changed by Ian Jackson 213s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 213s debian/rules build-indep 213s EXAMPLE RULES TARGET build-indep 213s fakeroot debian/rules binary-indep 213s EXAMPLE RULES TARGET binary-indep 213s dh_install 213s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 213s dh_gencontrol 213s dh_builddeb 213s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 213s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 213s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 213s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 213s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 214s dpkg-genchanges --build=all -O../example_1.0_all.changes 214s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 214s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 214s dpkg-buildpackage: info: binary-only upload (no source included) 214s dgit ok: build successful 214s 214s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 214s ' 214s + local 'ps=0 0' 214s + set -o pipefail 214s + exec 214s + echo '===== [gbp-build_-A,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 214s + case $ps in 214s + actual_status=success 214s + case "$require_fail-$tolerate_fail-$actual_status" in 214s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.output 214s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 214s + local 'desc=SOURCE FILE' 214s + shift 214s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 214s + echo 'SOURCE FILE MISSING' 214s + '[' success = success ']' 214s + local changes 214s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 214s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 214s + case "$changes" in 214s + perl -ne 'print if m/^files:/i ... m/^\S/' 214s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 214s + local 'desc=SOURCE IN CHANGES' 214s + shift 214s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 214s + echo 'SOURCE IN CHANGES MISSING' 214s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 214s + local 'desc=DEBS IN CHANGES' 214s + shift 214s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 214s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 214s + echo 'DEBS IN CHANGES EXISTS' 214s + exec 214s + quirk-clean-fixup 214s + case $cleanmode in 214s + perl -i.unfixed -ne ' 214s print unless 214s $_ eq $last && 214s $_ eq "EXAMPLE RULES TARGET clean\n"; 214s $last = $_; 214s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 214s + '[' success = failure ']' 214s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,indep-arch.results 214s + for branch in $bm_branches 214s + bm-run-one 214s + local 'args= --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch' 214s + bmid='gbp-build -A,dpkg-source,no-check,bad-build-deps' 214s + bmid=gbp-build_-A,dpkg-source,no-check,bad-build-deps 214s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 214s + heading='===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 214s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 214s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.expected 214s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.results 214s + bm-compute-expected 214s + require_fail=unexpect 214s + tolerate_fail=unexpect 214s + exec 214s + echo '===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 214s + local eff_cleanmode=dpkg-source,no-check 214s + case "$e_targets" in 214s + case "$act" in 214s + case $eff_cleanmode in 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 1 214s + tolerate_fail=tolerate 214s + echo 'EXAMPLE RULES TARGET clean' 214s + case $eff_cleanmode in 214s + '[' 'xbuild-indep binary-indep' '!=' x ']' 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 1 214s + tolerate_fail=tolerate 214s + for t in $e_targets 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 1 214s + require_fail=required 214s + echo 'EXAMPLE RULES TARGET build-indep' 214s + for t in $e_targets 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 1 214s + require_fail=required 214s + echo 'EXAMPLE RULES TARGET binary-indep' 214s + bm-report-test 'SOURCE FILE' false 214s + local 'desc=SOURCE FILE' 214s + shift 214s + false 214s + echo 'SOURCE FILE MISSING' 214s + bm-report-test 'SOURCE IN CHANGES' false 214s + local 'desc=SOURCE IN CHANGES' 214s + shift 214s + false 214s + echo 'SOURCE IN CHANGES MISSING' 214s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 214s + local 'desc=DEBS IN CHANGES' 214s + shift 214s + expr 'build-indep binary-indep' : '.*binary.*' 214s 24 214s + echo 'DEBS IN CHANGES EXISTS' 214s + exec 214s + git checkout bad-build-deps 214s Switched to branch 'bad-build-deps' 214s + git clean -xdf 214s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 214s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 214s + set +o pipefail 214s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 214s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 214s + local dgit=dgit 214s + pwd 214s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 214s + : ' 214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 214s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch 214s | git rev-parse --show-toplevel 214s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 214s | git config -z --get-regexp --local '.*' 214s | git config -z --get-regexp --local '.*' 214s | git config -z --get-regexp --global '.*' 214s | git config -z --get-regexp --system '.*' 214s format , quilt mode gbp 214s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 214s warning: could not open directory 'debian/source/': No such file or directory 214s => `' 214s + git diff --quiet HEAD 214s massage split -A. 214s massage done 2 -A. 214s format , quilt mode gbp 214s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 214s warning: could not open directory 'debian/source/': No such file or directory 214s => `' 214s + git diff --quiet HEAD 214s 214s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 214s dgit: Have to apply the patches - making the tree dirty. 214s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 214s 214s + dpkg-source --before-build . 214s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 214s dpkg-buildpackage: info: source package example 214s dpkg-buildpackage: info: source version 1.0 214s dpkg-buildpackage: info: source distribution unstable 214s dpkg-buildpackage: info: source changed by Ian Jackson 214s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 214s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 214s dpkg-buildpackage: warning: (Use -d flag to override.) 214s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 214s 214s dgit: error: subprocess failed with error exit status 3 214s + local 'ps=255 0' 214s + set -o pipefail 214s + exec 214s + echo '===== [gbp-build_-A,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -A --git-ignore-branch =====' 214s + case $ps in 214s + actual_status=failure 214s + echo 'OPERATION FAILED' 214s + case "$require_fail-$tolerate_fail-$actual_status" in 214s + echo 'REQUIRED FAILURE' 214s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.output 214s + '[' 1 = 1 ']' 214s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 214s + local 'desc=SOURCE FILE' 214s + shift 214s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 214s + echo 'SOURCE FILE MISSING' 214s + '[' failure = success ']' 214s + exec 214s + quirk-clean-fixup 214s + case $cleanmode in 214s + perl -i.unfixed -ne ' 214s print unless 214s $_ eq $last && 214s $_ eq "EXAMPLE RULES TARGET clean\n"; 214s $last = $_; 214s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source,no-check,bad-build-deps.results 214s + '[' failure = failure ']' 214s + for cleanmode in $cleanmodes 214s + for branch in $bm_branches 214s + bm-run-one 214s + local 'args= --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch' 214s + bmid='gbp-build -A,dpkg-source-d,no-check,indep-arch' 214s + bmid=gbp-build_-A,dpkg-source-d,no-check,indep-arch 214s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 214s + heading='===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 214s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 214s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.expected 214s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 214s + bm-compute-expected 214s + require_fail=unexpect 214s + tolerate_fail=unexpect 214s + exec 214s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 214s + local eff_cleanmode=dpkg-source-d,no-check 214s + case "$e_targets" in 214s + case "$act" in 214s + case $eff_cleanmode in 214s + echo 'EXAMPLE RULES TARGET clean' 214s + case $eff_cleanmode in 214s + '[' 'xbuild-indep binary-indep' '!=' x ']' 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 0 214s + for t in $e_targets 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 0 214s + echo 'EXAMPLE RULES TARGET build-indep' 214s + for t in $e_targets 214s + bm-build-deps-ok 214s + case "$branch" in 214s + return 0 214s + echo 'EXAMPLE RULES TARGET binary-indep' 214s + bm-report-test 'SOURCE FILE' false 214s + local 'desc=SOURCE FILE' 214s + shift 214s + false 214s + echo 'SOURCE FILE MISSING' 214s + bm-report-test 'SOURCE IN CHANGES' false 214s + local 'desc=SOURCE IN CHANGES' 214s + shift 214s + false 214s + echo 'SOURCE IN CHANGES MISSING' 214s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 214s + local 'desc=DEBS IN CHANGES' 214s + shift 214s + expr 'build-indep binary-indep' : '.*binary.*' 214s 24 214s + echo 'DEBS IN CHANGES EXISTS' 214s + exec 214s + git checkout indep-arch 214s Switched to branch 'indep-arch' 214s + git clean -xdf 214s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 214s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 214s + set +o pipefail 214s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 214s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 214s + local dgit=dgit 214s + pwd 214s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 214s + : ' 214s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 214s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 214s | git rev-parse --show-toplevel 214s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 214s | git config -z --get-regexp --local '.*' 214s | git config -z --get-regexp --local '.*' 214s | git config -z --get-regexp --global '.*' 214s | git config -z --get-regexp --system '.*' 214s format , quilt mode gbp 214s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 214s warning: could not open directory 'debian/source/': No such file or directory 214s => `' 214s + git diff --quiet HEAD 214s massage split -A. 214s massage done 2 -A. 214s format , quilt mode gbp 214s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 214s warning: could not open directory 'debian/source/': No such file or directory 214s => `' 214s + git diff --quiet HEAD 214s 214s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 214s dgit: Have to apply the patches - making the tree dirty. 214s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 214s 214s + dpkg-source --before-build . 214s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 214s dpkg-buildpackage: info: source package example 214s dpkg-buildpackage: info: source version 1.0 214s dpkg-buildpackage: info: source distribution unstable 214s dpkg-buildpackage: info: source changed by Ian Jackson 214s fakeroot debian/rules clean 214s EXAMPLE RULES TARGET clean 214s dh_clean 214s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 214s dgit: Unapplying patches again to tidy up the tree. 214s + dpkg-source --after-build . 215s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 215s package seems new, not specifying -v 215s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 215s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 215s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 215s gbp:info: Performing the build 215s dpkg-buildpackage: info: source package example 215s dpkg-buildpackage: info: source version 1.0 215s dpkg-buildpackage: info: source distribution unstable 215s dpkg-buildpackage: info: source changed by Ian Jackson 215s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 215s debian/rules build-indep 215s EXAMPLE RULES TARGET build-indep 215s fakeroot debian/rules binary-indep 215s EXAMPLE RULES TARGET binary-indep 215s dh_install 215s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 215s dh_gencontrol 215s dh_builddeb 215s + exec /usr/bin/dpkg-deb -Znone+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 215s --build debian/example-indep .. 215s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 215s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 215s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 215s dpkg-genchanges --build=all -O../example_1.0_all.changes 215s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 215s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 215s dpkg-buildpackage: info: binary-only upload (no source included) 215s dgit ok: build successful 215s 215s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 215s ' 215s + local 'ps=0 0' 215s + set -o pipefail 215s + exec 215s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 215s + case $ps in 215s + actual_status=success 215s + case "$require_fail-$tolerate_fail-$actual_status" in 215s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.output 215s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 215s + local 'desc=SOURCE FILE' 215s + shift 215s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 215s + echo 'SOURCE FILE MISSING' 215s + '[' success = success ']' 215s + local changes 215s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 215s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes 215s + case "$changes" in 215s + perl -ne 'print if m/^files:/i ... m/^\S/' 215s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 215s + local 'desc=SOURCE IN CHANGES' 215s + shift 215s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 215s + echo 'SOURCE IN CHANGES MISSING' 215s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 215s + local 'desc=DEBS IN CHANGES' 215s + shift 215s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_all.changes.files 215s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 215s + echo 'DEBS IN CHANGES EXISTS' 215s + exec 215s + quirk-clean-fixup 215s + case $cleanmode in 215s + perl -i.unfixed -ne ' 215s print unless 215s $_ eq $last && 215s $_ eq "EXAMPLE RULES TARGET clean\n"; 215s $last = $_; 215s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 215s + '[' success = failure ']' 215s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,indep-arch.results 215s + for branch in $bm_branches 215s + bm-run-one 215s + local 'args= --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch' 215s + bmid='gbp-build -A,dpkg-source-d,no-check,bad-build-deps' 215s + bmid=gbp-build_-A,dpkg-source-d,no-check,bad-build-deps 215s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 215s + heading='===== [gbp-build_-A,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 215s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 215s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.expected 215s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.results 215s + bm-compute-expected 215s + require_fail=unexpect 215s + tolerate_fail=unexpect 215s + exec 215s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 215s + local eff_cleanmode=dpkg-source-d,no-check 215s + case "$e_targets" in 215s + case "$act" in 215s + case $eff_cleanmode in 215s + echo 'EXAMPLE RULES TARGET clean' 215s + case $eff_cleanmode in 215s + '[' 'xbuild-indep binary-indep' '!=' x ']' 215s + bm-build-deps-ok 215s + case "$branch" in 215s + return 1 215s + tolerate_fail=tolerate 215s + for t in $e_targets 215s + bm-build-deps-ok 215s + case "$branch" in 215s + return 1 215s + require_fail=required 215s + echo 'EXAMPLE RULES TARGET build-indep' 215s + for t in $e_targets 215s + bm-build-deps-ok 215s + case "$branch" in 215s + return 1 215s + require_fail=required 215s + echo 'EXAMPLE RULES TARGET binary-indep' 215s + bm-report-test 'SOURCE FILE' false 215s + local 'desc=SOURCE FILE' 215s + shift 215s + false 215s + echo 'SOURCE FILE MISSING' 215s + bm-report-test 'SOURCE IN CHANGES' false 215s + local 'desc=SOURCE IN CHANGES' 215s + shift 215s + false 215s + echo 'SOURCE IN CHANGES MISSING' 215s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 215s + local 'desc=DEBS IN CHANGES' 215s + shift 215s + expr 'build-indep binary-indep' : '.*binary.*' 215s 24 215s + echo 'DEBS IN CHANGES EXISTS' 215s + exec 215s + git checkout bad-build-deps 215s Switched to branch 'bad-build-deps' 215s + git clean -xdf 215s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 215s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 215s + set +o pipefail 215s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 215s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 215s + local dgit=dgit 215s + pwd 215s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 215s + : ' 215s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 215s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch 215s | git rev-parse --show-toplevel 215s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 215s | git config -z --get-regexp --local '.*' 215s | git config -z --get-regexp --local '.*' 215s | git config -z --get-regexp --global '.*' 215s | git config -z --get-regexp --system '.*' 215s format , quilt mode gbp 215s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 215s warning: could not open directory 'debian/source/': No such file or directory 215s => `' 215s + git diff --quiet HEAD 215s massage split -A. 215s massage done 2 -A. 215s format , quilt mode gbp 215s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 215s warning: could not open directory 'debian/source/': No such file or directory 215s => `' 215s + git diff --quiet HEAD 215s 215s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 215s dgit: Have to apply the patches - making the tree dirty. 215s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 215s 215s + dpkg-source --before-build . 216s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 216s dpkg-buildpackage: info: source package example 216s dpkg-buildpackage: info: source version 1.0 216s dpkg-buildpackage: info: source distribution unstable 216s dpkg-buildpackage: info: source changed by Ian Jackson 216s fakeroot debian/rules clean 216s EXAMPLE RULES TARGET clean 216s dh_clean 216s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 216s dgit: Unapplying patches again to tidy up the tree. 216s + dpkg-source --after-build . 216s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 216s package seems new, not specifying -v 216s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 216s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 216s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 216s gbp:info: Performing the build 216s dpkg-buildpackage: info: source package example 216s dpkg-buildpackage: info: source version 1.0 216s dpkg-buildpackage: info: source distribution unstable 216s dpkg-buildpackage: info: source changed by Ian Jackson 216s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 216s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 216s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 216s dpkg-buildpackage: warning: (Use -d flag to override.) 216s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 216s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-cleaner=true --git-ignore-branch 216s 216s dgit: error: subprocess failed with error exit status 1 216s + local 'ps=255 0' 216s + set -o pipefail 216s + exec 216s + echo '===== [gbp-build_-A,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -A --git-ignore-branch =====' 216s + case $ps in 216s + actual_status=failure 216s + echo 'OPERATION FAILED' 216s + case "$require_fail-$tolerate_fail-$actual_status" in 216s + echo 'REQUIRED FAILURE' 216s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.output 216s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 216s + local 'desc=SOURCE FILE' 216s + shift 216s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 216s + echo 'SOURCE FILE MISSING' 216s + '[' failure = success ']' 216s + exec 216s + quirk-clean-fixup 216s + case $cleanmode in 216s + perl -i.unfixed -ne ' 216s print unless 216s $_ eq $last && 216s $_ eq "EXAMPLE RULES TARGET clean\n"; 216s $last = $_; 216s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-A,dpkg-source-d,no-check,bad-build-deps.results 216s + '[' failure = failure ']' 216s + : bm-act-iterate done. 216s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 216s + bm-guess-e-source-e-targets 'gbp-build -F' 216s + local 'some_act=gbp-build -F' 216s + case "$some_act" in 216s + e_source=true 216s + e_targets='build binary' 216s + real_act='gbp-build -F --git-ignore-branch' 216s + bm-act-iterate 216s + for cleanmode in $cleanmodes 216s + for branch in $bm_branches 216s + bm-run-one 216s + local 'args= --clean=git gbp-build -F --git-ignore-branch' 216s + bmid='gbp-build -F,git,indep-arch' 216s + bmid=gbp-build_-F,git,indep-arch 216s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 216s + heading='===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 216s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 216s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.expected 216s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.results 216s + bm-compute-expected 216s + require_fail=unexpect 216s + tolerate_fail=unexpect 216s + exec 216s + echo '===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 216s + local eff_cleanmode=git 216s + case "$e_targets" in 216s + case "$act" in 216s + case $eff_cleanmode in 216s + echo 'BUILD-MODES PROGRAM git clean -xdf' 216s + case $eff_cleanmode in 216s + '[' 'xbuild binary' '!=' x ']' 216s + bm-build-deps-ok 216s + case "$branch" in 216s + return 0 216s + for t in $e_targets 216s + bm-build-deps-ok 216s + case "$branch" in 216s + return 0 216s + echo 'EXAMPLE RULES TARGET build' 216s + for t in $e_targets 216s + bm-build-deps-ok 216s + case "$branch" in 216s + return 0 216s + echo 'EXAMPLE RULES TARGET binary' 216s + bm-report-test 'SOURCE FILE' true 216s + local 'desc=SOURCE FILE' 216s + shift 216s + true 216s + echo 'SOURCE FILE EXISTS' 216s + bm-report-test 'SOURCE IN CHANGES' true 216s + local 'desc=SOURCE IN CHANGES' 216s + shift 216s + true 216s + echo 'SOURCE IN CHANGES EXISTS' 216s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 216s + local 'desc=DEBS IN CHANGES' 216s + shift 216s + expr 'build binary' : '.*binary.*' 216s 12 216s + echo 'DEBS IN CHANGES EXISTS' 216s + exec 216s + git checkout indep-arch 216s Switched to branch 'indep-arch' 216s + git clean -xdf 216s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 216s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 216s + set +o pipefail 216s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 216s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 216s + local dgit=dgit 216s + pwd 216s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 216s + : ' 216s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 216s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 216s | git rev-parse --show-toplevel 216s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 216s | git config -z --get-regexp --local '.*' 216s | git config -z --get-regexp --local '.*' 216s | git config -z --get-regexp --global '.*' 216s | git config -z --get-regexp --system '.*' 216s format , quilt mode gbp 216s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 216s warning: could not open directory 'debian/source/': No such file or directory 216s => `' 216s + git diff --quiet HEAD 216s massage split -F. 216s massage done 3 -b. 216s format , quilt mode gbp 216s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 216s warning: could not open directory 'debian/source/': No such file or directory 216s => `' 216s + git diff --quiet HEAD 216s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 216s BUILD-MODES PROGRAM git clean -xdf 216s | git rev-parse 'HEAD~0' 216s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 216s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 216s CD work 216s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 216s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 216s CD .. 216s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 216s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 216s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 216s dpkg-source: info: using source format '1.0' 216s dpkg-source: info: building example in example_1.0.tar.gz 216s dpkg-source: info: building example in example_1.0.dsc 216s CD work 216s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 216s package seems new, not specifying -v 216s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 217s dpkg-genchanges: info: including full source code in upload 217s CD .. 217s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 217s renaming (Files) example_1.0.tar.gz 217s renaming (dsc) example_1.0.dsc 217s renaming (changes) example_1.0_source.changes 217s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 217s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 217s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 217s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 217s gbp:info: Performing the build 217s dpkg-buildpackage: info: source package example 217s dpkg-buildpackage: info: source version 1.0 217s dpkg-buildpackage: info: source distribution unstable 217s dpkg-buildpackage: info: source changed by Ian Jackson 217s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 217s dpkg-buildpackage: info: host architecture amd64 217s debian/rules build 217s EXAMPLE RULES TARGET build 217s fakeroot debian/rules binary 217s EXAMPLE RULES TARGET binary 217s dh_install 217s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 217s dh_gencontrol 217s dh_builddeb 217s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 217s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 217s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 217s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 217s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 217s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 217s dpkg-genchanges: info: binary-only upload (no source code included) 217s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 217s dpkg-buildpackage: info: binary-only upload (no source included) 217s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 217s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 218s dgit ok: build successful, results in example_1.0_multi.changes 218s 218s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 218s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 218s ' 218s + local 'ps=0 0' 218s + set -o pipefail 218s + exec 218s + echo '===== [gbp-build_-F,git,indep-arch] dgit --clean=git gbp-build -F --git-ignore-branch =====' 218s + case $ps in 218s + actual_status=success 218s + case "$require_fail-$tolerate_fail-$actual_status" in 218s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.output 218s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 218s + local 'desc=SOURCE FILE' 218s + shift 218s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 218s + echo 'SOURCE FILE EXISTS' 218s + '[' success = success ']' 218s + local changes 218s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 218s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 218s + case "$changes" in 218s + perl -ne 'print if m/^files:/i ... m/^\S/' 218s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 218s + local 'desc=SOURCE IN CHANGES' 218s + shift 218s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 218s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 218s + echo 'SOURCE IN CHANGES EXISTS' 218s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 218s + local 'desc=DEBS IN CHANGES' 218s + shift 218s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 218s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 218s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 218s + echo 'DEBS IN CHANGES EXISTS' 218s + exec 218s + quirk-clean-fixup 218s + case $cleanmode in 218s + '[' success = failure ']' 218s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,indep-arch.results 218s + for branch in $bm_branches 218s + bm-run-one 218s + local 'args= --clean=git gbp-build -F --git-ignore-branch' 218s + bmid='gbp-build -F,git,bad-build-deps' 218s + bmid=gbp-build_-F,git,bad-build-deps 218s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 218s + heading='===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 218s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 218s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.expected 218s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.results 218s + bm-compute-expected 218s + require_fail=unexpect 218s + tolerate_fail=unexpect 218s + exec 218s + echo '===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 218s + local eff_cleanmode=git 218s + case "$e_targets" in 218s + case "$act" in 218s + case $eff_cleanmode in 218s + echo 'BUILD-MODES PROGRAM git clean -xdf' 218s + case $eff_cleanmode in 218s + '[' 'xbuild binary' '!=' x ']' 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 1 218s + tolerate_fail=tolerate 218s + for t in $e_targets 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 1 218s + require_fail=required 218s + echo 'EXAMPLE RULES TARGET build' 218s + for t in $e_targets 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 1 218s + require_fail=required 218s + echo 'EXAMPLE RULES TARGET binary' 218s + bm-report-test 'SOURCE FILE' true 218s + local 'desc=SOURCE FILE' 218s + shift 218s + true 218s + echo 'SOURCE FILE EXISTS' 218s + bm-report-test 'SOURCE IN CHANGES' true 218s + local 'desc=SOURCE IN CHANGES' 218s + shift 218s + true 218s + echo 'SOURCE IN CHANGES EXISTS' 218s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 218s + local 'desc=DEBS IN CHANGES' 218s + shift 218s + expr 'build binary' : '.*binary.*' 218s 12 218s + echo 'DEBS IN CHANGES EXISTS' 218s + exec 218s + git checkout bad-build-deps 218s Switched to branch 'bad-build-deps' 218s + git clean -xdf 218s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 218s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 218s + set +o pipefail 218s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 218s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 218s + local dgit=dgit 218s + pwd 218s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 218s + : ' 218s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 218s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -F --git-ignore-branch 218s | git rev-parse --show-toplevel 218s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 218s | git config -z --get-regexp --local '.*' 218s | git config -z --get-regexp --local '.*' 218s | git config -z --get-regexp --global '.*' 218s | git config -z --get-regexp --system '.*' 218s format , quilt mode gbp 218s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 218s warning: could not open directory 'debian/source/': No such file or directory 218s => `' 218s + git diff --quiet HEAD 218s massage split -F. 218s massage done 3 -b. 218s format , quilt mode gbp 218s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 218s warning: could not open directory 'debian/source/': No such file or directory 218s => `' 218s + git diff --quiet HEAD 218s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 218s BUILD-MODES PROGRAM git clean -xdf 218s | git rev-parse 'HEAD~0' 218s => `d09bc55f43bc5586103335d232c16bd041247bd1' 218s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 218s CD work 218s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 218s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 218s CD .. 218s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 218s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 218s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 218s dpkg-source: info: using source format '1.0' 218s dpkg-source: info: building example in example_1.0.tar.gz 218s dpkg-source: info: building example in example_1.0.dsc 218s CD work 218s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 218s package seems new, not specifying -v 218s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 218s dpkg-genchanges: info: including full source code in upload 218s CD .. 218s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 218s renaming (Files) example_1.0.tar.gz 218s renaming (dsc) example_1.0.dsc 218s renaming (changes) example_1.0_source.changes 218s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 218s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 218s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 218s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 218s gbp:info: Performing the build 218s dpkg-buildpackage: info: source package example 218s dpkg-buildpackage: info: source version 1.0 218s dpkg-buildpackage: info: source distribution unstable 218s dpkg-buildpackage: info: source changed by Ian Jackson 218s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 218s dpkg-buildpackage: info: host architecture amd64 218s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 218s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 218s dpkg-buildpackage: warning: (Use -d flag to override.) 218s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 218s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 218s 218s dgit: error: subprocess failed with error exit status 1 218s + local 'ps=255 0' 218s + set -o pipefail 218s + exec 218s + echo '===== [gbp-build_-F,git,bad-build-deps] dgit --clean=git gbp-build -F --git-ignore-branch =====' 218s + case $ps in 218s + actual_status=failure 218s + echo 'OPERATION FAILED' 218s + case "$require_fail-$tolerate_fail-$actual_status" in 218s + echo 'REQUIRED FAILURE' 218s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,git,bad-build-deps.output 218s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 218s + local 'desc=SOURCE FILE' 218s + shift 218s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 218s + echo 'SOURCE FILE EXISTS' 218s + '[' failure = success ']' 218s + exec 218s + quirk-clean-fixup 218s + case $cleanmode in 218s + '[' failure = failure ']' 218s + for cleanmode in $cleanmodes 218s + for branch in $bm_branches 218s + bm-run-one 218s + local 'args= --clean=none gbp-build -F --git-ignore-branch' 218s + bmid='gbp-build -F,none,indep-arch' 218s + bmid=gbp-build_-F,none,indep-arch 218s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 218s + heading='===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 218s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 218s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.expected 218s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.results 218s + bm-compute-expected 218s + require_fail=unexpect 218s + tolerate_fail=unexpect 218s + exec 218s + echo '===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 218s + local eff_cleanmode=none 218s + case "$e_targets" in 218s + case "$act" in 218s + case $eff_cleanmode in 218s + case $eff_cleanmode in 218s + '[' 'xbuild binary' '!=' x ']' 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 0 218s + for t in $e_targets 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 0 218s + echo 'EXAMPLE RULES TARGET build' 218s + for t in $e_targets 218s + bm-build-deps-ok 218s + case "$branch" in 218s + return 0 218s + echo 'EXAMPLE RULES TARGET binary' 218s + bm-report-test 'SOURCE FILE' true 218s + local 'desc=SOURCE FILE' 218s + shift 218s + true 218s + echo 'SOURCE FILE EXISTS' 218s + bm-report-test 'SOURCE IN CHANGES' true 218s + local 'desc=SOURCE IN CHANGES' 218s + shift 218s + true 218s + echo 'SOURCE IN CHANGES EXISTS' 218s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 218s + local 'desc=DEBS IN CHANGES' 218s + shift 218s + expr 'build binary' : '.*binary.*' 218s 12 218s + echo 'DEBS IN CHANGES EXISTS' 218s + exec 218s + git checkout indep-arch 218s Switched to branch 'indep-arch' 218s + git clean -xdf 218s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 218s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 218s + set +o pipefail 218s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 218s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 219s + local dgit=dgit 219s + pwd 219s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 219s + : ' 219s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 219s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 219s | git rev-parse --show-toplevel 219s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 219s | git config -z --get-regexp --local '.*' 219s | git config -z --get-regexp --local '.*' 219s | git config -z --get-regexp --global '.*' 219s | git config -z --get-regexp --system '.*' 219s format , quilt mode gbp 219s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 219s warning: could not open directory 'debian/source/': No such file or directory 219s => `' 219s + git diff --quiet HEAD 219s massage split -F. 219s massage done 3 -b. 219s format , quilt mode gbp 219s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 219s warning: could not open directory 'debian/source/': No such file or directory 219s => `' 219s + git diff --quiet HEAD 219s | git rev-parse 'HEAD~0' 219s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 219s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 219s CD work 219s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 219s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 219s CD .. 219s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 219s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 219s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 219s dpkg-source: info: using source format '1.0' 219s dpkg-source: info: building example in example_1.0.tar.gz 219s dpkg-source: info: building example in example_1.0.dsc 219s CD work 219s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 219s package seems new, not specifying -v 219s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 219s dpkg-genchanges: info: including full source code in upload 219s CD .. 219s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 219s renaming (Files) example_1.0.tar.gz 219s renaming (dsc) example_1.0.dsc 219s renaming (changes) example_1.0_source.changes 219s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 219s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 219s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 219s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 219s gbp:info: Performing the build 219s dpkg-buildpackage: info: source package example 219s dpkg-buildpackage: info: source version 1.0 219s dpkg-buildpackage: info: source distribution unstable 219s dpkg-buildpackage: info: source changed by Ian Jackson 219s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 219s dpkg-buildpackage: info: host architecture amd64 219s debian/rules build 219s EXAMPLE RULES TARGET build 219s fakeroot debian/rules binary 219s EXAMPLE RULES TARGET binary 219s dh_install 219s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 219s dh_gencontrol 219s dh_builddeb 219s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 219s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 219s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 219s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 219s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 219s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 220s dpkg-genchanges: info: binary-only upload (no source code included) 220s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 220s dpkg-buildpackage: info: binary-only upload (no source included) 220s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 220s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 220s dgit ok: build successful, results in example_1.0_multi.changes 220s 220s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 220s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 220s ' 220s + local 'ps=0 0' 220s + set -o pipefail 220s + exec 220s + echo '===== [gbp-build_-F,none,indep-arch] dgit --clean=none gbp-build -F --git-ignore-branch =====' 220s + case $ps in 220s + actual_status=success 220s + case "$require_fail-$tolerate_fail-$actual_status" in 220s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.output 220s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 220s + local 'desc=SOURCE FILE' 220s + shift 220s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 220s + echo 'SOURCE FILE EXISTS' 220s + '[' success = success ']' 220s + local changes 220s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 220s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 220s + case "$changes" in 220s + perl -ne 'print if m/^files:/i ... m/^\S/' 220s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 220s + local 'desc=SOURCE IN CHANGES' 220s + shift 220s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 220s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 220s + echo 'SOURCE IN CHANGES EXISTS' 220s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 220s + local 'desc=DEBS IN CHANGES' 220s + shift 220s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 220s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 220s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 220s + echo 'DEBS IN CHANGES EXISTS' 220s + exec 220s + quirk-clean-fixup 220s + case $cleanmode in 220s + '[' success = failure ']' 220s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,indep-arch.results 220s + for branch in $bm_branches 220s + bm-run-one 220s + local 'args= --clean=none gbp-build -F --git-ignore-branch' 220s + bmid='gbp-build -F,none,bad-build-deps' 220s + bmid=gbp-build_-F,none,bad-build-deps 220s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 220s + heading='===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 220s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 220s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.expected 220s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.results 220s + bm-compute-expected 220s + require_fail=unexpect 220s + tolerate_fail=unexpect 220s + exec 220s + echo '===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 220s + local eff_cleanmode=none 220s + case "$e_targets" in 220s + case "$act" in 220s + case $eff_cleanmode in 220s + case $eff_cleanmode in 220s + '[' 'xbuild binary' '!=' x ']' 220s + bm-build-deps-ok 220s + case "$branch" in 220s + return 1 220s + tolerate_fail=tolerate 220s + for t in $e_targets 220s + bm-build-deps-ok 220s + case "$branch" in 220s + return 1 220s + require_fail=required 220s + echo 'EXAMPLE RULES TARGET build' 220s + for t in $e_targets 220s + bm-build-deps-ok 220s + case "$branch" in 220s + return 1 220s + require_fail=required 220s + echo 'EXAMPLE RULES TARGET binary' 220s + bm-report-test 'SOURCE FILE' true 220s + local 'desc=SOURCE FILE' 220s + shift 220s + true 220s + echo 'SOURCE FILE EXISTS' 220s + bm-report-test 'SOURCE IN CHANGES' true 220s + local 'desc=SOURCE IN CHANGES' 220s + shift 220s + true 220s + echo 'SOURCE IN CHANGES EXISTS' 220s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 220s + local 'desc=DEBS IN CHANGES' 220s + shift 220s + expr 'build binary' : '.*binary.*' 220s 12 220s + echo 'DEBS IN CHANGES EXISTS' 220s + exec 220s + git checkout bad-build-deps 220s Switched to branch 'bad-build-deps' 220s + git clean -xdf 220s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 220s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 220s + set +o pipefail 220s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 220s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 220s + local dgit=dgit 220s + pwd 220s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 220s + : ' 220s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 220s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -F --git-ignore-branch 220s | git rev-parse --show-toplevel 220s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 220s | git config -z --get-regexp --local '.*' 220s | git config -z --get-regexp --local '.*' 220s | git config -z --get-regexp --global '.*' 220s | git config -z --get-regexp --system '.*' 220s format , quilt mode gbp 220s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 220s warning: could not open directory 'debian/source/': No such file or directory 220s => `' 220s + git diff --quiet HEAD 220s massage split -F. 220s massage done 3 -b. 220s format , quilt mode gbp 220s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 220s warning: could not open directory 'debian/source/': No such file or directory 220s => `' 220s + git diff --quiet HEAD 220s | git rev-parse 'HEAD~0' 220s => `d09bc55f43bc5586103335d232c16bd041247bd1' 220s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 220s CD work 220s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 220s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 220s CD .. 220s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 220s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 220s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 220s dpkg-source: info: using source format '1.0' 220s dpkg-source: info: building example in example_1.0.tar.gz 220s dpkg-source: info: building example in example_1.0.dsc 220s CD work 220s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 220s package seems new, not specifying -v 220s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 220s dpkg-genchanges: info: including full source code in upload 220s CD .. 220s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 220s renaming (Files) example_1.0.tar.gz 220s renaming (dsc) example_1.0.dsc 220s renaming (changes) example_1.0_source.changes 220s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 220s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 220s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 220s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 220s gbp:info: Performing the build 221s dpkg-buildpackage: info: source package example 221s dpkg-buildpackage: info: source version 1.0 221s dpkg-buildpackage: info: source distribution unstable 221s dpkg-buildpackage: info: source changed by Ian Jackson 221s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 221s dpkg-buildpackage: info: host architecture amd64 221s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 221s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 221s dpkg-buildpackage: warning: (Use -d flag to override.) 221s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 221s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 221s 221s dgit: error: subprocess failed with error exit status 1 221s + local 'ps=255 0' 221s + set -o pipefail 221s + exec 221s + echo '===== [gbp-build_-F,none,bad-build-deps] dgit --clean=none gbp-build -F --git-ignore-branch =====' 221s + case $ps in 221s + actual_status=failure 221s + echo 'OPERATION FAILED' 221s + case "$require_fail-$tolerate_fail-$actual_status" in 221s + echo 'REQUIRED FAILURE' 221s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,none,bad-build-deps.output 221s + '[' 1 = 1 ']' 221s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 221s + local 'desc=SOURCE FILE' 221s + shift 221s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 221s + echo 'SOURCE FILE EXISTS' 221s + '[' failure = success ']' 221s + exec 221s + quirk-clean-fixup 221s + case $cleanmode in 221s + '[' failure = failure ']' 221s + for cleanmode in $cleanmodes 221s + for branch in $bm_branches 221s + bm-run-one 221s + local 'args= --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch' 221s + bmid='gbp-build -F,dpkg-source,no-check,indep-arch' 221s + bmid=gbp-build_-F,dpkg-source,no-check,indep-arch 221s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 221s + heading='===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 221s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 221s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.expected 221s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 221s + bm-compute-expected 221s + require_fail=unexpect 221s + tolerate_fail=unexpect 221s + exec 221s + echo '===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 221s + local eff_cleanmode=dpkg-source,no-check 221s + case "$e_targets" in 221s + case "$act" in 221s + case $eff_cleanmode in 221s + bm-build-deps-ok 221s + case "$branch" in 221s + return 0 221s + echo 'EXAMPLE RULES TARGET clean' 221s + case $eff_cleanmode in 221s + '[' 'xbuild binary' '!=' x ']' 221s + bm-build-deps-ok 221s + case "$branch" in 221s + return 0 221s + for t in $e_targets 221s + bm-build-deps-ok 221s + case "$branch" in 221s + return 0 221s + echo 'EXAMPLE RULES TARGET build' 221s + for t in $e_targets 221s + bm-build-deps-ok 221s + case "$branch" in 221s + return 0 221s + echo 'EXAMPLE RULES TARGET binary' 221s + bm-report-test 'SOURCE FILE' true 221s + local 'desc=SOURCE FILE' 221s + shift 221s + true 221s + echo 'SOURCE FILE EXISTS' 221s + bm-report-test 'SOURCE IN CHANGES' true 221s + local 'desc=SOURCE IN CHANGES' 221s + shift 221s + true 221s + echo 'SOURCE IN CHANGES EXISTS' 221s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 221s + local 'desc=DEBS IN CHANGES' 221s + shift 221s + expr 'build binary' : '.*binary.*' 221s 12 221s + echo 'DEBS IN CHANGES EXISTS' 221s + exec 221s + git checkout indep-arch 221s Switched to branch 'indep-arch' 221s + git clean -xdf 221s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 221s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 221s + set +o pipefail 221s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 221s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 221s + local dgit=dgit 221s + pwd 221s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 221s + : ' 221s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 221s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 221s | git rev-parse --show-toplevel 221s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 221s | git config -z --get-regexp --local '.*' 221s | git config -z --get-regexp --local '.*' 221s | git config -z --get-regexp --global '.*' 221s | git config -z --get-regexp --system '.*' 221s format , quilt mode gbp 221s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 221s warning: could not open directory 'debian/source/': No such file or directory 221s => `' 221s + git diff --quiet HEAD 221s massage split -F. 221s massage done 3 -b. 221s format , quilt mode gbp 221s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 221s warning: could not open directory 'debian/source/': No such file or directory 221s => `' 221s + git diff --quiet HEAD 221s 221s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 221s dgit: Have to apply the patches - making the tree dirty. 221s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 221s 221s + dpkg-source --before-build . 221s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 221s dpkg-buildpackage: info: source package example 221s dpkg-buildpackage: info: source version 1.0 221s dpkg-buildpackage: info: source distribution unstable 221s dpkg-buildpackage: info: source changed by Ian Jackson 221s fakeroot debian/rules clean 221s EXAMPLE RULES TARGET clean 221s dh_clean 221s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 221s | git rev-parse 'HEAD~0' 221s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 221s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 221s CD work 221s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 221s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 221s CD .. 221s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 221s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 221s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 221s dpkg-source: info: using source format '1.0' 221s dpkg-source: info: building example in example_1.0.tar.gz 221s dpkg-source: info: building example in example_1.0.dsc 221s CD work 221s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 221s package seems new, not specifying -v 221s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 221s dpkg-genchanges: info: including full source code in upload 221s CD .. 221s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 221s renaming (Files) example_1.0.tar.gz 221s renaming (dsc) example_1.0.dsc 221s renaming (changes) example_1.0_source.changes 221s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 221s dgit: Unapplying patches again to tidy up the tree. 221s + dpkg-source --after-build . 221s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 221s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 221s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 221s gbp:info: Performing the build 222s dpkg-buildpackage: info: source package example 222s dpkg-buildpackage: info: source version 1.0 222s dpkg-buildpackage: info: source distribution unstable 222s dpkg-buildpackage: info: source changed by Ian Jackson 222s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 222s dpkg-buildpackage: info: host architecture amd64 222s debian/rules build 222s EXAMPLE RULES TARGET build 222s fakeroot debian/rules binary 222s EXAMPLE RULES TARGET binary 222s dh_install 222s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 222s dh_gencontrol 222s dh_builddeb 222s + exec+ exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 222s /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 222s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 222s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 222s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 222s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 222s dpkg-genchanges: info: binary-only upload (no source code included) 222s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 222s dpkg-buildpackage: info: binary-only upload (no source included) 222s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 222s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 223s dgit ok: build successful, results in example_1.0_multi.changes 223s 223s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 223s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 223s ' 223s + local 'ps=0 0' 223s + set -o pipefail 223s + exec 223s + echo '===== [gbp-build_-F,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 223s + case $ps in 223s + actual_status=success 223s + case "$require_fail-$tolerate_fail-$actual_status" in 223s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.output 223s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 223s + local 'desc=SOURCE FILE' 223s + shift 223s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 223s + echo 'SOURCE FILE EXISTS' 223s + '[' success = success ']' 223s + local changes 223s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 223s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 223s + case "$changes" in 223s + perl -ne 'print if m/^files:/i ... m/^\S/' 223s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 223s + local 'desc=SOURCE IN CHANGES' 223s + shift 223s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 223s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 223s + echo 'SOURCE IN CHANGES EXISTS' 223s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 223s + local 'desc=DEBS IN CHANGES' 223s + shift 223s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 223s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 223s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 223s + echo 'DEBS IN CHANGES EXISTS' 223s + exec 223s + quirk-clean-fixup 223s + case $cleanmode in 223s + perl -i.unfixed -ne ' 223s print unless 223s $_ eq $last && 223s $_ eq "EXAMPLE RULES TARGET clean\n"; 223s $last = $_; 223s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 223s + '[' success = failure ']' 223s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,indep-arch.results 223s + for branch in $bm_branches 223s + bm-run-one 223s + local 'args= --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch' 223s + bmid='gbp-build -F,dpkg-source,no-check,bad-build-deps' 223s + bmid=gbp-build_-F,dpkg-source,no-check,bad-build-deps 223s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 223s + heading='===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 223s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 223s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.expected 223s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.results 223s + bm-compute-expected 223s + require_fail=unexpect 223s + tolerate_fail=unexpect 223s + exec 223s + echo '===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 223s + local eff_cleanmode=dpkg-source,no-check 223s + case "$e_targets" in 223s + case "$act" in 223s + case $eff_cleanmode in 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 1 223s + tolerate_fail=tolerate 223s + echo 'EXAMPLE RULES TARGET clean' 223s + case $eff_cleanmode in 223s + '[' 'xbuild binary' '!=' x ']' 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 1 223s + tolerate_fail=tolerate 223s + for t in $e_targets 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 1 223s + require_fail=required 223s + echo 'EXAMPLE RULES TARGET build' 223s + for t in $e_targets 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 1 223s + require_fail=required 223s + echo 'EXAMPLE RULES TARGET binary' 223s + bm-report-test 'SOURCE FILE' true 223s + local 'desc=SOURCE FILE' 223s + shift 223s + true 223s + echo 'SOURCE FILE EXISTS' 223s + bm-report-test 'SOURCE IN CHANGES' true 223s + local 'desc=SOURCE IN CHANGES' 223s + shift 223s + true 223s + echo 'SOURCE IN CHANGES EXISTS' 223s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 223s + local 'desc=DEBS IN CHANGES' 223s + shift 223s + expr 'build binary' : '.*binary.*' 223s 12 223s + echo 'DEBS IN CHANGES EXISTS' 223s + exec 223s + git checkout bad-build-deps 223s Switched to branch 'bad-build-deps' 223s + git clean -xdf 223s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 223s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 223s + set +o pipefail 223s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 223s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 223s + local dgit=dgit 223s + pwd 223s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 223s + : ' 223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 223s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch 223s | git rev-parse --show-toplevel 223s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 223s | git config -z --get-regexp --local '.*' 223s | git config -z --get-regexp --local '.*' 223s | git config -z --get-regexp --global '.*' 223s | git config -z --get-regexp --system '.*' 223s format , quilt mode gbp 223s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 223s warning: could not open directory 'debian/source/': No such file or directory 223s => `' 223s + git diff --quiet HEAD 223s massage split -F. 223s massage done 3 -b. 223s format , quilt mode gbp 223s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 223s warning: could not open directory 'debian/source/': No such file or directory 223s => `' 223s + git diff --quiet HEAD 223s 223s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 223s dgit: Have to apply the patches - making the tree dirty. 223s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 223s 223s + dpkg-source --before-build . 223s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 223s dpkg-buildpackage: info: source package example 223s dpkg-buildpackage: info: source version 1.0 223s dpkg-buildpackage: info: source distribution unstable 223s dpkg-buildpackage: info: source changed by Ian Jackson 223s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 223s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 223s dpkg-buildpackage: warning: (Use -d flag to override.) 223s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 223s 223s dgit: error: subprocess failed with error exit status 3 223s + local 'ps=255 0' 223s + set -o pipefail 223s + exec 223s + echo '===== [gbp-build_-F,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -F --git-ignore-branch =====' 223s + case $ps in 223s + actual_status=failure 223s + echo 'OPERATION FAILED' 223s + case "$require_fail-$tolerate_fail-$actual_status" in 223s + echo 'REQUIRED FAILURE' 223s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.output 223s + '[' 1 = 1 ']' 223s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 223s + local 'desc=SOURCE FILE' 223s + shift 223s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 223s + echo 'SOURCE FILE MISSING' 223s + '[' failure = success ']' 223s + exec 223s + quirk-clean-fixup 223s + case $cleanmode in 223s + perl -i.unfixed -ne ' 223s print unless 223s $_ eq $last && 223s $_ eq "EXAMPLE RULES TARGET clean\n"; 223s $last = $_; 223s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source,no-check,bad-build-deps.results 223s + '[' failure = failure ']' 223s + for cleanmode in $cleanmodes 223s + for branch in $bm_branches 223s + bm-run-one 223s + local 'args= --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch' 223s + bmid='gbp-build -F,dpkg-source-d,no-check,indep-arch' 223s + bmid=gbp-build_-F,dpkg-source-d,no-check,indep-arch 223s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 223s + heading='===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 223s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 223s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.expected 223s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 223s + bm-compute-expected 223s + require_fail=unexpect 223s + tolerate_fail=unexpect 223s + exec 223s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 223s + local eff_cleanmode=dpkg-source-d,no-check 223s + case "$e_targets" in 223s + case "$act" in 223s + case $eff_cleanmode in 223s + echo 'EXAMPLE RULES TARGET clean' 223s + case $eff_cleanmode in 223s + '[' 'xbuild binary' '!=' x ']' 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 0 223s + for t in $e_targets 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 0 223s + echo 'EXAMPLE RULES TARGET build' 223s + for t in $e_targets 223s + bm-build-deps-ok 223s + case "$branch" in 223s + return 0 223s + echo 'EXAMPLE RULES TARGET binary' 223s + bm-report-test 'SOURCE FILE' true 223s + local 'desc=SOURCE FILE' 223s + shift 223s + true 223s + echo 'SOURCE FILE EXISTS' 223s + bm-report-test 'SOURCE IN CHANGES' true 223s + local 'desc=SOURCE IN CHANGES' 223s + shift 223s + true 223s + echo 'SOURCE IN CHANGES EXISTS' 223s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 223s + local 'desc=DEBS IN CHANGES' 223s + shift 223s + expr 'build binary' : '.*binary.*' 223s 12 223s + echo 'DEBS IN CHANGES EXISTS' 223s + exec 223s + git checkout indep-arch 223s Switched to branch 'indep-arch' 223s + git clean -xdf 223s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 223s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 223s + set +o pipefail 223s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 223s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 223s + local dgit=dgit 223s + pwd 223s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 223s + : ' 223s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 223s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 223s | git rev-parse --show-toplevel 223s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 223s | git config -z --get-regexp --local '.*' 223s | git config -z --get-regexp --local '.*' 223s | git config -z --get-regexp --global '.*' 223s | git config -z --get-regexp --system '.*' 223s format , quilt mode gbp 223s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 223s warning: could not open directory 'debian/source/': No such file or directory 223s => `' 223s + git diff --quiet HEAD 223s massage split -F. 223s massage done 3 -b. 223s format , quilt mode gbp 223s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 223s warning: could not open directory 'debian/source/': No such file or directory 223s => `' 223s + git diff --quiet HEAD 223s 223s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 223s dgit: Have to apply the patches - making the tree dirty. 223s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 223s 223s + dpkg-source --before-build . 223s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 224s dpkg-buildpackage: info: source package example 224s dpkg-buildpackage: info: source version 1.0 224s dpkg-buildpackage: info: source distribution unstable 224s dpkg-buildpackage: info: source changed by Ian Jackson 224s fakeroot debian/rules clean 224s EXAMPLE RULES TARGET clean 224s dh_clean 224s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 224s | git rev-parse 'HEAD~0' 224s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 224s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 224s CD work 224s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 224s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 224s CD .. 224s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 224s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 224s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 224s dpkg-source: info: using source format '1.0' 224s dpkg-source: info: building example in example_1.0.tar.gz 224s dpkg-source: info: building example in example_1.0.dsc 224s CD work 224s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 224s package seems new, not specifying -v 224s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 224s dpkg-genchanges: info: including full source code in upload 224s CD .. 224s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 224s renaming (Files) example_1.0.tar.gz 224s renaming (dsc) example_1.0.dsc 224s renaming (changes) example_1.0_source.changes 224s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 224s dgit: Unapplying patches again to tidy up the tree. 224s + dpkg-source --after-build . 224s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 224s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 224s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 224s gbp:info: Performing the build 224s dpkg-buildpackage: info: source package example 224s dpkg-buildpackage: info: source version 1.0 224s dpkg-buildpackage: info: source distribution unstable 224s dpkg-buildpackage: info: source changed by Ian Jackson 224s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 224s dpkg-buildpackage: info: host architecture amd64 224s debian/rules build 224s EXAMPLE RULES TARGET build 224s fakeroot debian/rules binary 224s EXAMPLE RULES TARGET binary 224s dh_install 224s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 224s dh_gencontrol 224s dh_builddeb 224s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 224s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 224s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 224s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 224s dpkg-genbuildinfo --build=binary -O../example_1.0_amd64.buildinfo 225s dpkg-genchanges --build=binary -O../example_1.0_amd64.changes 225s dpkg-genchanges: info: binary-only upload (no source code included) 225s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 225s dpkg-buildpackage: info: binary-only upload (no source included) 225s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 225s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 225s dgit ok: build successful, results in example_1.0_multi.changes 225s 225s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 225s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 225s ' 225s + local 'ps=0 0' 225s + set -o pipefail 225s + exec 225s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 225s + case $ps in 225s + actual_status=success 225s + case "$require_fail-$tolerate_fail-$actual_status" in 225s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.output 225s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 225s + local 'desc=SOURCE FILE' 225s + shift 225s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 225s + echo 'SOURCE FILE EXISTS' 225s + '[' success = success ']' 225s + local changes 225s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 225s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 225s + case "$changes" in 225s + perl -ne 'print if m/^files:/i ... m/^\S/' 225s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 225s + local 'desc=SOURCE IN CHANGES' 225s + shift 225s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 225s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 225s + echo 'SOURCE IN CHANGES EXISTS' 225s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 225s + local 'desc=DEBS IN CHANGES' 225s + shift 225s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 225s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 225s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 225s + echo 'DEBS IN CHANGES EXISTS' 225s + exec 225s + quirk-clean-fixup 225s + case $cleanmode in 225s + perl -i.unfixed -ne ' 225s print unless 225s $_ eq $last && 225s $_ eq "EXAMPLE RULES TARGET clean\n"; 225s $last = $_; 225s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 225s + '[' success = failure ']' 225s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,indep-arch.results 225s + for branch in $bm_branches 225s + bm-run-one 225s + local 'args= --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch' 225s + bmid='gbp-build -F,dpkg-source-d,no-check,bad-build-deps' 225s + bmid=gbp-build_-F,dpkg-source-d,no-check,bad-build-deps 225s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 225s + heading='===== [gbp-build_-F,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 225s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 225s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.expected 225s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.results 225s + bm-compute-expected 225s + require_fail=unexpect 225s + tolerate_fail=unexpect 225s + exec 225s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 225s + local eff_cleanmode=dpkg-source-d,no-check 225s + case "$e_targets" in 225s + case "$act" in 225s + case $eff_cleanmode in 225s + echo 'EXAMPLE RULES TARGET clean' 225s + case $eff_cleanmode in 225s + '[' 'xbuild binary' '!=' x ']' 225s + bm-build-deps-ok 225s + case "$branch" in 225s + return 1 225s + tolerate_fail=tolerate 225s + for t in $e_targets 225s + bm-build-deps-ok 225s + case "$branch" in 225s + return 1 225s + require_fail=required 225s + echo 'EXAMPLE RULES TARGET build' 225s + for t in $e_targets 225s + bm-build-deps-ok 225s + case "$branch" in 225s + return 1 225s + require_fail=required 225s + echo 'EXAMPLE RULES TARGET binary' 225s + bm-report-test 'SOURCE FILE' true 225s + local 'desc=SOURCE FILE' 225s + shift 225s + true 225s + echo 'SOURCE FILE EXISTS' 225s + bm-report-test 'SOURCE IN CHANGES' true 225s + local 'desc=SOURCE IN CHANGES' 225s + shift 225s + true 225s + echo 'SOURCE IN CHANGES EXISTS' 225s + bm-report-test 'DEBS IN CHANGES' expr 'build binary' : '.*binary.*' 225s + local 'desc=DEBS IN CHANGES' 225s + shift 225s + expr 'build binary' : '.*binary.*' 225s 12 225s + echo 'DEBS IN CHANGES EXISTS' 225s + exec 225s + git checkout bad-build-deps 225s Switched to branch 'bad-build-deps' 225s + git clean -xdf 225s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 225s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 225s + set +o pipefail 225s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 225s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 225s + local dgit=dgit 225s + pwd 225s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 225s + : ' 225s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 225s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch 225s | git rev-parse --show-toplevel 225s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 225s | git config -z --get-regexp --local '.*' 225s | git config -z --get-regexp --local '.*' 225s | git config -z --get-regexp --global '.*' 225s | git config -z --get-regexp --system '.*' 225s format , quilt mode gbp 225s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 225s warning: could not open directory 'debian/source/': No such file or directory 225s => `' 225s + git diff --quiet HEAD 225s massage split -F. 225s massage done 3 -b. 225s format , quilt mode gbp 225s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 225s warning: could not open directory 'debian/source/': No such file or directory 225s => `' 225s + git diff --quiet HEAD 225s 225s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 225s dgit: Have to apply the patches - making the tree dirty. 225s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 225s 225s + dpkg-source --before-build . 225s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 226s dpkg-buildpackage: info: source package example 226s dpkg-buildpackage: info: source version 1.0 226s dpkg-buildpackage: info: source distribution unstable 226s dpkg-buildpackage: info: source changed by Ian Jackson 226s fakeroot debian/rules clean 226s EXAMPLE RULES TARGET clean 226s dh_clean 226s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 226s | git rev-parse 'HEAD~0' 226s => `d09bc55f43bc5586103335d232c16bd041247bd1' 226s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 226s CD work 226s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 226s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 226s CD .. 226s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 226s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 226s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 226s dpkg-source: info: using source format '1.0' 226s dpkg-source: info: building example in example_1.0.tar.gz 226s dpkg-source: info: building example in example_1.0.dsc 226s CD work 226s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 226s package seems new, not specifying -v 226s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 226s dpkg-genchanges: info: including full source code in upload 226s CD .. 226s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 226s renaming (Files) example_1.0.tar.gz 226s renaming (dsc) example_1.0.dsc 226s renaming (changes) example_1.0_source.changes 226s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 226s dgit: Unapplying patches again to tidy up the tree. 226s + dpkg-source --after-build . 226s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 226s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 226s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 226s gbp:info: Performing the build 226s dpkg-buildpackage: info: source package example 226s dpkg-buildpackage: info: source version 1.0 226s dpkg-buildpackage: info: source distribution unstable 226s dpkg-buildpackage: info: source changed by Ian Jackson 226s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 226s dpkg-buildpackage: info: host architecture amd64 226s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 226s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 226s dpkg-buildpackage: warning: (Use -d flag to override.) 226s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -b -us -uc' failed: it exited with 3 226s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -b' --git-ignore-branch 226s 226s dgit: error: subprocess failed with error exit status 1 226s + local 'ps=255 0' 226s + set -o pipefail 226s + exec 226s + echo '===== [gbp-build_-F,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -F --git-ignore-branch =====' 226s + case $ps in 226s + actual_status=failure 226s + echo 'OPERATION FAILED' 226s + case "$require_fail-$tolerate_fail-$actual_status" in 226s + echo 'REQUIRED FAILURE' 226s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.output 226s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 226s + local 'desc=SOURCE FILE' 226s + shift 226s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 226s + echo 'SOURCE FILE EXISTS' 226s + '[' failure = success ']' 226s + exec 226s + quirk-clean-fixup 226s + case $cleanmode in 226s + perl -i.unfixed -ne ' 226s print unless 226s $_ eq $last && 226s $_ eq "EXAMPLE RULES TARGET clean\n"; 226s $last = $_; 226s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-F,dpkg-source-d,no-check,bad-build-deps.results 226s + '[' failure = failure ']' 226s + : bm-act-iterate done. 226s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 226s + bm-guess-e-source-e-targets 'gbp-build -g' 226s + local 'some_act=gbp-build -g' 226s + case "$some_act" in 226s + e_source=true 226s + e_targets='build-indep binary-indep' 226s + real_act='gbp-build -g --git-ignore-branch' 226s + bm-act-iterate 226s + for cleanmode in $cleanmodes 226s + for branch in $bm_branches 226s + bm-run-one 226s + local 'args= --clean=git gbp-build -g --git-ignore-branch' 226s + bmid='gbp-build -g,git,indep-arch' 226s + bmid=gbp-build_-g,git,indep-arch 226s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 226s + heading='===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 226s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 226s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.expected 226s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.results 226s + bm-compute-expected 226s + require_fail=unexpect 226s + tolerate_fail=unexpect 226s + exec 226s + echo '===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 226s + local eff_cleanmode=git 226s + case "$e_targets" in 226s + case "$act" in 226s + case $eff_cleanmode in 226s + echo 'BUILD-MODES PROGRAM git clean -xdf' 226s + case $eff_cleanmode in 226s + '[' 'xbuild-indep binary-indep' '!=' x ']' 226s + bm-build-deps-ok 226s + case "$branch" in 226s + return 0 226s + for t in $e_targets 226s + bm-build-deps-ok 226s + case "$branch" in 226s + return 0 226s + echo 'EXAMPLE RULES TARGET build-indep' 226s + for t in $e_targets 226s + bm-build-deps-ok 226s + case "$branch" in 226s + return 0 226s + echo 'EXAMPLE RULES TARGET binary-indep' 226s + bm-report-test 'SOURCE FILE' true 226s + local 'desc=SOURCE FILE' 226s + shift 226s + true 226s + echo 'SOURCE FILE EXISTS' 226s + bm-report-test 'SOURCE IN CHANGES' true 226s + local 'desc=SOURCE IN CHANGES' 226s + shift 226s + true 226s + echo 'SOURCE IN CHANGES EXISTS' 226s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 226s + local 'desc=DEBS IN CHANGES' 226s + shift 226s + expr 'build-indep binary-indep' : '.*binary.*' 226s 24 226s + echo 'DEBS IN CHANGES EXISTS' 226s + exec 226s + git checkout indep-arch 226s Switched to branch 'indep-arch' 226s + git clean -xdf 226s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 226s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 226s + set +o pipefail 226s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 226s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 226s + local dgit=dgit 226s + pwd 226s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 226s + : ' 226s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 226s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 226s | git rev-parse --show-toplevel 226s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 226s | git config -z --get-regexp --local '.*' 226s | git config -z --get-regexp --local '.*' 226s | git config -z --get-regexp --global '.*' 226s | git config -z --get-regexp --system '.*' 226s format , quilt mode gbp 226s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 226s warning: could not open directory 'debian/source/': No such file or directory 226s => `' 226s + git diff --quiet HEAD 226s massage split -g. 226s massage done 3 -A. 226s format , quilt mode gbp 226s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 226s warning: could not open directory 'debian/source/': No such file or directory 226s => `' 226s + git diff --quiet HEAD 226s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 226s BUILD-MODES PROGRAM git clean -xdf 226s | git rev-parse 'HEAD~0' 226s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 226s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 226s CD work 226s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 226s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 226s CD .. 226s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 227s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 227s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 227s dpkg-source: info: using source format '1.0' 227s dpkg-source: info: building example in example_1.0.tar.gz 227s dpkg-source: info: building example in example_1.0.dsc 227s CD work 227s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 227s package seems new, not specifying -v 227s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 227s dpkg-genchanges: info: including full source code in upload 227s CD .. 227s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 227s renaming (Files) example_1.0.tar.gz 227s renaming (dsc) example_1.0.dsc 227s renaming (changes) example_1.0_source.changes 227s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 227s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 227s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 227s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 227s gbp:info: Performing the build 227s dpkg-buildpackage: info: source package example 227s dpkg-buildpackage: info: source version 1.0 227s dpkg-buildpackage: info: source distribution unstable 227s dpkg-buildpackage: info: source changed by Ian Jackson 227s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 227s debian/rules build-indep 227s EXAMPLE RULES TARGET build-indep 227s fakeroot debian/rules binary-indep 227s EXAMPLE RULES TARGET binary-indep 227s dh_install 227s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 227s dh_gencontrol 227s dh_builddeb 227s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 227s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 227s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 227s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 227s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 227s dpkg-genchanges --build=all -O../example_1.0_all.changes 227s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 227s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 227s dpkg-buildpackage: info: binary-only upload (no source included) 227s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 227s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 228s dgit ok: build successful, results in example_1.0_multi.changes 228s 228s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 228s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 228s ' 228s + local 'ps=0 0' 228s + set -o pipefail 228s + exec 228s + echo '===== [gbp-build_-g,git,indep-arch] dgit --clean=git gbp-build -g --git-ignore-branch =====' 228s + case $ps in 228s + actual_status=success 228s + case "$require_fail-$tolerate_fail-$actual_status" in 228s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.output 228s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 228s + local 'desc=SOURCE FILE' 228s + shift 228s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 228s + echo 'SOURCE FILE EXISTS' 228s + '[' success = success ']' 228s + local changes 228s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 228s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 228s + case "$changes" in 228s + perl -ne 'print if m/^files:/i ... m/^\S/' 228s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 228s + local 'desc=SOURCE IN CHANGES' 228s + shift 228s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 228s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 228s + echo 'SOURCE IN CHANGES EXISTS' 228s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 228s + local 'desc=DEBS IN CHANGES' 228s + shift 228s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 228s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 228s + echo 'DEBS IN CHANGES EXISTS' 228s + exec 228s + quirk-clean-fixup 228s + case $cleanmode in 228s + '[' success = failure ']' 228s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,indep-arch.results 228s + for branch in $bm_branches 228s + bm-run-one 228s + local 'args= --clean=git gbp-build -g --git-ignore-branch' 228s + bmid='gbp-build -g,git,bad-build-deps' 228s + bmid=gbp-build_-g,git,bad-build-deps 228s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 228s + heading='===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 228s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 228s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.expected 228s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.results 228s + bm-compute-expected 228s + require_fail=unexpect 228s + tolerate_fail=unexpect 228s + exec 228s + echo '===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 228s + local eff_cleanmode=git 228s + case "$e_targets" in 228s + case "$act" in 228s + case $eff_cleanmode in 228s + echo 'BUILD-MODES PROGRAM git clean -xdf' 228s + case $eff_cleanmode in 228s + '[' 'xbuild-indep binary-indep' '!=' x ']' 228s + bm-build-deps-ok 228s + case "$branch" in 228s + return 1 228s + tolerate_fail=tolerate 228s + for t in $e_targets 228s + bm-build-deps-ok 228s + case "$branch" in 228s + return 1 228s + require_fail=required 228s + echo 'EXAMPLE RULES TARGET build-indep' 228s + for t in $e_targets 228s + bm-build-deps-ok 228s + case "$branch" in 228s + return 1 228s + require_fail=required 228s + echo 'EXAMPLE RULES TARGET binary-indep' 228s + bm-report-test 'SOURCE FILE' true 228s + local 'desc=SOURCE FILE' 228s + shift 228s + true 228s + echo 'SOURCE FILE EXISTS' 228s + bm-report-test 'SOURCE IN CHANGES' true 228s + local 'desc=SOURCE IN CHANGES' 228s + shift 228s + true 228s + echo 'SOURCE IN CHANGES EXISTS' 228s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 228s + local 'desc=DEBS IN CHANGES' 228s + shift 228s + expr 'build-indep binary-indep' : '.*binary.*' 228s 24 228s + echo 'DEBS IN CHANGES EXISTS' 228s + exec 228s + git checkout bad-build-deps 228s Switched to branch 'bad-build-deps' 228s + git clean -xdf 228s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 228s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 228s + set +o pipefail 228s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 228s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 228s + local dgit=dgit 228s + pwd 228s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 228s + : ' 228s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 228s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -g --git-ignore-branch 228s | git rev-parse --show-toplevel 228s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 228s | git config -z --get-regexp --local '.*' 228s | git config -z --get-regexp --local '.*' 228s | git config -z --get-regexp --global '.*' 228s | git config -z --get-regexp --system '.*' 228s format , quilt mode gbp 228s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 228s warning: could not open directory 'debian/source/': No such file or directory 228s => `' 228s + git diff --quiet HEAD 228s massage split -g. 228s massage done 3 -A. 228s format , quilt mode gbp 228s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 228s warning: could not open directory 'debian/source/': No such file or directory 228s => `' 228s + git diff --quiet HEAD 228s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 228s BUILD-MODES PROGRAM git clean -xdf 228s | git rev-parse 'HEAD~0' 228s => `d09bc55f43bc5586103335d232c16bd041247bd1' 228s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 228s CD work 228s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 228s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 228s CD .. 228s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 228s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 228s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 228s dpkg-source: info: using source format '1.0' 228s dpkg-source: info: building example in example_1.0.tar.gz 228s dpkg-source: info: building example in example_1.0.dsc 228s CD work 228s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 228s package seems new, not specifying -v 228s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 228s dpkg-genchanges: info: including full source code in upload 228s CD .. 228s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 228s renaming (Files) example_1.0.tar.gz 228s renaming (dsc) example_1.0.dsc 228s renaming (changes) example_1.0_source.changes 228s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 228s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 228s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 228s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 228s gbp:info: Performing the build 228s dpkg-buildpackage: info: source package example 228s dpkg-buildpackage: info: source version 1.0 228s dpkg-buildpackage: info: source distribution unstable 228s dpkg-buildpackage: info: source changed by Ian Jackson 228s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 229s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 229s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 229s dpkg-buildpackage: warning: (Use -d flag to override.) 229s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 229s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 229s 229s dgit: error: subprocess failed with error exit status 1 229s + local 'ps=255 0' 229s + set -o pipefail 229s + exec 229s + echo '===== [gbp-build_-g,git,bad-build-deps] dgit --clean=git gbp-build -g --git-ignore-branch =====' 229s + case $ps in 229s + actual_status=failure 229s + echo 'OPERATION FAILED' 229s + case "$require_fail-$tolerate_fail-$actual_status" in 229s + echo 'REQUIRED FAILURE' 229s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,git,bad-build-deps.output 229s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 229s + local 'desc=SOURCE FILE' 229s + shift 229s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 229s + echo 'SOURCE FILE EXISTS' 229s + '[' failure = success ']' 229s + exec 229s + quirk-clean-fixup 229s + case $cleanmode in 229s + '[' failure = failure ']' 229s + for cleanmode in $cleanmodes 229s + for branch in $bm_branches 229s + bm-run-one 229s + local 'args= --clean=none gbp-build -g --git-ignore-branch' 229s + bmid='gbp-build -g,none,indep-arch' 229s + bmid=gbp-build_-g,none,indep-arch 229s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 229s + heading='===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 229s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 229s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.expected 229s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.results 229s + bm-compute-expected 229s + require_fail=unexpect 229s + tolerate_fail=unexpect 229s + exec 229s + echo '===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 229s + local eff_cleanmode=none 229s + case "$e_targets" in 229s + case "$act" in 229s + case $eff_cleanmode in 229s + case $eff_cleanmode in 229s + '[' 'xbuild-indep binary-indep' '!=' x ']' 229s + bm-build-deps-ok 229s + case "$branch" in 229s + return 0 229s + for t in $e_targets 229s + bm-build-deps-ok 229s + case "$branch" in 229s + return 0 229s + echo 'EXAMPLE RULES TARGET build-indep' 229s + for t in $e_targets 229s + bm-build-deps-ok 229s + case "$branch" in 229s + return 0 229s + echo 'EXAMPLE RULES TARGET binary-indep' 229s + bm-report-test 'SOURCE FILE' true 229s + local 'desc=SOURCE FILE' 229s + shift 229s + true 229s + echo 'SOURCE FILE EXISTS' 229s + bm-report-test 'SOURCE IN CHANGES' true 229s + local 'desc=SOURCE IN CHANGES' 229s + shift 229s + true 229s + echo 'SOURCE IN CHANGES EXISTS' 229s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 229s + local 'desc=DEBS IN CHANGES' 229s + shift 229s + expr 'build-indep binary-indep' : '.*binary.*' 229s 24 229s + echo 'DEBS IN CHANGES EXISTS' 229s + exec 229s + git checkout indep-arch 229s Switched to branch 'indep-arch' 229s + git clean -xdf 229s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 229s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 229s + set +o pipefail 229s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 229s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 229s + local dgit=dgit 229s + pwd 229s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 229s + : ' 229s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 229s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 229s | git rev-parse --show-toplevel 229s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 229s | git config -z --get-regexp --local '.*' 229s | git config -z --get-regexp --local '.*' 229s | git config -z --get-regexp --global '.*' 229s | git config -z --get-regexp --system '.*' 229s format , quilt mode gbp 229s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 229s warning: could not open directory 'debian/source/': No such file or directory 229s => `' 229s + git diff --quiet HEAD 229s massage split -g. 229s massage done 3 -A. 229s format , quilt mode gbp 229s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 229s warning: could not open directory 'debian/source/': No such file or directory 229s => `' 229s + git diff --quiet HEAD 229s | git rev-parse 'HEAD~0' 229s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 229s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 229s CD work 229s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 229s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 229s CD .. 229s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 229s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 229s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 229s dpkg-source: info: using source format '1.0' 229s dpkg-source: info: building example in example_1.0.tar.gz 229s dpkg-source: info: building example in example_1.0.dsc 229s CD work 229s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 229s package seems new, not specifying -v 229s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 229s dpkg-genchanges: info: including full source code in upload 229s CD .. 229s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 229s renaming (Files) example_1.0.tar.gz 229s renaming (dsc) example_1.0.dsc 229s renaming (changes) example_1.0_source.changes 229s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 229s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 229s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 229s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 229s gbp:info: Performing the build 229s dpkg-buildpackage: info: source package example 229s dpkg-buildpackage: info: source version 1.0 229s dpkg-buildpackage: info: source distribution unstable 229s dpkg-buildpackage: info: source changed by Ian Jackson 229s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 229s debian/rules build-indep 229s EXAMPLE RULES TARGET build-indep 229s fakeroot debian/rules binary-indep 229s EXAMPLE RULES TARGET binary-indep 229s dh_install 229s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 229s dh_gencontrol 229s dh_builddeb 229s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 229s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 229s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 229s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 230s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 230s dpkg-genchanges --build=all -O../example_1.0_all.changes 230s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 230s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 230s dpkg-buildpackage: info: binary-only upload (no source included) 230s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 230s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 230s dgit ok: build successful, results in example_1.0_multi.changes 230s 230s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 230s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 230s ' 230s + local 'ps=0 0' 230s + set -o pipefail 230s + exec 230s + echo '===== [gbp-build_-g,none,indep-arch] dgit --clean=none gbp-build -g --git-ignore-branch =====' 230s + case $ps in 230s + actual_status=success 230s + case "$require_fail-$tolerate_fail-$actual_status" in 230s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.output 230s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 230s + local 'desc=SOURCE FILE' 230s + shift 230s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 230s + echo 'SOURCE FILE EXISTS' 230s + '[' success = success ']' 230s + local changes 230s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 230s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 230s + case "$changes" in 230s + perl -ne 'print if m/^files:/i ... m/^\S/' 230s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 230s + local 'desc=SOURCE IN CHANGES' 230s + shift 230s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 230s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 230s + echo 'SOURCE IN CHANGES EXISTS' 230s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 230s + local 'desc=DEBS IN CHANGES' 230s + shift 230s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 230s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 230s + echo 'DEBS IN CHANGES EXISTS' 230s + exec 230s + quirk-clean-fixup 230s + case $cleanmode in 230s + '[' success = failure ']' 230s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,indep-arch.results 230s + for branch in $bm_branches 230s + bm-run-one 230s + local 'args= --clean=none gbp-build -g --git-ignore-branch' 230s + bmid='gbp-build -g,none,bad-build-deps' 230s + bmid=gbp-build_-g,none,bad-build-deps 230s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 230s + heading='===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 230s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 230s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.expected 230s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.results 230s + bm-compute-expected 230s + require_fail=unexpect 230s + tolerate_fail=unexpect 230s + exec 230s + echo '===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 230s + local eff_cleanmode=none 230s + case "$e_targets" in 230s + case "$act" in 230s + case $eff_cleanmode in 230s + case $eff_cleanmode in 230s + '[' 'xbuild-indep binary-indep' '!=' x ']' 230s + bm-build-deps-ok 230s + case "$branch" in 230s + return 1 230s + tolerate_fail=tolerate 230s + for t in $e_targets 230s + bm-build-deps-ok 230s + case "$branch" in 230s + return 1 230s + require_fail=required 230s + echo 'EXAMPLE RULES TARGET build-indep' 230s + for t in $e_targets 230s + bm-build-deps-ok 230s + case "$branch" in 230s + return 1 230s + require_fail=required 230s + echo 'EXAMPLE RULES TARGET binary-indep' 230s + bm-report-test 'SOURCE FILE' true 230s + local 'desc=SOURCE FILE' 230s + shift 230s + true 230s + echo 'SOURCE FILE EXISTS' 230s + bm-report-test 'SOURCE IN CHANGES' true 230s + local 'desc=SOURCE IN CHANGES' 230s + shift 230s + true 230s + echo 'SOURCE IN CHANGES EXISTS' 230s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 230s + local 'desc=DEBS IN CHANGES' 230s + shift 230s + expr 'build-indep binary-indep' : '.*binary.*' 230s 24 230s + echo 'DEBS IN CHANGES EXISTS' 230s + exec 230s + git checkout bad-build-deps 230s Switched to branch 'bad-build-deps' 230s + git clean -xdf 230s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 230s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 230s + set +o pipefail 230s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 230s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 230s + local dgit=dgit 230s + pwd 230s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 230s + : ' 230s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 230s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -g --git-ignore-branch 230s | git rev-parse --show-toplevel 230s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 230s | git config -z --get-regexp --local '.*' 230s | git config -z --get-regexp --local '.*' 230s | git config -z --get-regexp --global '.*' 230s | git config -z --get-regexp --system '.*' 230s format , quilt mode gbp 230s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 230s warning: could not open directory 'debian/source/': No such file or directory 230s => `' 230s + git diff --quiet HEAD 230s massage split -g. 230s massage done 3 -A. 230s format , quilt mode gbp 230s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 230s warning: could not open directory 'debian/source/': No such file or directory 230s => `' 230s + git diff --quiet HEAD 230s | git rev-parse 'HEAD~0' 230s => `d09bc55f43bc5586103335d232c16bd041247bd1' 230s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 230s CD work 230s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 230s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 230s CD .. 230s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 231s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 231s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 231s dpkg-source: info: using source format '1.0' 231s dpkg-source: info: building example in example_1.0.tar.gz 231s dpkg-source: info: building example in example_1.0.dsc 231s CD work 231s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 231s package seems new, not specifying -v 231s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 231s dpkg-genchanges: info: including full source code in upload 231s CD .. 231s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 231s renaming (Files) example_1.0.tar.gz 231s renaming (dsc) example_1.0.dsc 231s renaming (changes) example_1.0_source.changes 231s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 231s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 231s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 231s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 231s gbp:info: Performing the build 231s dpkg-buildpackage: info: source package example 231s dpkg-buildpackage: info: source version 1.0 231s dpkg-buildpackage: info: source distribution unstable 231s dpkg-buildpackage: info: source changed by Ian Jackson 231s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 231s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 231s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 231s dpkg-buildpackage: warning: (Use -d flag to override.) 231s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 231s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 231s 231s dgit: error: subprocess failed with error exit status 1 231s + local 'ps=255 0' 231s + set -o pipefail 231s + exec 231s + echo '===== [gbp-build_-g,none,bad-build-deps] dgit --clean=none gbp-build -g --git-ignore-branch =====' 231s + case $ps in 231s + actual_status=failure 231s + echo 'OPERATION FAILED' 231s + case "$require_fail-$tolerate_fail-$actual_status" in 231s + echo 'REQUIRED FAILURE' 231s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,none,bad-build-deps.output 231s + '[' 1 = 1 ']' 231s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 231s + local 'desc=SOURCE FILE' 231s + shift 231s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 231s + echo 'SOURCE FILE EXISTS' 231s + '[' failure = success ']' 231s + exec 231s + quirk-clean-fixup 231s + case $cleanmode in 231s + '[' failure = failure ']' 231s + for cleanmode in $cleanmodes 231s + for branch in $bm_branches 231s + bm-run-one 231s + local 'args= --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch' 231s + bmid='gbp-build -g,dpkg-source,no-check,indep-arch' 231s + bmid=gbp-build_-g,dpkg-source,no-check,indep-arch 231s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 231s + heading='===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 231s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 231s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.expected 231s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 231s + bm-compute-expected 231s + require_fail=unexpect 231s + tolerate_fail=unexpect 231s + exec 231s + echo '===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 231s + local eff_cleanmode=dpkg-source,no-check 231s + case "$e_targets" in 231s + case "$act" in 231s + case $eff_cleanmode in 231s + bm-build-deps-ok 231s + case "$branch" in 231s + return 0 231s + echo 'EXAMPLE RULES TARGET clean' 231s + case $eff_cleanmode in 231s + '[' 'xbuild-indep binary-indep' '!=' x ']' 231s + bm-build-deps-ok 231s + case "$branch" in 231s + return 0 231s + for t in $e_targets 231s + bm-build-deps-ok 231s + case "$branch" in 231s + return 0 231s + echo 'EXAMPLE RULES TARGET build-indep' 231s + for t in $e_targets 231s + bm-build-deps-ok 231s + case "$branch" in 231s + return 0 231s + echo 'EXAMPLE RULES TARGET binary-indep' 231s + bm-report-test 'SOURCE FILE' true 231s + local 'desc=SOURCE FILE' 231s + shift 231s + true 231s + echo 'SOURCE FILE EXISTS' 231s + bm-report-test 'SOURCE IN CHANGES' true 231s + local 'desc=SOURCE IN CHANGES' 231s + shift 231s + true 231s + echo 'SOURCE IN CHANGES EXISTS' 231s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 231s + local 'desc=DEBS IN CHANGES' 231s + shift 231s + expr 'build-indep binary-indep' : '.*binary.*' 231s 24 231s + echo 'DEBS IN CHANGES EXISTS' 231s + exec 231s + git checkout indep-arch 231s Switched to branch 'indep-arch' 231s + git clean -xdf 231s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 231s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 231s + set +o pipefail 231s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 231s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 231s + local dgit=dgit 231s + pwd 231s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 231s + : ' 231s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 231s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 231s | git rev-parse --show-toplevel 231s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 231s | git config -z --get-regexp --local '.*' 231s | git config -z --get-regexp --local '.*' 231s | git config -z --get-regexp --global '.*' 231s | git config -z --get-regexp --system '.*' 231s format , quilt mode gbp 231s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 231s warning: could not open directory 'debian/source/': No such file or directory 231s => `' 231s + git diff --quiet HEAD 231s massage split -g. 231s massage done 3 -A. 231s format , quilt mode gbp 231s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 231s warning: could not open directory 'debian/source/': No such file or directory 231s => `' 231s + git diff --quiet HEAD 231s 231s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 231s dgit: Have to apply the patches - making the tree dirty. 231s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 231s 231s + dpkg-source --before-build . 231s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 231s dpkg-buildpackage: info: source package example 231s dpkg-buildpackage: info: source version 1.0 231s dpkg-buildpackage: info: source distribution unstable 231s dpkg-buildpackage: info: source changed by Ian Jackson 231s fakeroot debian/rules clean 231s EXAMPLE RULES TARGET clean 231s dh_clean 231s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 231s | git rev-parse 'HEAD~0' 231s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 231s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 231s CD work 231s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 231s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 231s CD .. 231s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 231s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 232s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 232s dpkg-source: info: using source format '1.0' 232s dpkg-source: info: building example in example_1.0.tar.gz 232s dpkg-source: info: building example in example_1.0.dsc 232s CD work 232s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 232s package seems new, not specifying -v 232s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 232s dpkg-genchanges: info: including full source code in upload 232s CD .. 232s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 232s renaming (Files) example_1.0.tar.gz 232s renaming (dsc) example_1.0.dsc 232s renaming (changes) example_1.0_source.changes 232s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 232s dgit: Unapplying patches again to tidy up the tree. 232s + dpkg-source --after-build . 232s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 232s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 232s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 232s gbp:info: Performing the build 232s dpkg-buildpackage: info: source package example 232s dpkg-buildpackage: info: source version 1.0 232s dpkg-buildpackage: info: source distribution unstable 232s dpkg-buildpackage: info: source changed by Ian Jackson 232s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 232s debian/rules build-indep 232s EXAMPLE RULES TARGET build-indep 232s fakeroot debian/rules binary-indep 232s EXAMPLE RULES TARGET binary-indep 232s dh_install 232s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 232s dh_gencontrol 232s dh_builddeb 232s + + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 232s exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 232s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 232s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 232s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 232s dpkg-genchanges --build=all -O../example_1.0_all.changes 232s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 232s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 232s dpkg-buildpackage: info: binary-only upload (no source included) 232s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 232s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 233s dgit ok: build successful, results in example_1.0_multi.changes 233s 233s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 233s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 233s ' 233s + local 'ps=0 0' 233s + set -o pipefail 233s + exec 233s + echo '===== [gbp-build_-g,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 233s + case $ps in 233s + actual_status=success 233s + case "$require_fail-$tolerate_fail-$actual_status" in 233s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.output 233s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 233s + local 'desc=SOURCE FILE' 233s + shift 233s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 233s + echo 'SOURCE FILE EXISTS' 233s + '[' success = success ']' 233s + local changes 233s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 233s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 233s + case "$changes" in 233s + perl -ne 'print if m/^files:/i ... m/^\S/' 233s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 233s + local 'desc=SOURCE IN CHANGES' 233s + shift 233s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 233s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 233s + echo 'SOURCE IN CHANGES EXISTS' 233s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 233s + local 'desc=DEBS IN CHANGES' 233s + shift 233s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 233s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 233s + echo 'DEBS IN CHANGES EXISTS' 233s + exec 233s + quirk-clean-fixup 233s + case $cleanmode in 233s + perl -i.unfixed -ne ' 233s print unless 233s $_ eq $last && 233s $_ eq "EXAMPLE RULES TARGET clean\n"; 233s $last = $_; 233s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 233s + '[' success = failure ']' 233s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,indep-arch.results 233s + for branch in $bm_branches 233s + bm-run-one 233s + local 'args= --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch' 233s + bmid='gbp-build -g,dpkg-source,no-check,bad-build-deps' 233s + bmid=gbp-build_-g,dpkg-source,no-check,bad-build-deps 233s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 233s + heading='===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 233s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 233s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.expected 233s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.results 233s + bm-compute-expected 233s + require_fail=unexpect 233s + tolerate_fail=unexpect 233s + exec 233s + echo '===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 233s + local eff_cleanmode=dpkg-source,no-check 233s + case "$e_targets" in 233s + case "$act" in 233s + case $eff_cleanmode in 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 1 233s + tolerate_fail=tolerate 233s + echo 'EXAMPLE RULES TARGET clean' 233s + case $eff_cleanmode in 233s + '[' 'xbuild-indep binary-indep' '!=' x ']' 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 1 233s + tolerate_fail=tolerate 233s + for t in $e_targets 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 1 233s + require_fail=required 233s + echo 'EXAMPLE RULES TARGET build-indep' 233s + for t in $e_targets 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 1 233s + require_fail=required 233s + echo 'EXAMPLE RULES TARGET binary-indep' 233s + bm-report-test 'SOURCE FILE' true 233s + local 'desc=SOURCE FILE' 233s + shift 233s + true 233s + echo 'SOURCE FILE EXISTS' 233s + bm-report-test 'SOURCE IN CHANGES' true 233s + local 'desc=SOURCE IN CHANGES' 233s + shift 233s + true 233s + echo 'SOURCE IN CHANGES EXISTS' 233s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 233s + local 'desc=DEBS IN CHANGES' 233s + shift 233s + expr 'build-indep binary-indep' : '.*binary.*' 233s 24 233s + echo 'DEBS IN CHANGES EXISTS' 233s + exec 233s + git checkout bad-build-deps 233s Switched to branch 'bad-build-deps' 233s + git clean -xdf 233s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 233s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 233s + set +o pipefail 233s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 233s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 233s + local dgit=dgit 233s + pwd 233s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 233s + : ' 233s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 233s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch 233s | git rev-parse --show-toplevel 233s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 233s | git config -z --get-regexp --local '.*' 233s | git config -z --get-regexp --local '.*' 233s | git config -z --get-regexp --global '.*' 233s | git config -z --get-regexp --system '.*' 233s format , quilt mode gbp 233s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 233s warning: could not open directory 'debian/source/': No such file or directory 233s => `' 233s + git diff --quiet HEAD 233s massage split -g. 233s massage done 3 -A. 233s format , quilt mode gbp 233s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 233s warning: could not open directory 'debian/source/': No such file or directory 233s => `' 233s + git diff --quiet HEAD 233s 233s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 233s dgit: Have to apply the patches - making the tree dirty. 233s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 233s 233s + dpkg-source --before-build . 233s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 233s dpkg-buildpackage: info: source package example 233s dpkg-buildpackage: info: source version 1.0 233s dpkg-buildpackage: info: source distribution unstable 233s dpkg-buildpackage: info: source changed by Ian Jackson 233s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 233s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 233s dpkg-buildpackage: warning: (Use -d flag to override.) 233s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 233s 233s dgit: error: subprocess failed with error exit status 3 233s + local 'ps=255 0' 233s + set -o pipefail 233s + exec 233s + echo '===== [gbp-build_-g,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -g --git-ignore-branch =====' 233s + case $ps in 233s + actual_status=failure 233s + echo 'OPERATION FAILED' 233s + case "$require_fail-$tolerate_fail-$actual_status" in 233s + echo 'REQUIRED FAILURE' 233s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.output 233s + '[' 1 = 1 ']' 233s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 233s + local 'desc=SOURCE FILE' 233s + shift 233s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 233s + echo 'SOURCE FILE MISSING' 233s + '[' failure = success ']' 233s + exec 233s + quirk-clean-fixup 233s + case $cleanmode in 233s + perl -i.unfixed -ne ' 233s print unless 233s $_ eq $last && 233s $_ eq "EXAMPLE RULES TARGET clean\n"; 233s $last = $_; 233s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source,no-check,bad-build-deps.results 233s + '[' failure = failure ']' 233s + for cleanmode in $cleanmodes 233s + for branch in $bm_branches 233s + bm-run-one 233s + local 'args= --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch' 233s + bmid='gbp-build -g,dpkg-source-d,no-check,indep-arch' 233s + bmid=gbp-build_-g,dpkg-source-d,no-check,indep-arch 233s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 233s + heading='===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 233s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 233s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.expected 233s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 233s + bm-compute-expected 233s + require_fail=unexpect 233s + tolerate_fail=unexpect 233s + exec 233s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 233s + local eff_cleanmode=dpkg-source-d,no-check 233s + case "$e_targets" in 233s + case "$act" in 233s + case $eff_cleanmode in 233s + echo 'EXAMPLE RULES TARGET clean' 233s + case $eff_cleanmode in 233s + '[' 'xbuild-indep binary-indep' '!=' x ']' 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 0 233s + for t in $e_targets 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 0 233s + echo 'EXAMPLE RULES TARGET build-indep' 233s + for t in $e_targets 233s + bm-build-deps-ok 233s + case "$branch" in 233s + return 0 233s + echo 'EXAMPLE RULES TARGET binary-indep' 233s + bm-report-test 'SOURCE FILE' true 233s + local 'desc=SOURCE FILE' 233s + shift 233s + true 233s + echo 'SOURCE FILE EXISTS' 233s + bm-report-test 'SOURCE IN CHANGES' true 233s + local 'desc=SOURCE IN CHANGES' 233s + shift 233s + true 233s + echo 'SOURCE IN CHANGES EXISTS' 233s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 233s + local 'desc=DEBS IN CHANGES' 233s + shift 233s + expr 'build-indep binary-indep' : '.*binary.*' 233s 24 233s + echo 'DEBS IN CHANGES EXISTS' 233s + exec 233s + git checkout indep-arch 233s Switched to branch 'indep-arch' 233s + git clean -xdf 233s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 233s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 233s + set +o pipefail 233s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 233s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 233s + local dgit=dgit 233s + pwd 233s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 233s + : ' 233s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 233s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 233s | git rev-parse --show-toplevel 233s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 233s | git config -z --get-regexp --local '.*' 233s | git config -z --get-regexp --local '.*' 233s | git config -z --get-regexp --global '.*' 233s | git config -z --get-regexp --system '.*' 233s format , quilt mode gbp 233s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 233s warning: could not open directory 'debian/source/': No such file or directory 233s => `' 233s + git diff --quiet HEAD 233s massage split -g. 233s massage done 3 -A. 233s format , quilt mode gbp 233s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 233s warning: could not open directory 'debian/source/': No such file or directory 233s => `' 233s + git diff --quiet HEAD 233s 233s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 233s dgit: Have to apply the patches - making the tree dirty. 233s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 233s 233s + dpkg-source --before-build . 234s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 234s dpkg-buildpackage: info: source package example 234s dpkg-buildpackage: info: source version 1.0 234s dpkg-buildpackage: info: source distribution unstable 234s dpkg-buildpackage: info: source changed by Ian Jackson 234s fakeroot debian/rules clean 234s EXAMPLE RULES TARGET clean 234s dh_clean 234s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 234s | git rev-parse 'HEAD~0' 234s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 234s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 234s CD work 234s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 234s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 234s CD .. 234s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 234s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 234s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 234s dpkg-source: info: using source format '1.0' 234s dpkg-source: info: building example in example_1.0.tar.gz 234s dpkg-source: info: building example in example_1.0.dsc 234s CD work 234s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 234s package seems new, not specifying -v 234s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 234s dpkg-genchanges: info: including full source code in upload 234s CD .. 234s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 234s renaming (Files) example_1.0.tar.gz 234s renaming (dsc) example_1.0.dsc 234s renaming (changes) example_1.0_source.changes 234s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 234s dgit: Unapplying patches again to tidy up the tree. 234s + dpkg-source --after-build . 234s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 234s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 234s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 234s gbp:info: Performing the build 234s dpkg-buildpackage: info: source package example 234s dpkg-buildpackage: info: source version 1.0 234s dpkg-buildpackage: info: source distribution unstable 234s dpkg-buildpackage: info: source changed by Ian Jackson 234s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 234s debian/rules build-indep 234s EXAMPLE RULES TARGET build-indep 234s fakeroot debian/rules binary-indep 234s EXAMPLE RULES TARGET binary-indep 234s dh_install 234s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 234s dh_gencontrol 234s dh_builddeb 234s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 234s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 234s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 234s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 234s dpkg-genbuildinfo --build=all -O../example_1.0_all.buildinfo 235s dpkg-genchanges --build=all -O../example_1.0_all.changes 235s dpkg-genchanges: info: binary-only arch-indep upload (source code and arch-specific packages not included) 235s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 235s dpkg-buildpackage: info: binary-only upload (no source included) 235s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 235s + mergechanges -f example_1.0_source.changes example_1.0_all.changes 235s dgit ok: build successful, results in example_1.0_multi.changes 235s 235s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 235s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 235s ' 235s + local 'ps=0 0' 235s + set -o pipefail 235s + exec 235s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 235s + case $ps in 235s + actual_status=success 235s + case "$require_fail-$tolerate_fail-$actual_status" in 235s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.output 235s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 235s + local 'desc=SOURCE FILE' 235s + shift 235s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 235s + echo 'SOURCE FILE EXISTS' 235s + '[' success = success ']' 235s + local changes 235s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 235s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 235s + case "$changes" in 235s + perl -ne 'print if m/^files:/i ... m/^\S/' 235s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 235s + local 'desc=SOURCE IN CHANGES' 235s + shift 235s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 235s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 235s + echo 'SOURCE IN CHANGES EXISTS' 235s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 235s + local 'desc=DEBS IN CHANGES' 235s + shift 235s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 235s 5d1208db9d81bb80db9a265e36ef793a 20672 devel extra example-indep_1.0_all.deb 235s + echo 'DEBS IN CHANGES EXISTS' 235s + exec 235s + quirk-clean-fixup 235s + case $cleanmode in 235s + perl -i.unfixed -ne ' 235s print unless 235s $_ eq $last && 235s $_ eq "EXAMPLE RULES TARGET clean\n"; 235s $last = $_; 235s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 235s + '[' success = failure ']' 235s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,indep-arch.results 235s + for branch in $bm_branches 235s + bm-run-one 235s + local 'args= --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch' 235s + bmid='gbp-build -g,dpkg-source-d,no-check,bad-build-deps' 235s + bmid=gbp-build_-g,dpkg-source-d,no-check,bad-build-deps 235s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 235s + heading='===== [gbp-build_-g,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 235s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 235s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.expected 235s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.results 235s + bm-compute-expected 235s + require_fail=unexpect 235s + tolerate_fail=unexpect 235s + exec 235s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 235s + local eff_cleanmode=dpkg-source-d,no-check 235s + case "$e_targets" in 235s + case "$act" in 235s + case $eff_cleanmode in 235s + echo 'EXAMPLE RULES TARGET clean' 235s + case $eff_cleanmode in 235s + '[' 'xbuild-indep binary-indep' '!=' x ']' 235s + bm-build-deps-ok 235s + case "$branch" in 235s + return 1 235s + tolerate_fail=tolerate 235s + for t in $e_targets 235s + bm-build-deps-ok 235s + case "$branch" in 235s + return 1 235s + require_fail=required 235s + echo 'EXAMPLE RULES TARGET build-indep' 235s + for t in $e_targets 235s + bm-build-deps-ok 235s + case "$branch" in 235s + return 1 235s + require_fail=required 235s + echo 'EXAMPLE RULES TARGET binary-indep' 235s + bm-report-test 'SOURCE FILE' true 235s + local 'desc=SOURCE FILE' 235s + shift 235s + true 235s + echo 'SOURCE FILE EXISTS' 235s + bm-report-test 'SOURCE IN CHANGES' true 235s + local 'desc=SOURCE IN CHANGES' 235s + shift 235s + true 235s + echo 'SOURCE IN CHANGES EXISTS' 235s + bm-report-test 'DEBS IN CHANGES' expr 'build-indep binary-indep' : '.*binary.*' 235s + local 'desc=DEBS IN CHANGES' 235s + shift 235s + expr 'build-indep binary-indep' : '.*binary.*' 235s 24 235s + echo 'DEBS IN CHANGES EXISTS' 235s + exec 235s + git checkout bad-build-deps 235s Switched to branch 'bad-build-deps' 235s + git clean -xdf 235s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 235s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 235s + set +o pipefail 235s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 235s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 235s + local dgit=dgit 235s + pwd 235s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 235s + : ' 235s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 235s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch 235s | git rev-parse --show-toplevel 235s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 235s | git config -z --get-regexp --local '.*' 235s | git config -z --get-regexp --local '.*' 235s | git config -z --get-regexp --global '.*' 235s | git config -z --get-regexp --system '.*' 235s format , quilt mode gbp 235s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 235s warning: could not open directory 'debian/source/': No such file or directory 235s => `' 235s + git diff --quiet HEAD 235s massage split -g. 235s massage done 3 -A. 235s format , quilt mode gbp 235s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 235s warning: could not open directory 'debian/source/': No such file or directory 235s => `' 235s + git diff --quiet HEAD 235s 235s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 235s dgit: Have to apply the patches - making the tree dirty. 235s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 235s 235s + dpkg-source --before-build . 235s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 235s dpkg-buildpackage: info: source package example 235s dpkg-buildpackage: info: source version 1.0 235s dpkg-buildpackage: info: source distribution unstable 235s dpkg-buildpackage: info: source changed by Ian Jackson 236s fakeroot debian/rules clean 236s EXAMPLE RULES TARGET clean 236s dh_clean 236s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 236s | git rev-parse 'HEAD~0' 236s => `d09bc55f43bc5586103335d232c16bd041247bd1' 236s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 236s CD work 236s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 236s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 236s CD .. 236s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 236s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 236s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 236s dpkg-source: info: using source format '1.0' 236s dpkg-source: info: building example in example_1.0.tar.gz 236s dpkg-source: info: building example in example_1.0.dsc 236s CD work 236s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 236s package seems new, not specifying -v 236s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 236s dpkg-genchanges: info: including full source code in upload 236s CD .. 236s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 236s renaming (Files) example_1.0.tar.gz 236s renaming (dsc) example_1.0.dsc 236s renaming (changes) example_1.0_source.changes 236s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 236s dgit: Unapplying patches again to tidy up the tree. 236s + dpkg-source --after-build . 236s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 236s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 236s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 236s gbp:info: Performing the build 236s dpkg-buildpackage: info: source package example 236s dpkg-buildpackage: info: source version 1.0 236s dpkg-buildpackage: info: source distribution unstable 236s dpkg-buildpackage: info: source changed by Ian Jackson 236s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 236s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 236s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 236s dpkg-buildpackage: warning: (Use -d flag to override.) 236s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -A -us -uc' failed: it exited with 3 236s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -A' --git-ignore-branch 236s 236s dgit: error: subprocess failed with error exit status 1 236s + local 'ps=255 0' 236s + set -o pipefail 236s + exec 236s + echo '===== [gbp-build_-g,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -g --git-ignore-branch =====' 236s + case $ps in 236s + actual_status=failure 236s + echo 'OPERATION FAILED' 236s + case "$require_fail-$tolerate_fail-$actual_status" in 236s + echo 'REQUIRED FAILURE' 236s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.output 236s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 236s + local 'desc=SOURCE FILE' 236s + shift 236s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 236s + echo 'SOURCE FILE EXISTS' 236s + '[' failure = success ']' 236s + exec 236s + quirk-clean-fixup 236s + case $cleanmode in 236s + perl -i.unfixed -ne ' 236s print unless 236s $_ eq $last && 236s $_ eq "EXAMPLE RULES TARGET clean\n"; 236s $last = $_; 236s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-g,dpkg-source-d,no-check,bad-build-deps.results 236s + '[' failure = failure ']' 236s + : bm-act-iterate done. 236s + for act in 'gbp-build -S' 'gbp-build -b' 'gbp-build -B' 'gbp-build -A' 'gbp-build -F' 'gbp-build -g' 'gbp-build -G' 236s + bm-guess-e-source-e-targets 'gbp-build -G' 236s + local 'some_act=gbp-build -G' 236s + case "$some_act" in 236s + e_source=true 236s + e_targets='build-arch binary-arch' 236s + real_act='gbp-build -G --git-ignore-branch' 236s + bm-act-iterate 236s + for cleanmode in $cleanmodes 236s + for branch in $bm_branches 236s + bm-run-one 236s + local 'args= --clean=git gbp-build -G --git-ignore-branch' 236s + bmid='gbp-build -G,git,indep-arch' 236s + bmid=gbp-build_-G,git,indep-arch 236s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 236s + heading='===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 236s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 236s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.expected 236s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.results 236s + bm-compute-expected 236s + require_fail=unexpect 236s + tolerate_fail=unexpect 236s + exec 236s + echo '===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 236s + local eff_cleanmode=git 236s + case "$e_targets" in 236s + case "$act" in 236s + case $eff_cleanmode in 236s + echo 'BUILD-MODES PROGRAM git clean -xdf' 236s + case $eff_cleanmode in 236s + '[' 'xbuild-arch binary-arch' '!=' x ']' 236s + bm-build-deps-ok 236s + case "$branch" in 236s + return 0 236s + for t in $e_targets 236s + bm-build-deps-ok 236s + case "$branch" in 236s + return 0 236s + echo 'EXAMPLE RULES TARGET build-arch' 236s + for t in $e_targets 236s + bm-build-deps-ok 236s + case "$branch" in 236s + return 0 236s + echo 'EXAMPLE RULES TARGET binary-arch' 236s + bm-report-test 'SOURCE FILE' true 236s + local 'desc=SOURCE FILE' 236s + shift 236s + true 236s + echo 'SOURCE FILE EXISTS' 236s + bm-report-test 'SOURCE IN CHANGES' true 236s + local 'desc=SOURCE IN CHANGES' 236s + shift 236s + true 236s + echo 'SOURCE IN CHANGES EXISTS' 236s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 236s + local 'desc=DEBS IN CHANGES' 236s + shift 236s + expr 'build-arch binary-arch' : '.*binary.*' 236s 22 236s + echo 'DEBS IN CHANGES EXISTS' 236s + exec 236s + git checkout indep-arch 236s Switched to branch 'indep-arch' 236s + git clean -xdf 236s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 236s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 236s + set +o pipefail 236s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 236s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 236s + local dgit=dgit 236s + pwd 236s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 236s + : ' 236s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 236s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 236s | git rev-parse --show-toplevel 236s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 236s | git config -z --get-regexp --local '.*' 236s | git config -z --get-regexp --local '.*' 236s | git config -z --get-regexp --global '.*' 236s | git config -z --get-regexp --system '.*' 236s format , quilt mode gbp 236s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 236s warning: could not open directory 'debian/source/': No such file or directory 236s => `' 236s + git diff --quiet HEAD 236s massage split -G. 236s massage done 3 -B. 236s format , quilt mode gbp 236s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 236s warning: could not open directory 'debian/source/': No such file or directory 236s => `' 236s + git diff --quiet HEAD 236s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 236s BUILD-MODES PROGRAM git clean -xdf 236s | git rev-parse 'HEAD~0' 236s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 236s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 236s CD work 236s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 236s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 236s CD .. 236s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 236s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 236s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 236s dpkg-source: info: using source format '1.0' 236s dpkg-source: info: building example in example_1.0.tar.gz 237s dpkg-source: info: building example in example_1.0.dsc 237s CD work 237s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 237s package seems new, not specifying -v 237s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 237s dpkg-genchanges: info: including full source code in upload 237s CD .. 237s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 237s renaming (Files) example_1.0.tar.gz 237s renaming (dsc) example_1.0.dsc 237s renaming (changes) example_1.0_source.changes 237s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 237s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 237s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 237s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 237s gbp:info: Performing the build 237s dpkg-buildpackage: info: source package example 237s dpkg-buildpackage: info: source version 1.0 237s dpkg-buildpackage: info: source distribution unstable 237s dpkg-buildpackage: info: source changed by Ian Jackson 237s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 237s dpkg-buildpackage: info: host architecture amd64 237s debian/rules build-arch 237s EXAMPLE RULES TARGET build-arch 237s fakeroot debian/rules binary-arch 237s EXAMPLE RULES TARGET binary-arch 237s dh_install 237s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 237s dh_gencontrol 237s dh_builddeb 237s + + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 237s exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 237s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 237s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 237s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 237s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 237s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 237s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 237s dpkg-buildpackage: info: binary-only upload (no source included) 237s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 237s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 238s dgit ok: build successful, results in example_1.0_multi.changes 238s 238s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 238s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 238s ' 238s + local 'ps=0 0' 238s + set -o pipefail 238s + exec 238s + echo '===== [gbp-build_-G,git,indep-arch] dgit --clean=git gbp-build -G --git-ignore-branch =====' 238s + case $ps in 238s + actual_status=success 238s + case "$require_fail-$tolerate_fail-$actual_status" in 238s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.output 238s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 238s + local 'desc=SOURCE FILE' 238s + shift 238s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 238s + echo 'SOURCE FILE EXISTS' 238s + '[' success = success ']' 238s + local changes 238s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 238s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 238s + case "$changes" in 238s + perl -ne 'print if m/^files:/i ... m/^\S/' 238s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 238s + local 'desc=SOURCE IN CHANGES' 238s + shift 238s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 238s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 238s + echo 'SOURCE IN CHANGES EXISTS' 238s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 238s + local 'desc=DEBS IN CHANGES' 238s + shift 238s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 238s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 238s + echo 'DEBS IN CHANGES EXISTS' 238s + exec 238s + quirk-clean-fixup 238s + case $cleanmode in 238s + '[' success = failure ']' 238s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,indep-arch.results 238s + for branch in $bm_branches 238s + bm-run-one 238s + local 'args= --clean=git gbp-build -G --git-ignore-branch' 238s + bmid='gbp-build -G,git,bad-build-deps' 238s + bmid=gbp-build_-G,git,bad-build-deps 238s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 238s + heading='===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 238s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 238s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.expected 238s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.results 238s + bm-compute-expected 238s + require_fail=unexpect 238s + tolerate_fail=unexpect 238s + exec 238s + echo '===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 238s + local eff_cleanmode=git 238s + case "$e_targets" in 238s + case "$act" in 238s + case $eff_cleanmode in 238s + echo 'BUILD-MODES PROGRAM git clean -xdf' 238s + case $eff_cleanmode in 238s + '[' 'xbuild-arch binary-arch' '!=' x ']' 238s + bm-build-deps-ok 238s + case "$branch" in 238s + return 1 238s + tolerate_fail=tolerate 238s + for t in $e_targets 238s + bm-build-deps-ok 238s + case "$branch" in 238s + return 1 238s + require_fail=required 238s + echo 'EXAMPLE RULES TARGET build-arch' 238s + for t in $e_targets 238s + bm-build-deps-ok 238s + case "$branch" in 238s + return 1 238s + require_fail=required 238s + echo 'EXAMPLE RULES TARGET binary-arch' 238s + bm-report-test 'SOURCE FILE' true 238s + local 'desc=SOURCE FILE' 238s + shift 238s + true 238s + echo 'SOURCE FILE EXISTS' 238s + bm-report-test 'SOURCE IN CHANGES' true 238s + local 'desc=SOURCE IN CHANGES' 238s + shift 238s + true 238s + echo 'SOURCE IN CHANGES EXISTS' 238s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 238s + local 'desc=DEBS IN CHANGES' 238s + shift 238s + expr 'build-arch binary-arch' : '.*binary.*' 238s 22 238s + echo 'DEBS IN CHANGES EXISTS' 238s + exec 238s + git checkout bad-build-deps 238s Switched to branch 'bad-build-deps' 238s + git clean -xdf 238s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 238s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 238s + set +o pipefail 238s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 238s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 238s + local dgit=dgit 238s + pwd 238s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 238s + : ' 238s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 238s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=git gbp-build -G --git-ignore-branch 238s | git rev-parse --show-toplevel 238s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 238s | git config -z --get-regexp --local '.*' 238s | git config -z --get-regexp --local '.*' 238s | git config -z --get-regexp --global '.*' 238s | git config -z --get-regexp --system '.*' 238s format , quilt mode gbp 238s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 238s warning: could not open directory 'debian/source/': No such file or directory 238s => `' 238s + git diff --quiet HEAD 238s massage split -G. 238s massage done 3 -B. 238s format , quilt mode gbp 238s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 238s warning: could not open directory 'debian/source/': No such file or directory 238s => `' 238s + git diff --quiet HEAD 238s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git clean -xdf 238s BUILD-MODES PROGRAM git clean -xdf 238s | git rev-parse 'HEAD~0' 238s => `d09bc55f43bc5586103335d232c16bd041247bd1' 238s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 238s CD work 238s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 238s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 238s CD .. 238s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 238s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 238s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 238s dpkg-source: info: using source format '1.0' 238s dpkg-source: info: building example in example_1.0.tar.gz 238s dpkg-source: info: building example in example_1.0.dsc 238s CD work 238s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 238s package seems new, not specifying -v 238s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 238s dpkg-genchanges: info: including full source code in upload 238s CD .. 238s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 238s renaming (Files) example_1.0.tar.gz 238s renaming (dsc) example_1.0.dsc 238s renaming (changes) example_1.0_source.changes 238s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 238s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 238s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 238s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 238s gbp:info: Performing the build 238s dpkg-buildpackage: info: source package example 238s dpkg-buildpackage: info: source version 1.0 238s dpkg-buildpackage: info: source distribution unstable 238s dpkg-buildpackage: info: source changed by Ian Jackson 238s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 238s dpkg-buildpackage: info: host architecture amd64 239s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 239s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 239s dpkg-buildpackage: warning: (Use -d flag to override.) 239s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 239s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 239s 239s dgit: error: subprocess failed with error exit status 1 239s + local 'ps=255 0' 239s + set -o pipefail 239s + exec 239s + echo '===== [gbp-build_-G,git,bad-build-deps] dgit --clean=git gbp-build -G --git-ignore-branch =====' 239s + case $ps in 239s + actual_status=failure 239s + echo 'OPERATION FAILED' 239s + case "$require_fail-$tolerate_fail-$actual_status" in 239s + echo 'REQUIRED FAILURE' 239s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,git,bad-build-deps.output 239s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 239s + local 'desc=SOURCE FILE' 239s + shift 239s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 239s + echo 'SOURCE FILE EXISTS' 239s + '[' failure = success ']' 239s + exec 239s + quirk-clean-fixup 239s + case $cleanmode in 239s + '[' failure = failure ']' 239s + for cleanmode in $cleanmodes 239s + for branch in $bm_branches 239s + bm-run-one 239s + local 'args= --clean=none gbp-build -G --git-ignore-branch' 239s + bmid='gbp-build -G,none,indep-arch' 239s + bmid=gbp-build_-G,none,indep-arch 239s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 239s + heading='===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 239s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 239s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.expected 239s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.results 239s + bm-compute-expected 239s + require_fail=unexpect 239s + tolerate_fail=unexpect 239s + exec 239s + echo '===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 239s + local eff_cleanmode=none 239s + case "$e_targets" in 239s + case "$act" in 239s + case $eff_cleanmode in 239s + case $eff_cleanmode in 239s + '[' 'xbuild-arch binary-arch' '!=' x ']' 239s + bm-build-deps-ok 239s + case "$branch" in 239s + return 0 239s + for t in $e_targets 239s + bm-build-deps-ok 239s + case "$branch" in 239s + return 0 239s + echo 'EXAMPLE RULES TARGET build-arch' 239s + for t in $e_targets 239s + bm-build-deps-ok 239s + case "$branch" in 239s + return 0 239s + echo 'EXAMPLE RULES TARGET binary-arch' 239s + bm-report-test 'SOURCE FILE' true 239s + local 'desc=SOURCE FILE' 239s + shift 239s + true 239s + echo 'SOURCE FILE EXISTS' 239s + bm-report-test 'SOURCE IN CHANGES' true 239s + local 'desc=SOURCE IN CHANGES' 239s + shift 239s + true 239s + echo 'SOURCE IN CHANGES EXISTS' 239s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 239s + local 'desc=DEBS IN CHANGES' 239s + shift 239s + expr 'build-arch binary-arch' : '.*binary.*' 239s 22 239s + echo 'DEBS IN CHANGES EXISTS' 239s + exec 239s + git checkout indep-arch 239s Switched to branch 'indep-arch' 239s + git clean -xdf 239s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 239s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 239s + set +o pipefail 239s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 239s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 239s + local dgit=dgit 239s + pwd 239s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 239s + : ' 239s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 239s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 239s | git rev-parse --show-toplevel 239s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 239s | git config -z --get-regexp --local '.*' 239s | git config -z --get-regexp --local '.*' 239s | git config -z --get-regexp --global '.*' 239s | git config -z --get-regexp --system '.*' 239s format , quilt mode gbp 239s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 239s warning: could not open directory 'debian/source/': No such file or directory 239s => `' 239s + git diff --quiet HEAD 239s massage split -G. 239s massage done 3 -B. 239s format , quilt mode gbp 239s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 239s warning: could not open directory 'debian/source/': No such file or directory 239s => `' 239s + git diff --quiet HEAD 239s | git rev-parse 'HEAD~0' 239s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 239s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 239s CD work 239s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 239s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 239s CD .. 239s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 239s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 239s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 239s dpkg-source: info: using source format '1.0' 239s dpkg-source: info: building example in example_1.0.tar.gz 239s dpkg-source: info: building example in example_1.0.dsc 239s CD work 239s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 239s package seems new, not specifying -v 239s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 239s dpkg-genchanges: info: including full source code in upload 239s CD .. 239s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 239s renaming (Files) example_1.0.tar.gz 239s renaming (dsc) example_1.0.dsc 239s renaming (changes) example_1.0_source.changes 239s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 239s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 239s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 239s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 239s gbp:info: Performing the build 239s dpkg-buildpackage: info: source package example 239s dpkg-buildpackage: info: source version 1.0 239s dpkg-buildpackage: info: source distribution unstable 239s dpkg-buildpackage: info: source changed by Ian Jackson 239s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 239s dpkg-buildpackage: info: host architecture amd64 239s debian/rules build-arch 239s EXAMPLE RULES TARGET build-arch 239s fakeroot debian/rules binary-arch 239s EXAMPLE RULES TARGET binary-arch 239s dh_install 239s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 239s dh_gencontrol 239s dh_builddeb 239s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 239s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 239s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 239s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 239s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 240s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 240s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 240s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 240s dpkg-buildpackage: info: binary-only upload (no source included) 240s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 240s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 240s dgit ok: build successful, results in example_1.0_multi.changes 240s 240s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 240s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 240s ' 240s + local 'ps=0 0' 240s + set -o pipefail 240s + exec 240s + echo '===== [gbp-build_-G,none,indep-arch] dgit --clean=none gbp-build -G --git-ignore-branch =====' 240s + case $ps in 240s + actual_status=success 240s + case "$require_fail-$tolerate_fail-$actual_status" in 240s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.output 240s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 240s + local 'desc=SOURCE FILE' 240s + shift 240s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 240s + echo 'SOURCE FILE EXISTS' 240s + '[' success = success ']' 240s + local changes 240s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 240s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 240s + case "$changes" in 240s + perl -ne 'print if m/^files:/i ... m/^\S/' 240s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 240s + local 'desc=SOURCE IN CHANGES' 240s + shift 240s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 240s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 240s + echo 'SOURCE IN CHANGES EXISTS' 240s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 240s + local 'desc=DEBS IN CHANGES' 240s + shift 240s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 240s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 240s + echo 'DEBS IN CHANGES EXISTS' 240s + exec 240s + quirk-clean-fixup 240s + case $cleanmode in 240s + '[' success = failure ']' 240s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,indep-arch.results 240s + for branch in $bm_branches 240s + bm-run-one 240s + local 'args= --clean=none gbp-build -G --git-ignore-branch' 240s + bmid='gbp-build -G,none,bad-build-deps' 240s + bmid=gbp-build_-G,none,bad-build-deps 240s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 240s + heading='===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 240s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 240s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.expected 240s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.results 240s + bm-compute-expected 240s + require_fail=unexpect 240s + tolerate_fail=unexpect 240s + exec 240s + echo '===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 240s + local eff_cleanmode=none 240s + case "$e_targets" in 240s + case "$act" in 240s + case $eff_cleanmode in 240s + case $eff_cleanmode in 240s + '[' 'xbuild-arch binary-arch' '!=' x ']' 240s + bm-build-deps-ok 240s + case "$branch" in 240s + return 1 240s + tolerate_fail=tolerate 240s + for t in $e_targets 240s + bm-build-deps-ok 240s + case "$branch" in 240s + return 1 240s + require_fail=required 240s + echo 'EXAMPLE RULES TARGET build-arch' 240s + for t in $e_targets 240s + bm-build-deps-ok 240s + case "$branch" in 240s + return 1 240s + require_fail=required 240s + echo 'EXAMPLE RULES TARGET binary-arch' 240s + bm-report-test 'SOURCE FILE' true 240s + local 'desc=SOURCE FILE' 240s + shift 240s + true 240s + echo 'SOURCE FILE EXISTS' 240s + bm-report-test 'SOURCE IN CHANGES' true 240s + local 'desc=SOURCE IN CHANGES' 240s + shift 240s + true 240s + echo 'SOURCE IN CHANGES EXISTS' 240s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 240s + local 'desc=DEBS IN CHANGES' 240s + shift 240s + expr 'build-arch binary-arch' : '.*binary.*' 240s 22 240s + echo 'DEBS IN CHANGES EXISTS' 240s + exec 240s + git checkout bad-build-deps 240s Switched to branch 'bad-build-deps' 240s + git clean -xdf 240s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 240s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 240s + set +o pipefail 240s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 240s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 240s + local dgit=dgit 240s + pwd 240s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 240s + : ' 240s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 240s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=none gbp-build -G --git-ignore-branch 240s | git rev-parse --show-toplevel 240s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 240s | git config -z --get-regexp --local '.*' 240s | git config -z --get-regexp --local '.*' 240s | git config -z --get-regexp --global '.*' 240s | git config -z --get-regexp --system '.*' 240s format , quilt mode gbp 240s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 240s warning: could not open directory 'debian/source/': No such file or directory 240s => `' 240s + git diff --quiet HEAD 240s massage split -G. 240s massage done 3 -B. 240s format , quilt mode gbp 240s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 240s warning: could not open directory 'debian/source/': No such file or directory 240s => `' 240s + git diff --quiet HEAD 240s | git rev-parse 'HEAD~0' 240s => `d09bc55f43bc5586103335d232c16bd041247bd1' 240s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 240s CD work 240s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 240s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 240s CD .. 240s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 240s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 240s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 240s dpkg-source: info: using source format '1.0' 240s dpkg-source: info: building example in example_1.0.tar.gz 240s dpkg-source: info: building example in example_1.0.dsc 240s CD work 240s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 240s package seems new, not specifying -v 240s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 241s dpkg-genchanges: info: including full source code in upload 241s CD .. 241s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 241s renaming (Files) example_1.0.tar.gz 241s renaming (dsc) example_1.0.dsc 241s renaming (changes) example_1.0_source.changes 241s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 241s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 241s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 241s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 241s gbp:info: Performing the build 241s dpkg-buildpackage: info: source package example 241s dpkg-buildpackage: info: source version 1.0 241s dpkg-buildpackage: info: source distribution unstable 241s dpkg-buildpackage: info: source changed by Ian Jackson 241s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 241s dpkg-buildpackage: info: host architecture amd64 241s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 241s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 241s dpkg-buildpackage: warning: (Use -d flag to override.) 241s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 241s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 241s 241s dgit: error: subprocess failed with error exit status 1 241s + local 'ps=255 0' 241s + set -o pipefail 241s + exec 241s + echo '===== [gbp-build_-G,none,bad-build-deps] dgit --clean=none gbp-build -G --git-ignore-branch =====' 241s + case $ps in 241s + actual_status=failure 241s + echo 'OPERATION FAILED' 241s + case "$require_fail-$tolerate_fail-$actual_status" in 241s + echo 'REQUIRED FAILURE' 241s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,none,bad-build-deps.output 241s + '[' 1 = 1 ']' 241s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 241s + local 'desc=SOURCE FILE' 241s + shift 241s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 241s + echo 'SOURCE FILE EXISTS' 241s + '[' failure = success ']' 241s + exec 241s + quirk-clean-fixup 241s + case $cleanmode in 241s + '[' failure = failure ']' 241s + for cleanmode in $cleanmodes 241s + for branch in $bm_branches 241s + bm-run-one 241s + local 'args= --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch' 241s + bmid='gbp-build -G,dpkg-source,no-check,indep-arch' 241s + bmid=gbp-build_-G,dpkg-source,no-check,indep-arch 241s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 241s + heading='===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 241s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 241s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.expected 241s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 241s + bm-compute-expected 241s + require_fail=unexpect 241s + tolerate_fail=unexpect 241s + exec 241s + echo '===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 241s + local eff_cleanmode=dpkg-source,no-check 241s + case "$e_targets" in 241s + case "$act" in 241s + case $eff_cleanmode in 241s + bm-build-deps-ok 241s + case "$branch" in 241s + return 0 241s + echo 'EXAMPLE RULES TARGET clean' 241s + case $eff_cleanmode in 241s + '[' 'xbuild-arch binary-arch' '!=' x ']' 241s + bm-build-deps-ok 241s + case "$branch" in 241s + return 0 241s + for t in $e_targets 241s + bm-build-deps-ok 241s + case "$branch" in 241s + return 0 241s + echo 'EXAMPLE RULES TARGET build-arch' 241s + for t in $e_targets 241s + bm-build-deps-ok 241s + case "$branch" in 241s + return 0 241s + echo 'EXAMPLE RULES TARGET binary-arch' 241s + bm-report-test 'SOURCE FILE' true 241s + local 'desc=SOURCE FILE' 241s + shift 241s + true 241s + echo 'SOURCE FILE EXISTS' 241s + bm-report-test 'SOURCE IN CHANGES' true 241s + local 'desc=SOURCE IN CHANGES' 241s + shift 241s + true 241s + echo 'SOURCE IN CHANGES EXISTS' 241s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 241s + local 'desc=DEBS IN CHANGES' 241s + shift 241s + expr 'build-arch binary-arch' : '.*binary.*' 241s 22 241s + echo 'DEBS IN CHANGES EXISTS' 241s + exec 241s + git checkout indep-arch 241s Switched to branch 'indep-arch' 241s + git clean -xdf 241s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 241s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 241s + set +o pipefail 241s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 241s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 241s + local dgit=dgit 241s + pwd 241s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 241s + : ' 241s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 241s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 241s | git rev-parse --show-toplevel 241s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 241s | git config -z --get-regexp --local '.*' 241s | git config -z --get-regexp --local '.*' 241s | git config -z --get-regexp --global '.*' 241s | git config -z --get-regexp --system '.*' 241s format , quilt mode gbp 241s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 241s warning: could not open directory 'debian/source/': No such file or directory 241s => `' 241s + git diff --quiet HEAD 241s massage split -G. 241s massage done 3 -B. 241s format , quilt mode gbp 241s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 241s warning: could not open directory 'debian/source/': No such file or directory 241s => `' 241s + git diff --quiet HEAD 241s 241s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 241s dgit: Have to apply the patches - making the tree dirty. 241s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 241s 241s + dpkg-source --before-build . 241s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 241s dpkg-buildpackage: info: source package example 241s dpkg-buildpackage: info: source version 1.0 241s dpkg-buildpackage: info: source distribution unstable 241s dpkg-buildpackage: info: source changed by Ian Jackson 241s fakeroot debian/rules clean 241s EXAMPLE RULES TARGET clean 241s dh_clean 241s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 241s | git rev-parse 'HEAD~0' 241s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 241s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 241s CD work 241s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 241s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 241s CD .. 241s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 241s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 241s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 241s dpkg-source: info: using source format '1.0' 241s dpkg-source: info: building example in example_1.0.tar.gz 241s dpkg-source: info: building example in example_1.0.dsc 241s CD work 241s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 241s package seems new, not specifying -v 241s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 242s dpkg-genchanges: info: including full source code in upload 242s CD .. 242s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 242s renaming (Files) example_1.0.tar.gz 242s renaming (dsc) example_1.0.dsc 242s renaming (changes) example_1.0_source.changes 242s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 242s dgit: Unapplying patches again to tidy up the tree. 242s + dpkg-source --after-build . 242s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 242s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 242s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 242s gbp:info: Performing the build 242s dpkg-buildpackage: info: source package example 242s dpkg-buildpackage: info: source version 1.0 242s dpkg-buildpackage: info: source distribution unstable 242s dpkg-buildpackage: info: source changed by Ian Jackson 242s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 242s dpkg-buildpackage: info: host architecture amd64 242s debian/rules build-arch 242s EXAMPLE RULES TARGET build-arch 242s fakeroot debian/rules binary-arch 242s EXAMPLE RULES TARGET binary-arch 242s dh_install 242s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 242s dh_gencontrol 242s dh_builddeb 242s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 242s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 242s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 242s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 242s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 242s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 242s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 242s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 242s dpkg-buildpackage: info: binary-only upload (no source included) 242s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 242s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 243s dgit ok: build successful, results in example_1.0_multi.changes 243s 243s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 243s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 243s ' 243s + local 'ps=0 0' 243s + set -o pipefail 243s + exec 243s + echo '===== [gbp-build_-G,dpkg-source,no-check,indep-arch] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 243s + case $ps in 243s + actual_status=success 243s + case "$require_fail-$tolerate_fail-$actual_status" in 243s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.output 243s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 243s + local 'desc=SOURCE FILE' 243s + shift 243s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 243s + echo 'SOURCE FILE EXISTS' 243s + '[' success = success ']' 243s + local changes 243s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 243s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 243s + case "$changes" in 243s + perl -ne 'print if m/^files:/i ... m/^\S/' 243s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 243s + local 'desc=SOURCE IN CHANGES' 243s + shift 243s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 243s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 243s + echo 'SOURCE IN CHANGES EXISTS' 243s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 243s + local 'desc=DEBS IN CHANGES' 243s + shift 243s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 243s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 243s + echo 'DEBS IN CHANGES EXISTS' 243s + exec 243s + quirk-clean-fixup 243s + case $cleanmode in 243s + perl -i.unfixed -ne ' 243s print unless 243s $_ eq $last && 243s $_ eq "EXAMPLE RULES TARGET clean\n"; 243s $last = $_; 243s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 243s + '[' success = failure ']' 243s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,indep-arch.results 243s + for branch in $bm_branches 243s + bm-run-one 243s + local 'args= --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch' 243s + bmid='gbp-build -G,dpkg-source,no-check,bad-build-deps' 243s + bmid=gbp-build_-G,dpkg-source,no-check,bad-build-deps 243s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 243s + heading='===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 243s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 243s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.expected 243s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.results 243s + bm-compute-expected 243s + require_fail=unexpect 243s + tolerate_fail=unexpect 243s + exec 243s + echo '===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 243s + local eff_cleanmode=dpkg-source,no-check 243s + case "$e_targets" in 243s + case "$act" in 243s + case $eff_cleanmode in 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 1 243s + tolerate_fail=tolerate 243s + echo 'EXAMPLE RULES TARGET clean' 243s + case $eff_cleanmode in 243s + '[' 'xbuild-arch binary-arch' '!=' x ']' 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 1 243s + tolerate_fail=tolerate 243s + for t in $e_targets 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 1 243s + require_fail=required 243s + echo 'EXAMPLE RULES TARGET build-arch' 243s + for t in $e_targets 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 1 243s + require_fail=required 243s + echo 'EXAMPLE RULES TARGET binary-arch' 243s + bm-report-test 'SOURCE FILE' true 243s + local 'desc=SOURCE FILE' 243s + shift 243s + true 243s + echo 'SOURCE FILE EXISTS' 243s + bm-report-test 'SOURCE IN CHANGES' true 243s + local 'desc=SOURCE IN CHANGES' 243s + shift 243s + true 243s + echo 'SOURCE IN CHANGES EXISTS' 243s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 243s + local 'desc=DEBS IN CHANGES' 243s + shift 243s + expr 'build-arch binary-arch' : '.*binary.*' 243s 22 243s + echo 'DEBS IN CHANGES EXISTS' 243s + exec 243s + git checkout bad-build-deps 243s Switched to branch 'bad-build-deps' 243s + git clean -xdf 243s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 243s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 243s + set +o pipefail 243s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 243s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 243s + local dgit=dgit 243s + pwd 243s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 243s + : ' 243s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 243s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch 243s | git rev-parse --show-toplevel 243s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 243s | git config -z --get-regexp --local '.*' 243s | git config -z --get-regexp --local '.*' 243s | git config -z --get-regexp --global '.*' 243s | git config -z --get-regexp --system '.*' 243s format , quilt mode gbp 243s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 243s warning: could not open directory 'debian/source/': No such file or directory 243s => `' 243s + git diff --quiet HEAD 243s massage split -G. 243s massage done 3 -B. 243s format , quilt mode gbp 243s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 243s warning: could not open directory 'debian/source/': No such file or directory 243s => `' 243s + git diff --quiet HEAD 243s 243s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 243s dgit: Have to apply the patches - making the tree dirty. 243s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 243s 243s + dpkg-source --before-build . 243s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 243s dpkg-buildpackage: info: source package example 243s dpkg-buildpackage: info: source version 1.0 243s dpkg-buildpackage: info: source distribution unstable 243s dpkg-buildpackage: info: source changed by Ian Jackson 243s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 243s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 243s dpkg-buildpackage: warning: (Use -d flag to override.) 243s dgit: failed command: dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 243s 243s dgit: error: subprocess failed with error exit status 3 243s + local 'ps=255 0' 243s + set -o pipefail 243s + exec 243s + echo '===== [gbp-build_-G,dpkg-source,no-check,bad-build-deps] dgit --clean=dpkg-source,no-check gbp-build -G --git-ignore-branch =====' 243s + case $ps in 243s + actual_status=failure 243s + echo 'OPERATION FAILED' 243s + case "$require_fail-$tolerate_fail-$actual_status" in 243s + echo 'REQUIRED FAILURE' 243s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.output 243s + '[' 1 = 1 ']' 243s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 243s + local 'desc=SOURCE FILE' 243s + shift 243s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 243s + echo 'SOURCE FILE MISSING' 243s + '[' failure = success ']' 243s + exec 243s + quirk-clean-fixup 243s + case $cleanmode in 243s + perl -i.unfixed -ne ' 243s print unless 243s $_ eq $last && 243s $_ eq "EXAMPLE RULES TARGET clean\n"; 243s $last = $_; 243s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source,no-check,bad-build-deps.results 243s + '[' failure = failure ']' 243s + for cleanmode in $cleanmodes 243s + for branch in $bm_branches 243s + bm-run-one 243s + local 'args= --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch' 243s + bmid='gbp-build -G,dpkg-source-d,no-check,indep-arch' 243s + bmid=gbp-build_-G,dpkg-source-d,no-check,indep-arch 243s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 243s + heading='===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 243s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 243s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.expected 243s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 243s + bm-compute-expected 243s + require_fail=unexpect 243s + tolerate_fail=unexpect 243s + exec 243s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 243s + local eff_cleanmode=dpkg-source-d,no-check 243s + case "$e_targets" in 243s + case "$act" in 243s + case $eff_cleanmode in 243s + echo 'EXAMPLE RULES TARGET clean' 243s + case $eff_cleanmode in 243s + '[' 'xbuild-arch binary-arch' '!=' x ']' 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 0 243s + for t in $e_targets 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 0 243s + echo 'EXAMPLE RULES TARGET build-arch' 243s + for t in $e_targets 243s + bm-build-deps-ok 243s + case "$branch" in 243s + return 0 243s + echo 'EXAMPLE RULES TARGET binary-arch' 243s + bm-report-test 'SOURCE FILE' true 243s + local 'desc=SOURCE FILE' 243s + shift 243s + true 243s + echo 'SOURCE FILE EXISTS' 243s + bm-report-test 'SOURCE IN CHANGES' true 243s + local 'desc=SOURCE IN CHANGES' 243s + shift 243s + true 243s + echo 'SOURCE IN CHANGES EXISTS' 243s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 243s + local 'desc=DEBS IN CHANGES' 243s + shift 243s + expr 'build-arch binary-arch' : '.*binary.*' 243s 22 243s + echo 'DEBS IN CHANGES EXISTS' 243s + exec 243s + git checkout indep-arch 243s Switched to branch 'indep-arch' 243s + git clean -xdf 243s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 243s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 243s + set +o pipefail 243s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 243s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 243s + local dgit=dgit 243s + pwd 243s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 243s + : ' 243s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 243s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 243s | git rev-parse --show-toplevel 243s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 243s | git config -z --get-regexp --local '.*' 243s | git config -z --get-regexp --local '.*' 243s | git config -z --get-regexp --global '.*' 243s | git config -z --get-regexp --system '.*' 243s format , quilt mode gbp 243s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 243s warning: could not open directory 'debian/source/': No such file or directory 243s => `' 243s + git diff --quiet HEAD 243s massage split -G. 243s massage done 3 -B. 243s format , quilt mode gbp 243s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 243s warning: could not open directory 'debian/source/': No such file or directory 243s => `' 243s + git diff --quiet HEAD 243s 243s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 243s dgit: Have to apply the patches - making the tree dirty. 243s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 243s 243s + dpkg-source --before-build . 244s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 244s dpkg-buildpackage: info: source package example 244s dpkg-buildpackage: info: source version 1.0 244s dpkg-buildpackage: info: source distribution unstable 244s dpkg-buildpackage: info: source changed by Ian Jackson 244s fakeroot debian/rules clean 244s EXAMPLE RULES TARGET clean 244s dh_clean 244s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 244s | git rev-parse 'HEAD~0' 244s => `e2157295db63affb0fdc90c11c60b5f279aaa587' 244s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 244s CD work 244s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 244s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard e2157295db63affb0fdc90c11c60b5f279aaa587 244s CD .. 244s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 244s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 244s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 244s dpkg-source: info: using source format '1.0' 244s dpkg-source: info: building example in example_1.0.tar.gz 244s dpkg-source: info: building example in example_1.0.dsc 244s CD work 244s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 244s package seems new, not specifying -v 244s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 244s dpkg-genchanges: info: including full source code in upload 244s CD .. 244s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 244s renaming (Files) example_1.0.tar.gz 244s renaming (dsc) example_1.0.dsc 244s renaming (changes) example_1.0_source.changes 244s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 244s dgit: Unapplying patches again to tidy up the tree. 244s + dpkg-source --after-build . 244s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 244s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 244s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 244s gbp:info: Performing the build 244s dpkg-buildpackage: info: source package example 244s dpkg-buildpackage: info: source version 1.0 244s dpkg-buildpackage: info: source distribution unstable 244s dpkg-buildpackage: info: source changed by Ian Jackson 244s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 244s dpkg-buildpackage: info: host architecture amd64 244s debian/rules build-arch 244s EXAMPLE RULES TARGET build-arch 244s fakeroot debian/rules binary-arch 244s EXAMPLE RULES TARGET binary-arch 244s dh_install 244s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 244s dh_gencontrol 244s dh_builddeb 244s + exec /usr/bin/dpkg-deb -Znone --build debian/example-indep .. 244s + exec /usr/bin/dpkg-deb -Znone --build debian/example-arch .. 244s dpkg-deb: building package 'example-indep' in '../example-indep_1.0_all.deb'. 244s dpkg-deb: building package 'example-arch' in '../example-arch_1.0_amd64.deb'. 244s dpkg-genbuildinfo --build=any -O../example_1.0_amd64.buildinfo 245s dpkg-genchanges --build=any -O../example_1.0_amd64.changes 245s dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) 245s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 245s dpkg-buildpackage: info: binary-only upload (no source included) 245s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 245s + mergechanges -f example_1.0_source.changes example_1.0_amd64.changes 245s dgit ok: build successful, results in example_1.0_multi.changes 245s 245s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 245s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 245s ' 245s + local 'ps=0 0' 245s + set -o pipefail 245s + exec 245s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,indep-arch] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 245s + case $ps in 245s + actual_status=success 245s + case "$require_fail-$tolerate_fail-$actual_status" in 245s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.output 245s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 245s + local 'desc=SOURCE FILE' 245s + shift 245s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 245s + echo 'SOURCE FILE EXISTS' 245s + '[' success = success ']' 245s + local changes 245s ++ echo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 245s + changes=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes 245s + case "$changes" in 245s + perl -ne 'print if m/^files:/i ... m/^\S/' 245s + bm-report-test 'SOURCE IN CHANGES' grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 245s + local 'desc=SOURCE IN CHANGES' 245s + shift 245s + grep '\.dsc$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 245s 105b088d9d4e6ad332bd122fec240764 561 devel extra example_1.0.dsc 245s + echo 'SOURCE IN CHANGES EXISTS' 245s + bm-report-test 'DEBS IN CHANGES' grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 245s + local 'desc=DEBS IN CHANGES' 245s + shift 245s + grep '\.deb$' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0_multi.changes.files 245s 69f05fa4bf8b17cb46447e362171095b 20672 devel extra example-arch_1.0_amd64.deb 245s + echo 'DEBS IN CHANGES EXISTS' 245s + exec 245s + quirk-clean-fixup 245s + case $cleanmode in 245s + perl -i.unfixed -ne ' 245s print unless 245s $_ eq $last && 245s $_ eq "EXAMPLE RULES TARGET clean\n"; 245s $last = $_; 245s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 245s + '[' success = failure ']' 245s + diff -U10 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.expected /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,indep-arch.results 245s + for branch in $bm_branches 245s + bm-run-one 245s + local 'args= --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch' 245s + bmid='gbp-build -G,dpkg-source-d,no-check,bad-build-deps' 245s + bmid=gbp-build_-G,dpkg-source-d,no-check,bad-build-deps 245s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_{v}_*.changes' 245s + heading='===== [gbp-build_-G,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 245s + bmlog=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 245s + bmexp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.expected 245s + bmgot=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.results 245s + bm-compute-expected 245s + require_fail=unexpect 245s + tolerate_fail=unexpect 245s + exec 245s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 245s + local eff_cleanmode=dpkg-source-d,no-check 245s + case "$e_targets" in 245s + case "$act" in 245s + case $eff_cleanmode in 245s + echo 'EXAMPLE RULES TARGET clean' 245s + case $eff_cleanmode in 245s + '[' 'xbuild-arch binary-arch' '!=' x ']' 245s + bm-build-deps-ok 245s + case "$branch" in 245s + return 1 245s + tolerate_fail=tolerate 245s + for t in $e_targets 245s + bm-build-deps-ok 245s + case "$branch" in 245s + return 1 245s + require_fail=required 245s + echo 'EXAMPLE RULES TARGET build-arch' 245s + for t in $e_targets 245s + bm-build-deps-ok 245s + case "$branch" in 245s + return 1 245s + require_fail=required 245s + echo 'EXAMPLE RULES TARGET binary-arch' 245s + bm-report-test 'SOURCE FILE' true 245s + local 'desc=SOURCE FILE' 245s + shift 245s + true 245s + echo 'SOURCE FILE EXISTS' 245s + bm-report-test 'SOURCE IN CHANGES' true 245s + local 'desc=SOURCE IN CHANGES' 245s + shift 245s + true 245s + echo 'SOURCE IN CHANGES EXISTS' 245s + bm-report-test 'DEBS IN CHANGES' expr 'build-arch binary-arch' : '.*binary.*' 245s + local 'desc=DEBS IN CHANGES' 245s + shift 245s + expr 'build-arch binary-arch' : '.*binary.*' 245s 22 245s + echo 'DEBS IN CHANGES EXISTS' 245s + exec 245s + git checkout bad-build-deps 245s Switched to branch 'bad-build-deps' 245s + git clean -xdf 245s + dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 245s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc 245s + set +o pipefail 245s + t-dgit --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 245s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 245s + local dgit=dgit 245s + pwd 245s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 245s + : ' 245s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 245s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --rm-old-changes --git=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch 245s | git rev-parse --show-toplevel 245s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 245s | git config -z --get-regexp --local '.*' 245s | git config -z --get-regexp --local '.*' 245s | git config -z --get-regexp --global '.*' 245s | git config -z --get-regexp --system '.*' 245s format , quilt mode gbp 245s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 245s warning: could not open directory 'debian/source/': No such file or directory 245s => `' 245s + git diff --quiet HEAD 245s massage split -G. 245s massage done 3 -B. 245s format , quilt mode gbp 245s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 245s warning: could not open directory 'debian/source/': No such file or directory 245s => `' 245s + git diff --quiet HEAD 245s 245s dgit: Building, or cleaning with rules target, in patches-unapplied tree. 245s dgit: Have to apply the patches - making the tree dirty. 245s dgit: (Consider specifying --clean=git and (or) using dgit sbuild.) 245s 245s + dpkg-source --before-build . 245s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 246s dpkg-buildpackage: info: source package example 246s dpkg-buildpackage: info: source version 1.0 246s dpkg-buildpackage: info: source distribution unstable 246s dpkg-buildpackage: info: source changed by Ian Jackson 246s fakeroot debian/rules clean 246s EXAMPLE RULES TARGET clean 246s dh_clean 246s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 246s | git rev-parse 'HEAD~0' 246s => `d09bc55f43bc5586103335d232c16bd041247bd1' 246s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 246s CD work 246s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git playtree-setup . 246s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/stunt-git reset -q --hard d09bc55f43bc5586103335d232c16bd041247bd1 246s CD .. 246s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 246s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 246s dpkg-source: warning: source directory 'work' is not - 'example-1.0' 246s dpkg-source: info: using source format '1.0' 246s dpkg-source: info: building example in example_1.0.tar.gz 246s dpkg-source: info: building example in example_1.0.dsc 246s CD work 246s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 246s package seems new, not specifying -v 246s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.0_source.changes dpkg-genchanges -S 246s dpkg-genchanges: info: including full source code in upload 246s CD .. 246s moving example_1.0.dsc, example_1.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd 246s renaming (Files) example_1.0.tar.gz 246s renaming (dsc) example_1.0.dsc 246s renaming (changes) example_1.0_source.changes 246s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 246s dgit: Unapplying patches again to tidy up the tree. 246s + dpkg-source --after-build . 246s + gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 246s gbp:info: Exporting 'HEAD' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' 246s gbp:info: Moving '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-tmp' to '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example-1.0' 246s gbp:info: Performing the build 246s dpkg-buildpackage: info: source package example 246s dpkg-buildpackage: info: source version 1.0 246s dpkg-buildpackage: info: source distribution unstable 246s dpkg-buildpackage: info: source changed by Ian Jackson 246s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 246s dpkg-buildpackage: info: host architecture amd64 246s dpkg-checkbuilddeps: error: Unmet build dependencies: x-dgit-no-such-package 246s dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting 246s dpkg-buildpackage: warning: (Use -d flag to override.) 246s gbp:error: 'dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -nc -B -us -uc' failed: it exited with 3 246s dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags '--git-builder=dpkg-buildpackage '\''-i(?:^|/)'\'''\\''\\''\''.git(?:/|$)'\'' -I.git -nc -B' --git-ignore-branch 246s 246s dgit: error: subprocess failed with error exit status 1 246s + local 'ps=255 0' 246s + set -o pipefail 246s + exec 246s + echo '===== [gbp-build_-G,dpkg-source-d,no-check,bad-build-deps] dgit --clean=dpkg-source-d,no-check gbp-build -G --git-ignore-branch =====' 246s + case $ps in 246s + actual_status=failure 246s + echo 'OPERATION FAILED' 246s + case "$require_fail-$tolerate_fail-$actual_status" in 246s + echo 'REQUIRED FAILURE' 246s + egrep '^EXAMPLE RULES TARGET|^BUILD-MODES' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.output 246s + bm-report-test 'SOURCE FILE' '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 246s + local 'desc=SOURCE FILE' 246s + shift 246s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd/example_1.0.dsc ']' 246s + echo 'SOURCE FILE EXISTS' 246s + '[' failure = success ']' 246s + exec 246s + quirk-clean-fixup 246s + case $cleanmode in 246s + perl -i.unfixed -ne ' 246s print unless 246s $_ eq $last && 246s $_ eq "EXAMPLE RULES TARGET clean\n"; 246s $last = $_; 246s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/run.gbp-build_-G,dpkg-source-d,no-check,bad-build-deps.results 246s + '[' failure = failure ']' 246s + : bm-act-iterate done. 246s + t-ok 246s + : ======================================== 246s + t-check-only-bpd 246s + '[' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/bpd = .. ']' 246s + t-files-notexist '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.deb' '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.changes' '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.dsc' '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.buildinfo' '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.tar.*' '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.diff.*' 246s + local f 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.deb' ']' 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.changes' ']' 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.dsc' ']' 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.buildinfo' ']' 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.tar.*' ']' 246s + for f in "$@" 246s + '[' -e '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/*.diff.*' ']' 246s + t-fscks 246s + shopt -s nullglob 246s + for d in $tmp/*/.git $tmp/git/*.git 246s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 246s + t-git-fsck 246s ++ git rev-parse --git-dir 246s + local fsckerrs=.git/dgit-test-fsck.errs 246s + set +e 246s + LC_MESSAGES=C 246s + tee .git/dgit-test-fsck.errs 246s + git fsck --no-dangling --strict 246s + ps='0 0' 246s + set -e 246s + local pats 246s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 246s + test '0 0' = '0 0' 246s + pats+=(-e 'notice: HEAD points to an unborn branch') 246s + pats+=(-e 'notice: No default references') 246s + set +e 246s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 246s + rc=1 246s + set -e 246s + case $rc in 246s + t-save-artifacts 246s + artifacts=/tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts 246s + '[' x/tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts = x ']' 246s + '[' xtmp = x ']' 246s + GZIP=-1v 246s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/build-modes-gbp-artifacts/build-modes-gbp.tar.gz '--exclude=*.tar' . 246s gzip: warning: GZIP environment variable is deprecated; use an alias or script 246s 86.3% 246s + echo ok. 246s ok. 246s + rc=0 246s + set +x 246s + set +e 246s + pwd 246s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 246s + '[' x '!=' x ']' 246s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 246s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 246s + set -e 246s + test 0 = 0 247s autopkgtest [12:22:21]: test build-modes-gbp: -----------------------] 247s build-modes-gbp PASS 247s autopkgtest [12:22:21]: test build-modes-gbp: - - - - - - - - - - results - - - - - - - - - - 247s autopkgtest [12:22:21]: test clone-reprepro: preparing testbed 294s autopkgtest [12:23:08]: testbed dpkg architecture: amd64 294s autopkgtest [12:23:08]: testbed apt version: 2.4.13 294s autopkgtest [12:23:08]: @@@@@@@@@@@@@@@@@@@@ test bed setup 294s autopkgtest [12:23:08]: testbed release detected to be: jammy 294s autopkgtest [12:23:08]: updating testbed package index (apt update) 294s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 294s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 294s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 294s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 295s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 295s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 295s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 295s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 295s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 295s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 295s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 295s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 295s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 295s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 295s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 295s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 295s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 298s Fetched 1719 kB in 1s (3179 kB/s) 299s Reading package lists... 299s autopkgtest [12:23:13]: upgrading testbed (apt dist-upgrade and autopurge) 299s Reading package lists... 300s Building dependency tree... 300s Reading state information... 300s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 300s Starting 2 pkgProblemResolver with broken count: 0 300s Done 301s Entering ResolveByKeep 301s 301s The following packages will be upgraded: 301s apt apt-utils libapt-pkg6.0 301s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 301s Need to get 2486 kB of archives. 301s After this operation, 0 B of additional disk space will be used. 301s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 301s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 302s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 302s Fetched 2486 kB in 0s (26.9 MB/s) 302s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 302s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 302s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 302s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 302s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 302s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 302s Unpacking apt (2.4.14) over (2.4.13) ... 302s Setting up apt (2.4.14) ... 303s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 303s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 303s Unpacking apt-utils (2.4.14) over (2.4.13) ... 303s Setting up apt-utils (2.4.14) ... 303s Processing triggers for man-db (2.10.2-1) ... 303s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 304s Reading package lists... 305s Building dependency tree... 305s Reading state information... 305s Starting pkgProblemResolver with broken count: 0 305s Starting 2 pkgProblemResolver with broken count: 0 305s Done 306s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 306s autopkgtest [12:23:20]: rebooting testbed after setup commands that affected boot 319s Reading package lists... 319s Building dependency tree... 319s Reading state information... 319s Starting pkgProblemResolver with broken count: 0 319s Starting 2 pkgProblemResolver with broken count: 0 319s Done 320s The following NEW packages will be installed: 320s autoconf automake autopoint autotools-dev bc build-essential 320s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 320s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 320s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 320s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 320s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 320s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 320s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 320s libdynaloader-functions-perl libencode-locale-perl liberror-perl 320s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 320s libfile-homedir-perl libfile-listing-perl libfile-stripnondeterminism-perl 320s libfile-touch-perl libfile-which-perl libgcc-11-dev libgomp1 320s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 320s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 320s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 320s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 320s liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 320s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 320s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 320s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 320s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 320s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 320s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 320s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 320s python3-dateutil python3-debian python3-gpg reprepro rpcsvc-proto sqlite3 320s wdiff 320s 0 upgraded, 114 newly installed, 0 to remove and 0 not upgraded. 320s Need to get 73.3 MB of archives. 320s After this operation, 248 MB of additional disk space will be used. 320s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 320s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 320s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 320s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 320s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 320s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 320s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 320s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 320s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 320s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 320s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 320s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 320s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 320s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 320s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 320s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 320s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 320s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 320s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 320s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 320s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 320s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 320s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 320s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 320s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 320s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 320s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 320s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 320s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 320s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 320s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 320s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 320s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 320s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 320s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 320s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 320s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 320s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 320s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 320s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 320s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 320s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 320s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 320s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 320s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 320s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 320s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 320s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 320s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 320s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 320s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 320s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 320s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 320s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 320s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 320s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 320s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 320s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 320s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 320s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 320s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 320s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 320s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 320s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 320s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 320s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 320s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 320s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 320s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 320s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 320s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 320s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 320s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 320s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 320s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 320s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 320s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 320s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 320s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 320s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 320s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 320s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 320s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 320s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 320s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 320s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 320s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 320s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 320s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 320s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 320s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 320s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 320s Get:93 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 320s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 320s Get:95 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 320s Get:96 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 320s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 320s Get:98 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 320s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 320s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 320s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 320s Get:102 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 320s Get:103 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 320s Get:104 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 320s Get:105 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 320s Get:106 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 320s Get:107 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 320s Get:108 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 320s Get:109 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 320s Get:110 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 320s Get:111 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 320s Get:112 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 320s Get:113 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 320s Get:114 http://ftpmaster.internal/ubuntu jammy/universe amd64 reprepro amd64 5.3.0-1.4 [458 kB] 321s Fetched 73.3 MB in 1s (118 MB/s) 321s Selecting previously unselected package m4. 321s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 321s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 321s Unpacking m4 (1.4.18-5ubuntu2) ... 321s Selecting previously unselected package autoconf. 321s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 321s Unpacking autoconf (2.71-2) ... 321s Selecting previously unselected package autotools-dev. 321s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 321s Unpacking autotools-dev (20220109.1) ... 321s Selecting previously unselected package automake. 321s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 321s Unpacking automake (1:1.16.5-1.3) ... 321s Selecting previously unselected package autopoint. 321s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 321s Unpacking autopoint (0.21-4ubuntu4) ... 321s Selecting previously unselected package bc. 321s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 321s Unpacking bc (1.07.1-3build1) ... 321s Selecting previously unselected package libc-dev-bin. 321s Preparing to unpack .../006-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 321s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 321s Selecting previously unselected package linux-libc-dev:amd64. 321s Preparing to unpack .../007-linux-libc-dev_5.15.0-135.146_amd64.deb ... 321s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 322s Selecting previously unselected package libcrypt-dev:amd64. 322s Preparing to unpack .../008-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 322s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 322s Selecting previously unselected package rpcsvc-proto. 322s Preparing to unpack .../009-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 322s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 322s Selecting previously unselected package libtirpc-dev:amd64. 322s Preparing to unpack .../010-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 322s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 322s Selecting previously unselected package libnsl-dev:amd64. 322s Preparing to unpack .../011-libnsl-dev_1.3.0-2build2_amd64.deb ... 322s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 322s Selecting previously unselected package libc6-dev:amd64. 322s Preparing to unpack .../012-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 322s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 322s Selecting previously unselected package gcc-11-base:amd64. 322s Preparing to unpack .../013-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libisl23:amd64. 322s Preparing to unpack .../014-libisl23_0.24-2build1_amd64.deb ... 322s Unpacking libisl23:amd64 (0.24-2build1) ... 322s Selecting previously unselected package libmpc3:amd64. 322s Preparing to unpack .../015-libmpc3_1.2.1-2build1_amd64.deb ... 322s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 322s Selecting previously unselected package cpp-11. 322s Preparing to unpack .../016-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package cpp. 322s Preparing to unpack .../017-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 322s Unpacking cpp (4:11.2.0-1ubuntu1) ... 322s Selecting previously unselected package libcc1-0:amd64. 322s Preparing to unpack .../018-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libgomp1:amd64. 322s Preparing to unpack .../019-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libitm1:amd64. 322s Preparing to unpack .../020-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libatomic1:amd64. 322s Preparing to unpack .../021-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libasan6:amd64. 322s Preparing to unpack .../022-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package liblsan0:amd64. 322s Preparing to unpack .../023-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libtsan0:amd64. 322s Preparing to unpack .../024-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libubsan1:amd64. 322s Preparing to unpack .../025-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libquadmath0:amd64. 322s Preparing to unpack .../026-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package libgcc-11-dev:amd64. 322s Preparing to unpack .../027-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package gcc-11. 322s Preparing to unpack .../028-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 322s Selecting previously unselected package gcc. 322s Preparing to unpack .../029-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 322s Unpacking gcc (4:11.2.0-1ubuntu1) ... 322s Selecting previously unselected package libstdc++-11-dev:amd64. 322s Preparing to unpack .../030-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 322s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 323s Selecting previously unselected package g++-11. 323s Preparing to unpack .../031-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 323s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 323s Selecting previously unselected package g++. 323s Preparing to unpack .../032-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 323s Unpacking g++ (4:11.2.0-1ubuntu1) ... 323s Selecting previously unselected package build-essential. 323s Preparing to unpack .../033-build-essential_12.9ubuntu3_amd64.deb ... 323s Unpacking build-essential (12.9ubuntu3) ... 323s Selecting previously unselected package libdebhelper-perl. 323s Preparing to unpack .../034-libdebhelper-perl_13.6ubuntu1_all.deb ... 323s Unpacking libdebhelper-perl (13.6ubuntu1) ... 323s Selecting previously unselected package libtool. 323s Preparing to unpack .../035-libtool_2.4.6-15build2_all.deb ... 323s Unpacking libtool (2.4.6-15build2) ... 323s Selecting previously unselected package dh-autoreconf. 323s Preparing to unpack .../036-dh-autoreconf_20_all.deb ... 323s Unpacking dh-autoreconf (20) ... 323s Selecting previously unselected package libarchive-zip-perl. 323s Preparing to unpack .../037-libarchive-zip-perl_1.68-1_all.deb ... 323s Unpacking libarchive-zip-perl (1.68-1) ... 323s Selecting previously unselected package libsub-override-perl. 323s Preparing to unpack .../038-libsub-override-perl_0.09-2_all.deb ... 323s Unpacking libsub-override-perl (0.09-2) ... 323s Selecting previously unselected package libfile-stripnondeterminism-perl. 323s Preparing to unpack .../039-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 323s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 323s Selecting previously unselected package dh-strip-nondeterminism. 323s Preparing to unpack .../040-dh-strip-nondeterminism_1.13.0-1_all.deb ... 323s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 323s Selecting previously unselected package debugedit. 323s Preparing to unpack .../041-debugedit_1%3a5.0-4build1_amd64.deb ... 323s Unpacking debugedit (1:5.0-4build1) ... 323s Selecting previously unselected package dwz. 323s Preparing to unpack .../042-dwz_0.14-1build2_amd64.deb ... 323s Unpacking dwz (0.14-1build2) ... 323s Selecting previously unselected package gettext. 323s Preparing to unpack .../043-gettext_0.21-4ubuntu4_amd64.deb ... 323s Unpacking gettext (0.21-4ubuntu4) ... 323s Selecting previously unselected package intltool-debian. 323s Preparing to unpack .../044-intltool-debian_0.35.0+20060710.5_all.deb ... 323s Unpacking intltool-debian (0.35.0+20060710.5) ... 323s Selecting previously unselected package po-debconf. 323s Preparing to unpack .../045-po-debconf_1.0.21+nmu1_all.deb ... 323s Unpacking po-debconf (1.0.21+nmu1) ... 323s Selecting previously unselected package debhelper. 323s Preparing to unpack .../046-debhelper_13.6ubuntu1_all.deb ... 323s Unpacking debhelper (13.6ubuntu1) ... 323s Selecting previously unselected package libfakeroot:amd64. 323s Preparing to unpack .../047-libfakeroot_1.28-1ubuntu1_amd64.deb ... 323s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 323s Selecting previously unselected package fakeroot. 323s Preparing to unpack .../048-fakeroot_1.28-1ubuntu1_amd64.deb ... 323s Unpacking fakeroot (1.28-1ubuntu1) ... 323s Selecting previously unselected package libfile-dirlist-perl. 323s Preparing to unpack .../049-libfile-dirlist-perl_0.05-2_all.deb ... 323s Unpacking libfile-dirlist-perl (0.05-2) ... 323s Selecting previously unselected package libfile-which-perl. 323s Preparing to unpack .../050-libfile-which-perl_1.23-1_all.deb ... 323s Unpacking libfile-which-perl (1.23-1) ... 323s Selecting previously unselected package libfile-homedir-perl. 323s Preparing to unpack .../051-libfile-homedir-perl_1.006-1_all.deb ... 323s Unpacking libfile-homedir-perl (1.006-1) ... 323s Selecting previously unselected package libfile-touch-perl. 323s Preparing to unpack .../052-libfile-touch-perl_0.12-1_all.deb ... 323s Unpacking libfile-touch-perl (0.12-1) ... 323s Selecting previously unselected package libio-pty-perl. 323s Preparing to unpack .../053-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 323s Unpacking libio-pty-perl (1:1.15-2build2) ... 323s Selecting previously unselected package libipc-run-perl. 323s Preparing to unpack .../054-libipc-run-perl_20200505.0-1_all.deb ... 323s Unpacking libipc-run-perl (20200505.0-1) ... 323s Selecting previously unselected package libclass-method-modifiers-perl. 323s Preparing to unpack .../055-libclass-method-modifiers-perl_2.13-1_all.deb ... 323s Unpacking libclass-method-modifiers-perl (2.13-1) ... 323s Selecting previously unselected package libclass-xsaccessor-perl. 323s Preparing to unpack .../056-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 323s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 323s Selecting previously unselected package libb-hooks-op-check-perl. 323s Preparing to unpack .../057-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 323s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 323s Selecting previously unselected package libdynaloader-functions-perl. 323s Preparing to unpack .../058-libdynaloader-functions-perl_0.003-1.1_all.deb ... 323s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 323s Selecting previously unselected package libdevel-callchecker-perl. 323s Preparing to unpack .../059-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 323s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 323s Selecting previously unselected package libparams-classify-perl. 323s Preparing to unpack .../060-libparams-classify-perl_0.015-1build5_amd64.deb ... 323s Unpacking libparams-classify-perl (0.015-1build5) ... 323s Selecting previously unselected package libmodule-runtime-perl. 323s Preparing to unpack .../061-libmodule-runtime-perl_0.016-1_all.deb ... 323s Unpacking libmodule-runtime-perl (0.016-1) ... 323s Selecting previously unselected package libimport-into-perl. 323s Preparing to unpack .../062-libimport-into-perl_1.002005-1_all.deb ... 323s Unpacking libimport-into-perl (1.002005-1) ... 323s Selecting previously unselected package librole-tiny-perl. 323s Preparing to unpack .../063-librole-tiny-perl_2.002004-1_all.deb ... 323s Unpacking librole-tiny-perl (2.002004-1) ... 323s Selecting previously unselected package libsub-quote-perl. 323s Preparing to unpack .../064-libsub-quote-perl_2.006006-1_all.deb ... 323s Unpacking libsub-quote-perl (2.006006-1) ... 323s Selecting previously unselected package libmoo-perl. 323s Preparing to unpack .../065-libmoo-perl_2.005004-3_all.deb ... 323s Unpacking libmoo-perl (2.005004-3) ... 323s Selecting previously unselected package libencode-locale-perl. 323s Preparing to unpack .../066-libencode-locale-perl_1.05-1.1_all.deb ... 323s Unpacking libencode-locale-perl (1.05-1.1) ... 323s Selecting previously unselected package libtimedate-perl. 323s Preparing to unpack .../067-libtimedate-perl_2.3300-2_all.deb ... 323s Unpacking libtimedate-perl (2.3300-2) ... 323s Selecting previously unselected package libhttp-date-perl. 323s Preparing to unpack .../068-libhttp-date-perl_6.05-1_all.deb ... 323s Unpacking libhttp-date-perl (6.05-1) ... 323s Selecting previously unselected package libfile-listing-perl. 323s Preparing to unpack .../069-libfile-listing-perl_6.14-1_all.deb ... 323s Unpacking libfile-listing-perl (6.14-1) ... 323s Selecting previously unselected package libhtml-tagset-perl. 323s Preparing to unpack .../070-libhtml-tagset-perl_3.20-4_all.deb ... 323s Unpacking libhtml-tagset-perl (3.20-4) ... 323s Selecting previously unselected package liburi-perl. 323s Preparing to unpack .../071-liburi-perl_5.10-1_all.deb ... 323s Unpacking liburi-perl (5.10-1) ... 323s Selecting previously unselected package libhtml-parser-perl:amd64. 323s Preparing to unpack .../072-libhtml-parser-perl_3.76-1build2_amd64.deb ... 323s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 323s Selecting previously unselected package libhtml-tree-perl. 323s Preparing to unpack .../073-libhtml-tree-perl_5.07-2_all.deb ... 323s Unpacking libhtml-tree-perl (5.07-2) ... 323s Selecting previously unselected package libio-html-perl. 323s Preparing to unpack .../074-libio-html-perl_1.004-2_all.deb ... 323s Unpacking libio-html-perl (1.004-2) ... 323s Selecting previously unselected package liblwp-mediatypes-perl. 323s Preparing to unpack .../075-liblwp-mediatypes-perl_6.04-1_all.deb ... 323s Unpacking liblwp-mediatypes-perl (6.04-1) ... 323s Selecting previously unselected package libhttp-message-perl. 324s Preparing to unpack .../076-libhttp-message-perl_6.36-1_all.deb ... 324s Unpacking libhttp-message-perl (6.36-1) ... 324s Selecting previously unselected package libhttp-cookies-perl. 324s Preparing to unpack .../077-libhttp-cookies-perl_6.10-1_all.deb ... 324s Unpacking libhttp-cookies-perl (6.10-1) ... 324s Selecting previously unselected package libhttp-negotiate-perl. 324s Preparing to unpack .../078-libhttp-negotiate-perl_6.01-1_all.deb ... 324s Unpacking libhttp-negotiate-perl (6.01-1) ... 324s Selecting previously unselected package perl-openssl-defaults:amd64. 324s Preparing to unpack .../079-perl-openssl-defaults_5build2_amd64.deb ... 324s Unpacking perl-openssl-defaults:amd64 (5build2) ... 324s Selecting previously unselected package libnet-ssleay-perl:amd64. 324s Preparing to unpack .../080-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 324s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 324s Selecting previously unselected package libio-socket-ssl-perl. 324s Preparing to unpack .../081-libio-socket-ssl-perl_2.074-2_all.deb ... 324s Unpacking libio-socket-ssl-perl (2.074-2) ... 324s Selecting previously unselected package libnet-http-perl. 324s Preparing to unpack .../082-libnet-http-perl_6.22-1_all.deb ... 324s Unpacking libnet-http-perl (6.22-1) ... 324s Selecting previously unselected package liblwp-protocol-https-perl. 324s Preparing to unpack .../083-liblwp-protocol-https-perl_6.10-1_all.deb ... 324s Unpacking liblwp-protocol-https-perl (6.10-1) ... 324s Selecting previously unselected package libtry-tiny-perl. 324s Preparing to unpack .../084-libtry-tiny-perl_0.31-1_all.deb ... 324s Unpacking libtry-tiny-perl (0.31-1) ... 324s Selecting previously unselected package libwww-robotrules-perl. 324s Preparing to unpack .../085-libwww-robotrules-perl_6.02-1_all.deb ... 324s Unpacking libwww-robotrules-perl (6.02-1) ... 324s Selecting previously unselected package libwww-perl. 324s Preparing to unpack .../086-libwww-perl_6.61-1_all.deb ... 324s Unpacking libwww-perl (6.61-1) ... 324s Selecting previously unselected package patchutils. 324s Preparing to unpack .../087-patchutils_0.4.2-1build2_amd64.deb ... 324s Unpacking patchutils (0.4.2-1build2) ... 324s Selecting previously unselected package wdiff. 324s Preparing to unpack .../088-wdiff_1.2.2-2build3_amd64.deb ... 324s Unpacking wdiff (1.2.2-2build3) ... 324s Selecting previously unselected package devscripts. 324s Preparing to unpack .../089-devscripts_2.22.1ubuntu1_amd64.deb ... 324s Unpacking devscripts (2.22.1ubuntu1) ... 324s Selecting previously unselected package liberror-perl. 324s Preparing to unpack .../090-liberror-perl_0.17029-1_all.deb ... 324s Unpacking liberror-perl (0.17029-1) ... 324s Selecting previously unselected package git-man. 324s Preparing to unpack .../091-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 324s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 324s Selecting previously unselected package git. 324s Preparing to unpack .../092-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 324s Unpacking git (1:2.34.1-1ubuntu1.12) ... 324s Selecting previously unselected package python3-dateutil. 324s Preparing to unpack .../093-python3-dateutil_2.8.1-6_all.deb ... 324s Unpacking python3-dateutil (2.8.1-6) ... 324s Selecting previously unselected package git-buildpackage. 324s Preparing to unpack .../094-git-buildpackage_0.9.25_all.deb ... 324s Unpacking git-buildpackage (0.9.25) ... 324s Selecting previously unselected package libexporter-tiny-perl. 324s Preparing to unpack .../095-libexporter-tiny-perl_1.002002-1_all.deb ... 324s Unpacking libexporter-tiny-perl (1.002002-1) ... 324s Selecting previously unselected package liblist-moreutils-xs-perl. 324s Preparing to unpack .../096-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 324s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 324s Selecting previously unselected package liblist-moreutils-perl. 324s Preparing to unpack .../097-liblist-moreutils-perl_0.430-2_all.deb ... 324s Unpacking liblist-moreutils-perl (0.430-2) ... 324s Selecting previously unselected package python3-debian. 324s Preparing to unpack .../098-python3-debian_0.1.43ubuntu1.1_all.deb ... 324s Unpacking python3-debian (0.1.43ubuntu1.1) ... 324s Selecting previously unselected package python3-gpg. 324s Preparing to unpack .../099-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 324s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 324s Selecting previously unselected package dput. 324s Preparing to unpack .../100-dput_1.1.0ubuntu2.1_all.deb ... 324s Unpacking dput (1.1.0ubuntu2.1) ... 324s Selecting previously unselected package libjson-perl. 324s Preparing to unpack .../101-libjson-perl_4.04000-1_all.deb ... 324s Unpacking libjson-perl (4.04000-1) ... 324s Selecting previously unselected package libtext-glob-perl. 324s Preparing to unpack .../102-libtext-glob-perl_0.11-2_all.deb ... 324s Unpacking libtext-glob-perl (0.11-2) ... 324s Selecting previously unselected package libwww-curl-perl. 324s Preparing to unpack .../103-libwww-curl-perl_4.17-7build2_amd64.deb ... 324s Unpacking libwww-curl-perl (4.17-7build2) ... 324s Selecting previously unselected package libtext-csv-perl. 324s Preparing to unpack .../104-libtext-csv-perl_2.01-1_all.deb ... 324s Unpacking libtext-csv-perl (2.01-1) ... 324s Selecting previously unselected package dgit. 324s Preparing to unpack .../105-dgit_9.15_all.deb ... 324s Unpacking dgit (9.15) ... 324s Selecting previously unselected package libdbi-perl:amd64. 324s Preparing to unpack .../106-libdbi-perl_1.643-3build3_amd64.deb ... 324s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 324s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 324s Preparing to unpack .../107-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 324s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 324s Selecting previously unselected package sqlite3. 324s Preparing to unpack .../108-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 324s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 324s Selecting previously unselected package chiark-utils-bin. 324s Preparing to unpack .../109-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 324s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 324s Selecting previously unselected package dgit-infrastructure. 324s Preparing to unpack .../110-dgit-infrastructure_9.15_all.deb ... 324s Unpacking dgit-infrastructure (9.15) ... 324s Selecting previously unselected package libfaketime:amd64. 324s Preparing to unpack .../111-libfaketime_0.9.8-9_amd64.deb ... 324s Unpacking libfaketime:amd64 (0.9.8-9) ... 324s Selecting previously unselected package faketime. 324s Preparing to unpack .../112-faketime_0.9.8-9_amd64.deb ... 324s Unpacking faketime (0.9.8-9) ... 324s Selecting previously unselected package reprepro. 324s Preparing to unpack .../113-reprepro_5.3.0-1.4_amd64.deb ... 324s Unpacking reprepro (5.3.0-1.4) ... 324s Setting up wdiff (1.2.2-2build3) ... 324s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 324s Setting up libfile-which-perl (1.23-1) ... 324s Setting up libdynaloader-functions-perl (0.003-1.1) ... 324s Setting up libtext-glob-perl (0.11-2) ... 324s Setting up libclass-method-modifiers-perl (2.13-1) ... 324s Setting up libio-pty-perl (1:1.15-2build2) ... 324s Setting up libarchive-zip-perl (1.68-1) ... 324s Setting up libhtml-tagset-perl (3.20-4) ... 324s Setting up libdebhelper-perl (13.6ubuntu1) ... 324s Setting up liblwp-mediatypes-perl (6.04-1) ... 324s Setting up libtry-tiny-perl (0.31-1) ... 324s Setting up perl-openssl-defaults:amd64 (5build2) ... 324s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 324s Setting up bc (1.07.1-3build1) ... 324s Setting up m4 (1.4.18-5ubuntu2) ... 324s Setting up libwww-curl-perl (4.17-7build2) ... 324s Setting up libencode-locale-perl (1.05-1.1) ... 324s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 324s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 324s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 324s Setting up chiark-utils-bin (6.1.2+nmu1) ... 324s Setting up fakeroot (1.28-1ubuntu1) ... 324s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 324s Setting up liberror-perl (0.17029-1) ... 324s Setting up patchutils (0.4.2-1build2) ... 324s Setting up autotools-dev (20220109.1) ... 324s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 324s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 324s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 325s Setting up python3-debian (0.1.43ubuntu1.1) ... 325s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up libmpc3:amd64 (1.2.1-2build1) ... 325s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up libio-html-perl (1.004-2) ... 325s Setting up autopoint (0.21-4ubuntu4) ... 325s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 325s Setting up libipc-run-perl (20200505.0-1) ... 325s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 325s Setting up autoconf (2.71-2) ... 325s Setting up libtimedate-perl (2.3300-2) ... 325s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up dwz (0.14-1build2) ... 325s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 325s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 325s Setting up libjson-perl (4.04000-1) ... 325s Setting up librole-tiny-perl (2.002004-1) ... 325s Setting up debugedit (1:5.0-4build1) ... 325s Setting up libsub-override-perl (0.09-2) ... 325s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 325s Setting up python3-dateutil (2.8.1-6) ... 325s Setting up libsub-quote-perl (2.006006-1) ... 325s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 325s Setting up libexporter-tiny-perl (1.002002-1) ... 325s Setting up libfile-dirlist-perl (0.05-2) ... 325s Setting up libisl23:amd64 (0.24-2build1) ... 325s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 325s Setting up reprepro (5.3.0-1.4) ... 325s Setting up libfile-homedir-perl (1.006-1) ... 325s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up liburi-perl (5.10-1) ... 325s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 325s Setting up libfile-touch-perl (0.12-1) ... 325s Setting up libdbi-perl:amd64 (1.643-3build3) ... 325s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 325s Setting up libfaketime:amd64 (0.9.8-9) ... 325s Setting up libtext-csv-perl (2.01-1) ... 325s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 325s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 325s Setting up automake (1:1.16.5-1.3) ... 325s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 325s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 325s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 325s Setting up faketime (0.9.8-9) ... 325s Setting up libhttp-date-perl (6.05-1) ... 325s Setting up gettext (0.21-4ubuntu4) ... 325s Setting up libfile-listing-perl (6.14-1) ... 325s Setting up liblist-moreutils-perl (0.430-2) ... 325s Setting up libnet-http-perl (6.22-1) ... 325s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 325s Setting up dput (1.1.0ubuntu2.1) ... 325s Setting up intltool-debian (0.35.0+20060710.5) ... 325s Setting up git (1:2.34.1-1ubuntu1.12) ... 325s Setting up dh-strip-nondeterminism (1.13.0-1) ... 325s Setting up libwww-robotrules-perl (6.02-1) ... 325s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 325s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 325s Setting up cpp (4:11.2.0-1ubuntu1) ... 325s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 325s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 325s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 325s Setting up libio-socket-ssl-perl (2.074-2) ... 325s Setting up libhttp-message-perl (6.36-1) ... 325s Setting up libhttp-negotiate-perl (6.01-1) ... 325s Setting up libhttp-cookies-perl (6.10-1) ... 325s Setting up libtool (2.4.6-15build2) ... 325s Setting up po-debconf (1.0.21+nmu1) ... 325s Setting up libhtml-tree-perl (5.07-2) ... 325s Setting up libparams-classify-perl (0.015-1build5) ... 325s Setting up gcc (4:11.2.0-1ubuntu1) ... 325s Setting up dh-autoreconf (20) ... 325s Setting up libmodule-runtime-perl (0.016-1) ... 325s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 325s Setting up dgit-infrastructure (9.15) ... 325s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 325s Setting up libimport-into-perl (1.002005-1) ... 325s Setting up libmoo-perl (2.005004-3) ... 325s Setting up debhelper (13.6ubuntu1) ... 325s Setting up g++ (4:11.2.0-1ubuntu1) ... 325s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 325s Setting up build-essential (12.9ubuntu3) ... 325s Setting up liblwp-protocol-https-perl (6.10-1) ... 325s Setting up libwww-perl (6.61-1) ... 325s Setting up devscripts (2.22.1ubuntu1) ... 325s Setting up git-buildpackage (0.9.25) ... 325s Setting up dgit (9.15) ... 325s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 325s Processing triggers for man-db (2.10.2-1) ... 326s Processing triggers for install-info (6.8-4build1) ... 327s autopkgtest [12:23:41]: test clone-reprepro: [----------------------- 327s ++ set -o pipefail 327s ++ . tests/lib-core 327s ++ . tests/lib-restricts 327s ++ trap ' 327s rc=$? 327s set +x 327s test $rc = 0 || echo " 327s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 327s 327s Most relevant logs are just before assignment rc=$rc 327s Will now do cleanup etc. 327s " 327s set -x 327s set +e 327s pwd 327s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 327s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 327s set -e 327s test $rc = 0 || t-report-failure 327s ' EXIT 327s ++ t-filter-out-git-hyphen-dir 327s ++ local pathent 327s +++ type -p git-rev-parse 327s +++ : 327s ++ pathent= 327s ++ case "$pathent" in 327s ++ return 327s ++ t-set-intree 327s ++ '[' x = x ']' 327s ++ return 327s ++ : -D 327s ++ export DGIT_TEST_DEBUG 327s ++ : x 327s ++ export DGIT_TEST_DEBPUSH_DEBUG 327s ++ : 327s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 327s ++ GIT_COMMITTER_DATE='1530000000 +0100' 327s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 327s ++ GIT_AUTHOR_DATE='1530000000 +0100' 327s ++ export LC_CTYPE=C.UTF-8 327s ++ LC_CTYPE=C.UTF-8 327s ++ unset CDPATH 327s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 327s ++ FILTER_BRANCH_SQUELCH_WARNING=1 327s +++ pwd 327s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 327s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ testname=clone-reprepro 327s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ bpd=.. 327s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 327s ++ '[' x '!=' x ']' 327s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s +++ pwd 327s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ t-set-using-tmp 327s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 327s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 327s ++ export 'DEBFULLNAME=dgit test git user' 327s ++ DEBFULLNAME='dgit test git user' 327s ++ git config --global user.email dgit-test@debian.example.net 327s ++ git config --global user.name 'dgit test git user' 327s ++ git config --global protocol.ext.allow always 327s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 327s ++ env -0 327s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 327s ++ export DEBCHANGE_VENDOR=dpkg 327s ++ DEBCHANGE_VENDOR=dpkg 327s ++ unset VISUAL 327s ++ unset GIT_EDITOR 327s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 327s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 327s ++ cat 327s ++ schroot=build 327s ++ : aq 327s ++ : archive/test-dummy 327s ++ : sid:unstable 327s ++ t-git-config dgit.default.old-dsc-distro test-dummy 327s ++ git config --global dgit.default.old-dsc-distro test-dummy 327s ++ for import in ${autoimport-gnupg} 327s ++ case "$0" in 327s ++ t-setup-import gnupg 327s ++ local setupname=gnupg 327s ++ local setupsrc 327s ++ local lock 327s ++ '[' x = x ']' 327s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 327s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 327s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 327s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 327s cd "$1"; shift 327s setupname="$1"; shift 327s simport="$1"; shift 327s if [ -e "$simport" ]; then exit 0; fi 327s env - "$@" \ 327s "tests/setup/$setupname" 327s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 327s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 327s + shift 327s + setupname=gnupg 327s + shift 327s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 327s + shift 327s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 327s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/clone-reprepro-stderr --stdout=/tmp/autopkgtest.ztMUxl/clone-reprepro-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-reprepro -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-reprepro' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 327s ++ set -o pipefail 327s ++ . tests/lib-core 327s ++ . tests/lib-restricts 327s ++ trap ' 327s rc=$? 327s set +x 327s test $rc = 0 || echo " 327s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 327s 327s Most relevant logs are just before assignment rc=$rc 327s Will now do cleanup etc. 327s " 327s set -x 327s set +e 327s pwd 327s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 327s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 327s set -e 327s test $rc = 0 || t-report-failure 327s ' EXIT 327s ++ t-filter-out-git-hyphen-dir 327s ++ local pathent 327s +++ type -p git-rev-parse 327s +++ : 327s ++ pathent= 327s ++ case "$pathent" in 327s ++ return 327s ++ t-set-intree 327s ++ '[' x = x ']' 327s ++ return 327s ++ : -D 327s ++ export DGIT_TEST_DEBUG 327s ++ : x 327s ++ export DGIT_TEST_DEBPUSH_DEBUG 327s ++ : 327s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 327s ++ GIT_COMMITTER_DATE='1530000000 +0100' 327s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 327s ++ GIT_AUTHOR_DATE='1530000000 +0100' 327s ++ export LC_CTYPE=C.UTF-8 327s ++ LC_CTYPE=C.UTF-8 327s ++ unset CDPATH 327s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 327s ++ FILTER_BRANCH_SQUELCH_WARNING=1 327s +++ pwd 327s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 327s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ testname=gnupg 327s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 327s ++ bpd=.. 327s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 327s ++ '[' x '!=' x ']' 327s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s +++ pwd 327s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ t-set-using-tmp 327s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 327s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 327s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 327s ++ export 'DEBFULLNAME=dgit test git user' 327s ++ DEBFULLNAME='dgit test git user' 327s ++ git config --global user.email dgit-test@debian.example.net 327s ++ git config --global user.name 'dgit test git user' 327s ++ git config --global protocol.ext.allow always 327s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 327s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 327s ++ export DEBCHANGE_VENDOR=dpkg 327s ++ DEBCHANGE_VENDOR=dpkg 327s ++ unset VISUAL 327s ++ unset GIT_EDITOR 327s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 327s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 327s ++ cat 327s ++ schroot=build 327s ++ : aq 327s ++ : archive/test-dummy 327s ++ : sid:unstable 327s ++ t-git-config dgit.default.old-dsc-distro test-dummy 327s ++ git config --global dgit.default.old-dsc-distro test-dummy 327s ++ for import in ${autoimport-gnupg} 327s ++ case "$0" in 327s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 327s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 327s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 327s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 327s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 327s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 327s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 327s + setup=' 327s export GNUPGHOME=$tmp/gnupg 327s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 327s 327s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 327s ssb rsa2048 2013-11-17 [E] 327s 327s sec rsa2048 2014-01-26 [SC] 327s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 327s uid [ultimate] Populus Romanus (test key) 327s ssb rsa2048 2014-01-26 [E] 327s 327s sec rsa2048 2014-01-26 [SC] 327s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 327s uid [ unknown] Hannibal (test key) 327s ssb rsa2048 2014-01-26 [E] 327s 327s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 327s export GNUPGHOME=$tmp/gnupg 327s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 327s 327s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < `0' 328s + git init -q 328s | git config -z --get-regexp --local '.*' 328s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 328s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 328s + git config user.name 'dgit test git user' 328s is_gitattrs_setup: found nothing 328s starting new git history 328s + git config remote.dgit.skipdefaultupdate true 328s | apt-cache -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 328s => `Package: example'... 328s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' --download-only --only-source source example 328s Reading package lists... 328s Need to get 0 B/2908 B of source archives. 328s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable/main example 1.0-1 (dsc) [999 B] 328s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable/main example 1.0-1 (tar) [236 B] 328s Get:3 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable/main example 1.0-1 (tar) [373 B] 328s Get:4 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable/main example 1.0-1 (diff) [1300 B] 328s Download complete and in download only mode 328s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.dsc... 328s get_archive_dsc: Version 1.0-1 328s last upload to archive: NO git hash 328s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 328s => `' 328s previous reference hash= 328s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 328s => `' 328s fetch_from_archive: lastfetch= 328s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 328s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 328s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 328s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0.orig-docs.tar.gz 328s % Total % Received % Xferd Average Speed Time Time Time Current 328s Dload Upload Total Spent Left Speed 328s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 1786k 0 --:--:-- --:--:-- --:--:-- 1786k 328s considering saving example_1.0.orig-docs.tar.gz: linked. 328s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 328s ./example_1.0.orig.tar.gz does not exist, need to fetch 328s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0.orig.tar.gz 328s % Total % Received % Xferd Average Speed Time Time Time Current 328s Dload Upload Total Spent Left Speed 328s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 6622k 0 --:--:-- --:--:-- --:--:-- 6622k 328s considering saving example_1.0.orig.tar.gz: linked. 328s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 328s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 328s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.debian.tar.xz 328s % Total % Received % Xferd Average Speed Time Time Time Current 328s Dload Upload Total Spent Left Speed 328s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 17.9M 0 --:--:-- --:--:-- --:--:-- 17.9M 328s considering saving example_1.0-1.debian.tar.xz: linked. 328s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 328s + chmod -R '+rwX' _unpack-tar 328s CD _unpack-tar 328s | find -name .git -prune -print0 328s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 329s + git add -Af . 329s | git write-tree 329s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 329s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 329s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 329s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 329s CD .. 329s import considering example_1.0.orig.tar.gz Y .gz orig 329s + chmod -R '+rwX' _unpack-tar 329s CD _unpack-tar 329s | find -name .git -prune -print0 329s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 329s + git add -Af . 329s | git write-tree 329s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 329s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 329s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 329s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 329s CD .. 329s import considering example_1.0-1.debian.tar.xz Y .xz (none) 329s + chmod -R '+rwX' _unpack-tar 329s CD _unpack-tar 329s | find -name .git -prune -print0 329s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 329s + git add -Af . 329s | git write-tree 329s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 329s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 329s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 329s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 329s CD .. 329s + dpkg-source --skip-patches -x -- example.dsc 329s dpkg-source: warning: extracting unsigned source package (example.dsc) 329s dpkg-source: info: extracting example in example-1.0 329s dpkg-source: info: unpacking example_1.0.orig.tar.gz 329s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 329s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 329s CD example-1.0 329s | find -name .git -prune -print0 329s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 329s + git add -Af . 329s | git write-tree 329s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 329s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 329s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 329s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 329s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 329s + git add -Af . 329s | git write-tree 329s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 329s import clog search... 329s | dpkg-parsechangelog --format rfc822 --all 329s import clog 1.0-1 package changelog, entry no.1... 329s import clog 1.0-1 vs 1.0... 329s import clog 1.0-1 becomes r1 329s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 329s => `1431548802 +0000' 329s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 329s => `1431548802 +0000' 329s import tartrees authline Ian Jackson 1431548802 +0000 329s import tartrees r1authline Ian Jackson 1431548802 +0000 329s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 329s | git hash-object -w -t commit --stdin 329s => 94c010931d011cbd6c1861bb9d453aa12d826298 329s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 329s | git hash-object -w -t commit --stdin 329s => a5bb1f49c872a76a5d703570fd5352e424719bda 329s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 329s | git hash-object -w -t commit --stdin 329s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 329s import main commit 329s | git hash-object -w -t commit ../commit.tmp 329s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 329s import apply patches... 329s | git hash-object -w -t commit --stdin 329s => 8a6a176760396ad6e2e096974469aa6cf7671956 329s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 329s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 329s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 329s => `1431548802 +0000' 329s + git checkout -q unpa 329s + git update-ref -d refs/heads/patch-queue/unpa 329s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 329s | git rev-parse 'HEAD~0' 329s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 329s | git rev-parse HEAD: 329s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 329s synthesised git commit from .dsc 1.0-1 329s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 329s fetch mergeinfos: 329s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 329s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 329s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s => `' 329s + git reset --hard refs/remotes/dgit/dgit/sid 329s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 329s + bash -ec ' set -o pipefail 329s git ls-tree -r --name-only -z HEAD | '\\' 329s xargs -0r touch -h -r . -- 329s ' 329s dgit ok: ready for work in example 329s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 329s del_lrfetchrefs... 329s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 329s ' 329s + cd example 329s + t-cloned-fetched-good 329s + t-diff-nogit ../extract/example-1.0 . 329s + diff --exclude=.git --exclude=.pc -ruN ../extract/example-1.0 . 329s + t-clean-on-branch dgit/sid 329s + t-output '## dgit/sid' git status -b --porcelain 329s + printf '%s\n' '## dgit/sid' 329s + shift 329s + git status -b --porcelain 329s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 329s + t-refs-same-start 329s + unset t_ref_val 329s + t_ref_names=() 329s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 329s + local g 329s + for g in $* 329s + t-ref-same refs/heads/dgit/sid 329s + local name=refs/heads/dgit/sid 329s + local val 329s ++ t-git-get-ref refs/heads/dgit/sid 329s ++ local ref=refs/heads/dgit/sid 329s ++ case "$ref" in 329s ++ git show-ref -d refs/heads/dgit/sid 329s ++ perl -ne ' 329s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 329s END { print "$x\n" if length $x; } 329s ' 329s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + t-ref-same-val refs/heads/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + local name=refs/heads/dgit/sid 329s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + case "${t_ref_val-unset}" in 329s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + t_ref_names+=("$name") 329s + for g in $* 329s + t-ref-same refs/remotes/dgit/dgit/sid 329s + local name=refs/remotes/dgit/dgit/sid 329s + local val 329s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 329s ++ local ref=refs/remotes/dgit/dgit/sid 329s ++ case "$ref" in 329s ++ git show-ref -d refs/remotes/dgit/dgit/sid 329s ++ perl -ne ' 329s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 329s END { print "$x\n" if length $x; } 329s ' 329s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + t-ref-same-val refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + local name=refs/remotes/dgit/dgit/sid 329s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + case "${t_ref_val-unset}" in 329s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 329s + t_ref_names+=("$name") 329s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 329s + local val 329s + for g in $* 329s ++ t-git-get-ref refs/dgit/unstable 329s ++ local ref=refs/dgit/unstable 329s ++ case "$ref" in 329s ++ git show-ref -d refs/dgit/unstable 329s ++ perl -ne ' 329s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 329s END { print "$x\n" if length $x; } 329s ' 329s ++ test 1 = 1 329s + val= 329s + '[' x '!=' x ']' 329s + for g in $* 329s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 329s ++ local ref=refs/remotes/dgit/dgit/unstable 329s ++ case "$ref" in 329s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 329s ++ perl -ne ' 329s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 329s END { print "$x\n" if length $x; } 329s ' 329s ++ test 1 = 1 329s + val= 329s + '[' x '!=' x ']' 329s + add_pari 329s + local p 329s + local v 329s + local suite=stable 329s + t-archive pari-extra 3-1 329s + t-archive-none pari-extra 329s + t-select-package pari-extra 329s + p=pari-extra 329s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 329s + t-archive-none-reprepro 329s + t-reprepro-setup 329s + local rrinst= 329s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror 329s + local rrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/conf 329s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/conf 329s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 329s + exec 329s + local arch 329s ++ dpkg --print-architecture 329s + arch=amd64 329s + for suitespec in $suitespecs 329s + local suite=sid 329s + local sname=unstable 329s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists 329s + '[' unstable '!=' sid ']' 329s + rm -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists/unstable 329s + ln -s sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists/unstable 329s + cat 329s + for suitespec in $suitespecs 329s + local suite=stable 329s + local sname=stable 329s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists 329s + '[' stable '!=' stable ']' 329s + cat 329s + t-reprepro-regen 329s + local rrinst= 329s + t-reprepro--run export 329s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror 329s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror export 329s + local rrinst= 329s + v=3-1 329s + local dscf=pari-extra_3-1.dsc 329s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 329s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 329s + t-archive-query stable 329s + local suite=stable 329s + local dscf=main/pari-extra_3-1.dsc 329s + t-archive-query-reprepro stable pari-extra 3-1 main/pari-extra_3-1.dsc 329s + local suite=stable 329s + local p=pari-extra 329s + local v=3-1 329s + local dscf=main/pari-extra_3-1.dsc 329s + local rrinst= 329s + t-reprepro-includedsc stable /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc '' 329s + local suite=stable 329s + local dscf=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 329s + local rrinst= 329s + t-reprepro--run includedsc stable /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 329s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror 329s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror includedsc stable /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_3-1.dsc 329s Exporting indices... 329s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 329s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 329s + set -e 329s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 329s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 329s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 329s dpkg-source: info: extracting pari-extra in pari-extra-3 329s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 329s dpkg-source: info: applying pari-extra_3-1.diff.gz 329s + t-dgit fetch unstable,stable 329s + local dgit=dgit 329s + pwd 329s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 329s + : ' 329s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 329s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch unstable,stable 329s | git rev-parse --show-toplevel 329s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 329s | git config -z --get-regexp --local '.*' 329s | git config -z --get-regexp --local '.*' 329s | git config -z --get-regexp --global '.*' 329s | git config -z --get-regexp --system '.*' 329s fork_for_multisuite: unstable stable 329s fetching unstable... 329s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget 329s + apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' update 329s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable InRelease [2083 B] 329s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable InRelease [2083 B] 330s Reading package lists... 330s W: file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 330s release file Codename: sid 330s canonical suite name for unstable is sid 330s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 330s => `0' 330s | apt-cache -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 330s => `Package: example'... 330s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' --download-only --only-source source example 330s Reading package lists... 330s Skipping already downloaded file 'example_1.0.orig-docs.tar.gz' 330s Skipping already downloaded file 'example_1.0.orig.tar.gz' 330s Skipping already downloaded file 'example_1.0-1.debian.tar.xz' 330s Need to get 0 B/999 B of source archives. 330s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror unstable/main example 1.0-1 (dsc) [999 B] 330s Download complete and in download only mode 330s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.0-1.dsc... 330s get_archive_dsc: Version 1.0-1 330s last upload to archive: NO git hash 330s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 330s => `' 330s previous reference hash= 330s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s fetch_from_archive: lastfetch=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 330s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) linked. 330s using existing example_1.0.orig-docs.tar.gz 330s considering saving example_1.0.orig-docs.tar.gz: (File exists) no need. 330s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 330s using existing example_1.0.orig.tar.gz 330s considering saving example_1.0.orig.tar.gz: (File exists) no need. 330s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 330s using existing example_1.0-1.debian.tar.xz 330s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 330s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 330s + chmod -R '+rwX' _unpack-tar 330s CD _unpack-tar 330s | find -name .git -prune -print0 330s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 330s + git add -Af . 330s | git write-tree 330s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 330s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 330s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 330s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 330s CD .. 330s import considering example_1.0.orig.tar.gz Y .gz orig 330s + chmod -R '+rwX' _unpack-tar 330s CD _unpack-tar 330s | find -name .git -prune -print0 330s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 330s + git add -Af . 330s | git write-tree 330s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 330s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 330s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 330s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 330s CD .. 330s import considering example_1.0-1.debian.tar.xz Y .xz (none) 330s + chmod -R '+rwX' _unpack-tar 330s CD _unpack-tar 330s | find -name .git -prune -print0 330s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 330s + git add -Af . 330s | git write-tree 330s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 330s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 330s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 330s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 330s CD .. 330s + dpkg-source --skip-patches -x -- example.dsc 330s dpkg-source: warning: extracting unsigned source package (example.dsc) 330s dpkg-source: info: extracting example in example-1.0 330s dpkg-source: info: unpacking example_1.0.orig.tar.gz 330s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 330s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 330s CD example-1.0 330s | find -name .git -prune -print0 330s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 330s + git add -Af . 330s | git write-tree 330s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 330s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 330s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 330s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 330s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 330s + git add -Af . 330s | git write-tree 330s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 330s import clog search... 330s | dpkg-parsechangelog --format rfc822 --all 330s import clog 1.0-1 package changelog, entry no.1... 330s import clog 1.0-1 vs 1.0... 330s import clog 1.0-1 becomes r1 330s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 330s => `1431548802 +0000' 330s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 330s => `1431548802 +0000' 330s import tartrees authline Ian Jackson 1431548802 +0000 330s import tartrees r1authline Ian Jackson 1431548802 +0000 330s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 330s | git hash-object -w -t commit --stdin 330s => 94c010931d011cbd6c1861bb9d453aa12d826298 330s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 330s | git hash-object -w -t commit --stdin 330s => a5bb1f49c872a76a5d703570fd5352e424719bda 330s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 330s | git hash-object -w -t commit --stdin 330s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 330s import main commit 330s | git hash-object -w -t commit ../commit.tmp 330s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 330s import apply patches... 330s | git hash-object -w -t commit --stdin 330s => 8a6a176760396ad6e2e096974469aa6cf7671956 330s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 330s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 330s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 330s => `1431548802 +0000' 330s + git checkout -q unpa 330s + git update-ref -d refs/heads/patch-queue/unpa 330s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 330s | git rev-parse 'HEAD~0' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s | git rev-parse HEAD: 330s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 330s synthesised git commit from .dsc 1.0-1 330s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 330s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6:debian/changelog 330s | git merge-base 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s fetch mergeinfos: 330s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 dgit client's archive history view 330s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s | git merge-base 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s | git rev-parse '9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6~0' 330s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 330s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 330s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 330s dgit [unstable] ok: fetched into refs/remotes/dgit/dgit/sid 330s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 330s del_lrfetchrefs... 330s multisuite unstable ok (canon=sid) 330s fetching stable... 330s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget 330s + apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' update 330s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror stable InRelease [2084 B] 330s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror stable InRelease [2084 B] 331s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror stable/main Sources [572 B] 331s Reading package lists... 331s W: file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/dists/stable/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 331s release file Codename: stable 331s canonical suite name is stable 331s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 331s => `0' 331s | apt-cache -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#test-dummy' showsrc example 331s W: Unable to locate package example 331s => `' 331s get_archive_dsc: nothing in archive, returning undef 331s no version available from the archive 331s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 331s => `' 331s previous reference hash= 331s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 331s => `' 331s fetch_from_archive: lastfetch= 331s nothing found! 331s dgit [stable]: source package example does not exist in suite stable 331s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 331s del_lrfetchrefs... 331s multisuite stable missing 331s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 331s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 331s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid,stable' 331s => `' 331s multisuite merge check sid 331s multisuite merge this-needed 331s + git update-ref -m 'dgit fetch sid,stable' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 331s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 331s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 331s | git update-ref -m 'dgit fetch' 'refs/remotes/dgit/dgit/sid,stable' 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 331s => `' 331s calculated combined tracking suite sid,stable 331s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 331s ' 331s + t-refs-same-start 331s + unset t_ref_val 331s + t_ref_names=() 331s + t-refs-same refs/remotes/dgit/sid,stable refs/remotes/dgit/sid 331s + local g 331s + for g in $* 331s + t-ref-same refs/remotes/dgit/sid,stable 331s + local name=refs/remotes/dgit/sid,stable 331s + local val 331s ++ t-git-get-ref refs/remotes/dgit/sid,stable 331s ++ local ref=refs/remotes/dgit/sid,stable 331s ++ case "$ref" in 331s ++ git show-ref -d refs/remotes/dgit/sid,stable 331s ++ perl -ne ' 331s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/sid,stable\E(?:\^\{\})?$#; 331s END { print "$x\n" if length $x; } 331s ' 331s ++ test 1 = 1 331s + val= 331s + t-ref-same-val refs/remotes/dgit/sid,stable 331s + local name=refs/remotes/dgit/sid,stable 331s + local val= 331s + case "${t_ref_val-unset}" in 331s + t_ref_val= 331s + t_ref_names+=("$name") 331s + for g in $* 331s + t-ref-same refs/remotes/dgit/sid 331s + local name=refs/remotes/dgit/sid 331s + local val 331s ++ t-git-get-ref refs/remotes/dgit/sid 331s ++ local ref=refs/remotes/dgit/sid 331s ++ case "$ref" in 331s ++ git show-ref -d refs/remotes/dgit/sid 331s ++ perl -ne ' 331s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/sid\E(?:\^\{\})?$#; 331s END { print "$x\n" if length $x; } 331s ' 331s ++ test 1 = 1 331s + val= 331s + t-ref-same-val refs/remotes/dgit/sid 331s + local name=refs/remotes/dgit/sid 331s + local val= 331s + case "${t_ref_val-unset}" in 331s + t_ref_val= 331s + t_ref_names+=("$name") 331s + t-ok 331s + : ======================================== 331s + t-check-only-bpd 331s + '[' .. = .. ']' 331s + return 331s + t-fscks 331s + shopt -s nullglob 331s + for d in $tmp/*/.git $tmp/git/*.git 331s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 331s + t-git-fsck 331s ++ git rev-parse --git-dir 331s + local fsckerrs=.git/dgit-test-fsck.errs 331s + set +e 331s + LC_MESSAGES=C 331s + git fsck --no-dangling --strict 331s + tee .git/dgit-test-fsck.errs 331s + ps='0 0' 331s + set -e 331s + local pats 331s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 331s + test '0 0' = '0 0' 331s + pats+=(-e 'notice: HEAD points to an unborn branch') 331s + pats+=(-e 'notice: No default references') 331s + set +e 331s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 331s + rc=1 331s + set -e 331s + case $rc in 331s + t-save-artifacts 331s + artifacts=/tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts 331s + '[' x/tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts = x ']' 331s + '[' xtmp = x ']' 331s + GZIP=-1v 331s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/clone-reprepro-artifacts/clone-reprepro.tar.gz '--exclude=*.tar' . 331s gzip: warning: GZIP environment variable is deprecated; use an alias or script 331s 92.5% 331s + echo ok. 331s ok. 331s + rc=0 331s + set +x 331s + set +e 331s + pwd 331s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 331s + '[' x '!=' x ']' 331s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 331s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 331s + set -e 331s + test 0 = 0 331s autopkgtest [12:23:45]: test clone-reprepro: -----------------------] 331s clone-reprepro PASS 331s autopkgtest [12:23:45]: test clone-reprepro: - - - - - - - - - - results - - - - - - - - - - 331s autopkgtest [12:23:45]: test downstream-gitless: preparing testbed 331s Reading package lists... 332s Building dependency tree... 332s Reading state information... 332s Starting pkgProblemResolver with broken count: 0 332s Starting 2 pkgProblemResolver with broken count: 0 332s Done 332s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 332s autopkgtest [12:23:46]: test downstream-gitless: [----------------------- 333s ++ set -o pipefail 333s ++ . tests/lib-core 333s ++ . tests/lib-restricts 333s ++ trap ' 333s rc=$? 333s set +x 333s test $rc = 0 || echo " 333s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 333s 333s Most relevant logs are just before assignment rc=$rc 333s Will now do cleanup etc. 333s " 333s set -x 333s set +e 333s pwd 333s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 333s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 333s set -e 333s test $rc = 0 || t-report-failure 333s ' EXIT 333s ++ t-filter-out-git-hyphen-dir 333s ++ local pathent 333s +++ type -p git-rev-parse 333s +++ : 333s ++ pathent= 333s ++ case "$pathent" in 333s ++ return 333s ++ t-set-intree 333s ++ '[' x = x ']' 333s ++ return 333s ++ : -D 333s ++ export DGIT_TEST_DEBUG 333s ++ : x 333s ++ export DGIT_TEST_DEBPUSH_DEBUG 333s ++ : 333s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 333s ++ GIT_COMMITTER_DATE='1530000000 +0100' 333s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 333s ++ GIT_AUTHOR_DATE='1530000000 +0100' 333s ++ export LC_CTYPE=C.UTF-8 333s ++ LC_CTYPE=C.UTF-8 333s ++ unset CDPATH 333s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 333s ++ FILTER_BRANCH_SQUELCH_WARNING=1 333s +++ pwd 333s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 333s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ testname=downstream-gitless 333s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ bpd=.. 333s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 333s ++ '[' x '!=' x ']' 333s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s +++ pwd 333s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ t-set-using-tmp 333s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 333s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 333s ++ export 'DEBFULLNAME=dgit test git user' 333s ++ DEBFULLNAME='dgit test git user' 333s ++ git config --global user.email dgit-test@debian.example.net 333s ++ git config --global user.name 'dgit test git user' 333s ++ git config --global protocol.ext.allow always 333s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 333s ++ env -0 333s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 333s ++ export DEBCHANGE_VENDOR=dpkg 333s ++ DEBCHANGE_VENDOR=dpkg 333s ++ unset VISUAL 333s ++ unset GIT_EDITOR 333s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 333s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 333s ++ cat 333s ++ schroot=build 333s ++ : aq 333s ++ : archive/test-dummy 333s ++ : sid:unstable 333s ++ t-git-config dgit.default.old-dsc-distro test-dummy 333s ++ git config --global dgit.default.old-dsc-distro test-dummy 333s ++ for import in ${autoimport-gnupg} 333s ++ case "$0" in 333s ++ t-setup-import gnupg 333s ++ local setupname=gnupg 333s ++ local setupsrc 333s ++ local lock 333s ++ '[' x = x ']' 333s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 333s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 333s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 333s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 333s cd "$1"; shift 333s setupname="$1"; shift 333s simport="$1"; shift 333s if [ -e "$simport" ]; then exit 0; fi 333s env - "$@" \ 333s "tests/setup/$setupname" 333s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 333s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 333s + shift 333s + setupname=gnupg 333s + shift 333s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 333s + shift 333s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 333s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/downstream-gitless-stderr --stdout=/tmp/autopkgtest.ztMUxl/downstream-gitless-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/downstream-gitless -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/downstream-gitless' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 333s ++ set -o pipefail 333s ++ . tests/lib-core 333s ++ . tests/lib-restricts 333s ++ trap ' 333s rc=$? 333s set +x 333s test $rc = 0 || echo " 333s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 333s 333s Most relevant logs are just before assignment rc=$rc 333s Will now do cleanup etc. 333s " 333s set -x 333s set +e 333s pwd 333s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 333s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 333s set -e 333s test $rc = 0 || t-report-failure 333s ' EXIT 333s ++ t-filter-out-git-hyphen-dir 333s ++ local pathent 333s +++ type -p git-rev-parse 333s +++ : 333s ++ pathent= 333s ++ case "$pathent" in 333s ++ return 333s ++ t-set-intree 333s ++ '[' x = x ']' 333s ++ return 333s ++ : -D 333s ++ export DGIT_TEST_DEBUG 333s ++ : x 333s ++ export DGIT_TEST_DEBPUSH_DEBUG 333s ++ : 333s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 333s ++ GIT_COMMITTER_DATE='1530000000 +0100' 333s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 333s ++ GIT_AUTHOR_DATE='1530000000 +0100' 333s ++ export LC_CTYPE=C.UTF-8 333s ++ LC_CTYPE=C.UTF-8 333s ++ unset CDPATH 333s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 333s ++ FILTER_BRANCH_SQUELCH_WARNING=1 333s +++ pwd 333s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 333s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ testname=gnupg 333s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 333s ++ bpd=.. 333s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 333s ++ '[' x '!=' x ']' 333s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s +++ pwd 333s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ t-set-using-tmp 333s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 333s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 333s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 333s ++ export 'DEBFULLNAME=dgit test git user' 333s ++ DEBFULLNAME='dgit test git user' 333s ++ git config --global user.email dgit-test@debian.example.net 333s ++ git config --global user.name 'dgit test git user' 333s ++ git config --global protocol.ext.allow always 333s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 333s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 333s ++ export DEBCHANGE_VENDOR=dpkg 333s ++ DEBCHANGE_VENDOR=dpkg 333s ++ unset VISUAL 333s ++ unset GIT_EDITOR 333s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 333s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 333s ++ cat 333s ++ schroot=build 333s ++ : aq 333s ++ : archive/test-dummy 333s ++ : sid:unstable 333s ++ t-git-config dgit.default.old-dsc-distro test-dummy 333s ++ git config --global dgit.default.old-dsc-distro test-dummy 333s ++ for import in ${autoimport-gnupg} 333s ++ case "$0" in 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 333s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 333s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 333s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 333s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 333s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 333s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 333s + setup=' 333s export GNUPGHOME=$tmp/gnupg 333s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 333s 333s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 333s ssb rsa2048 2013-11-17 [E] 333s 333s sec rsa2048 2014-01-26 [SC] 333s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 333s uid [ultimate] Populus Romanus (test key) 333s ssb rsa2048 2014-01-26 [E] 333s 333s sec rsa2048 2014-01-26 [SC] 333s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 333s uid [ unknown] Hannibal (test key) 333s ssb rsa2048 2014-01-26 [E] 333s 333s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 333s export GNUPGHOME=$tmp/gnupg 333s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 333s 333s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + t-aq-archive-updated new example 333s + local suite=new 333s + local p=example 333s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + perl -wne ' 333s use JSON; 333s use strict; 333s our @v; 333s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 333s push @v, { 333s "version" => "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 333s + cat 333s + jsondelim=' },' 333s + for suitespec in $suitespecs 333s + local suite=stable 333s + local sname=stable 333s + t-aq-archive-updated stable example 333s + local suite=stable 333s + local p=example 333s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 333s + perl -wne ' 333s use JSON; 333s use strict; 333s our @v; 333s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 333s push @v, { 333s "version" => "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + t-aq-archive-updated new example 333s + local suite=new 333s + local p=example 333s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + perl -wne ' 333s use JSON; 333s use strict; 333s our @v; 333s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 333s push @v, { 333s "version" => "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + ln -sf stable /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 333s + cat 333s + jsondelim=' },' 333s + for suitespec in $suitespecs 333s + local suite=testing 333s + local sname=testing 333s + t-aq-archive-updated testing example 333s + local suite=testing 333s + local p=example 333s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 333s + perl -wne ' 333s use JSON; 333s use strict; 333s our @v; 333s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 333s push @v, { 333s "version" => "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + t-aq-archive-updated new example 333s + local suite=new 333s + local p=example 333s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 333s + perl -wne ' 333s use JSON; 333s use strict; 333s our @v; 333s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 333s push @v, { 333s "version" => "$1", 333s "sha256sum" => "$2", 333s "component" => "$3", 333s "filename" => "$4", 333s }; 333s END { 333s my $json = JSON->new->canonical(); 333s print $json->encode(\@v) or die $!; 333s } 333s ' 333s + ln -sf testing /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 333s + cat 333s + jsondelim=' },' 333s + cat 333s + t-git-none 333s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 333s + set -e 333s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 333s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 333s + t-worktree 1.0 333s + rm -rf example 333s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0 333s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 333s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 333s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 333s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 333s + cd example 333s + git show-ref --verify --quiet refs/heads/master 333s + cd .. 333s + cd example 333s + revision=1 333s + echo ancestor 333s + git add which 333s + t-commit Ancestor '' stable 333s + local msg=Ancestor 333s + v=1.1 333s + t-debchange --force-distribution -v1.1 --distribution stable Ancestor 333s + DEBEMAIL=dgit-tests@example.org 333s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.1 --distribution stable Ancestor 333s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.1 --distribution stable Ancestor 333s debchange warning: Unable to determine if stable is a valid Ubuntu release. 333s libdistro-info-perl is not installed, Debian release names are not known. 333s libdistro-info-perl is not installed, Ubuntu release names are not known. 333s + git add debian/changelog 333s + debcommit 333s git commit -m Ancestor 333s [master 6ede489] Ancestor 333s 2 files changed, 7 insertions(+) 333s create mode 100644 which 333s + revision=2 333s + push-to master stable 333s + t-refs-same-start 333s + unset t_ref_val 333s + t_ref_names=() 333s + t-ref-head 333s + local val 333s ++ git rev-parse HEAD 333s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 333s + t-ref-same-val HEAD 6ede489d12a09dd148d1f78c3a2179afddf29843 333s + local name=HEAD 333s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 333s + case "${t_ref_val-unset}" in 333s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 333s + t_ref_names+=("$name") 333s + t-dgit build 333s + local dgit=dgit 333s + pwd 333s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 333s + : ' 333s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 333s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 333s | git rev-parse --show-toplevel 333s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 333s | git config -z --get-regexp --local '.*' 333s | git config -z --get-regexp --local '.*' 333s | git config -z --get-regexp --global '.*' 333s | git config -z --get-regexp --system '.*' 333s format , quilt mode linear 333s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 333s warning: could not open directory 'debian/source/': No such file or directory 333s => `' 333s + git diff --quiet HEAD 333s massage split -F. 333s massage done 3 -b. 333s format , quilt mode linear 333s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 333s warning: could not open directory 'debian/source/': No such file or directory 333s => `' 333s + git diff --quiet HEAD 333s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 333s dpkg-buildpackage: info: source package example 333s dpkg-buildpackage: info: source version 1.1 333s dpkg-buildpackage: info: source distribution stable 333s dpkg-buildpackage: info: source changed by dgit test git user 333s fakeroot debian/rules clean 333s EXAMPLE RULES TARGET clean 333s dh_clean 333s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 334s | git clean -dn 334s => `' 334s | git rev-parse 'HEAD~0' 334s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 334s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 334s CD work 334s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 334s + git reset -q --hard 6ede489d12a09dd148d1f78c3a2179afddf29843 334s CD .. 334s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 334s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 334s dpkg-source: warning: source directory 'work' is not - 'example-1.1' 334s dpkg-source: info: using source format '1.0' 334s dpkg-source: info: building example in example_1.1.tar.gz 334s dpkg-source: info: building example in example_1.1.dsc 334s CD work 334s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 334s package seems new, not specifying -v 334s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.1_source.changes dpkg-genchanges -S 334s dpkg-genchanges: info: including full source code in upload 334s CD .. 334s moving example_1.1.dsc, example_1.1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 334s renaming (Files) example_1.1.tar.gz 334s renaming (dsc) example_1.1.dsc 334s renaming (changes) example_1.1_source.changes 334s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 334s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 334s dpkg-buildpackage: info: source package example 334s dpkg-buildpackage: info: source version 1.1 334s dpkg-buildpackage: info: source distribution stable 334s dpkg-buildpackage: info: source changed by dgit test git user 334s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 334s dpkg-buildpackage: info: host architecture amd64 334s debian/rules build 334s EXAMPLE RULES TARGET build 334s fakeroot debian/rules binary 334s EXAMPLE RULES TARGET binary 334s dh_install 334s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 334s dh_gencontrol 334s dh_builddeb 334s dpkg-deb: building package 'example' in '../example_1.1_all.deb'. 334s dpkg-genbuildinfo --build=binary -O../example_1.1_amd64.buildinfo 334s dpkg-genchanges --build=binary -O../example_1.1_amd64.changes 334s dpkg-genchanges: info: binary-only upload (no source code included) 334s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 334s dpkg-buildpackage: info: binary-only upload (no source included) 334s CD .. 334s + mergechanges -f example_1.1_source.changes example_1.1_amd64.changes 335s dgit ok: build successful, results in example_1.1_multi.changes 335s 335s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 335s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 335s ' 335s + t-dgit push --new stable 335s + local dgit=dgit 335s + pwd 335s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 335s + : ' 335s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 335s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 335s | git rev-parse --show-toplevel 335s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 335s | git config -z --get-regexp --local '.*' 335s | git config -z --get-regexp --local '.*' 335s | git config -z --get-regexp --global '.*' 335s | git config -z --get-regexp --system '.*' 335s format , quilt mode linear 335s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 335s warning: could not open directory 'debian/source/': No such file or directory 335s => `' 335s + git diff --quiet HEAD 335s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 335s canonical suite name is stable 335s actually entering push 335s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 335s => `0' 335s + git config remote.dgit.skipdefaultupdate true 335s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 335s get_archive_dsc: nothing in archive, returning undef 335s no version available from the archive 335s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 335s => `' 335s previous reference hash= 335s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 335s => `' 335s fetch_from_archive: lastfetch= 335s nothing found! 335s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 335s + git check-ref-format archive/test-dummy/1.1 335s | git symbolic-ref -q HEAD 335s => `refs/heads/master' 335s | git rev-parse 'HEAD~0' 335s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 335s ffq_prev_branchinfo branch current refs/heads/master 335s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 335s => `' 335s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 335s => `' 335s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 335s warning: could not open directory 'debian/source/': No such file or directory 335s => `' 335s + git diff --quiet HEAD 335s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.1' 335s => `' 335s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 335s checking that example_1.1.dsc corresponds to HEAD 335s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.1.dsc 335s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.1.dsc) 335s dpkg-source: info: extracting example in example-1.1 335s dpkg-source: info: unpacking example_1.1.tar.gz 335s CD example-1.1 335s | find -name .git -prune -print0 335s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 335s + git add -Af . 335s | git write-tree 335s => `f903521c6c60a705864da4c6c6716f8fbff08fcf' 335s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 335s + git diff --quiet f903521c6c60a705864da4c6c6716f8fbff08fcf 6ede489d12a09dd148d1f78c3a2179afddf29843 335s files_compare_inputs example_1.1.dsc 335s files_compare_inputs example_1.1.dsc Checksums-Sha256 335s files_compare_inputs example_1.1.dsc Checksums-Sha256 example_1.1.tar.gz 335s files_compare_inputs example_1.1.dsc Checksums-Sha1 335s files_compare_inputs example_1.1.dsc Checksums-Sha1 example_1.1.tar.gz 335s files_compare_inputs example_1.1.dsc Files 335s files_compare_inputs example_1.1.dsc Files example_1.1.tar.gz 335s files_compare_inputs example_1.1_multi.changes 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.dsc 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.tar.gz 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_all.deb 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_amd64.buildinfo 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.dsc 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.tar.gz 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_all.deb 335s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_amd64.buildinfo 335s files_compare_inputs example_1.1_multi.changes Files 335s files_compare_inputs example_1.1_multi.changes Files example_1.1.dsc 335s files_compare_inputs example_1.1_multi.changes Files example_1.1.tar.gz 335s files_compare_inputs example_1.1_multi.changes Files example_1.1_all.deb 335s files_compare_inputs example_1.1_multi.changes Files example_1.1_amd64.buildinfo 335s checking origs needed (1.1)... 335s checking origs needed placement 'devel extra'... 335s origs example_1.1.tar.gz | 34b381ab0da452e877e28d6c39cc00da 758 example_1.1.tar.gz 335s ../example_1.1_multi.changes already has appropriate .orig(s) (if any) 335s push_tagwants: $VAR1 = [ 335s '1.1', 335s '6ede489d12a09dd148d1f78c3a2179afddf29843', 335s undef, 335s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 335s ]; 335s $VAR2 = [ 335s { 335s 'Tfn' => sub { "DUMMY" }, 335s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 335s 'Tag' => 'archive/test-dummy/1.1', 335s 'TfSuffix' => '', 335s 'TagFn' => sub { "DUMMY" }, 335s 'View' => 'dgit' 335s }, 335s { 335s 'Tfn' => sub { "DUMMY" }, 335s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 335s 'Tag' => 'test-dummy/1.1', 335s 'TfSuffix' => '-dgit', 335s 'TagFn' => sub { "DUMMY" }, 335s 'View' => 'dgit' 335s } 335s ]; 335s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 335s => `1530000000 +0000' 335s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 335s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 335s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 335s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 335s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 335s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 335s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 335s => `65f3306326426656cf76596731634df803e54ca5' 335s + git verify-tag 65f3306326426656cf76596731634df803e54ca5 335s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 335s gpg: Signature made Mon Mar 31 12:23:48 2025 UTC 335s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 335s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 335s gpg: WARNING: This key is not certified with a trusted signature! 335s gpg: There is no indication that the signature belongs to the owner. 335s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 335s + git update-ref refs/tags/archive/test-dummy/1.1 65f3306326426656cf76596731634df803e54ca5 335s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 335s => `fef24af37f82b5d8a0f8ee83188af5756ddf403f' 335s + git verify-tag fef24af37f82b5d8a0f8ee83188af5756ddf403f 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s gpg: Signature made Mon Mar 31 12:23:48 2025 UTC 336s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 336s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 336s gpg: WARNING: This key is not certified with a trusted signature! 336s gpg: There is no indication that the signature belongs to the owner. 336s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 336s + git update-ref refs/tags/test-dummy/1.1 fef24af37f82b5d8a0f8ee83188af5756ddf403f 336s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 336s => `0' 336s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 336s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6ede489d12a09dd148d1f78c3a2179afddf29843:refs/dgit/stable refs/tags/archive/test-dummy/1.1 refs/tags/test-dummy/1.1 336s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 336s * [new reference] 6ede489d12a09dd148d1f78c3a2179afddf29843 -> refs/dgit/stable 336s * [new tag] archive/test-dummy/1.1 -> archive/test-dummy/1.1 336s * [new tag] test-dummy/1.1 -> test-dummy/1.1 336s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.1_multi.changes 336s signfile dsc ../example_1.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s 336s signfile buildinfo ../example_1.1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s 336s fixup_changes dsc ../example_1.1.dsc ../example_1.1_multi.changes 336s fixup_changes buildinfo ../example_1.1_amd64.buildinfo ../example_1.1_multi.changes 336s signfile changes ../example_1.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s 336s Successfully signed dsc, buildinfo, changes files 336s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.1_multi.changes 336s gpg: ../example_1.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 336s gpg: ../example_1.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 336s D: Setting host argument. 336s Checking signature on .changes 336s Checking signature on .dsc 336s Uploading to test-dummy (via local to localhost): 336s Successfully uploaded packages. 336s dgit ok: pushed and uploaded 1.1 336s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 336s del_lrfetchrefs... 336s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 336s ' 336s + t-pushed-good master stable 336s + local branch=master 336s + local suite=stable 336s + t-refs-same refs/heads/master 336s + local g 336s + for g in $* 336s + t-ref-same refs/heads/master 336s + local name=refs/heads/master 336s + local val 336s ++ t-git-get-ref refs/heads/master 336s ++ local ref=refs/heads/master 336s ++ case "$ref" in 336s ++ git show-ref -d refs/heads/master 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val refs/heads/master 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=refs/heads/master 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s + t-pushed-good-core 336s + t-ref-dsc-dgit 336s + t-incoming-dsc 336s + local dsc=example_1.1.dsc 336s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 336s + local val 336s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc Dgit 336s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 336s ++ local field=Dgit 336s ++ perl -e ' 336s use Dpkg::Control::Hash; 336s my $h = new Dpkg::Control::Hash allow_pgp=>1; 336s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc"); 336s my $val = $h->{"Dgit"},"\n"; 336s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc Dgit" unless defined $val; 336s print $val,"\n"; 336s ' 336s + val='6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 336s ++ perl -e ' 336s $_=shift @ARGV; 336s die "Dgit $_ ?" unless m/^\w+\b/; 336s print $&,"\n" or die $!; 336s ' '6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s ++ t-v-tag 336s ++ echo refs/tags/archive/test-dummy/1.1 336s + t-refs-same refs/tags/archive/test-dummy/1.1 refs/remotes/dgit/dgit/stable 336s + local g 336s + for g in $* 336s + t-ref-same refs/tags/archive/test-dummy/1.1 336s + local name=refs/tags/archive/test-dummy/1.1 336s + local val 336s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 336s ++ local ref=refs/tags/archive/test-dummy/1.1 336s ++ case "$ref" in 336s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=refs/tags/archive/test-dummy/1.1 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s + for g in $* 336s + t-ref-same refs/remotes/dgit/dgit/stable 336s + local name=refs/remotes/dgit/dgit/stable 336s + local val 336s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 336s ++ local ref=refs/remotes/dgit/dgit/stable 336s ++ case "$ref" in 336s ++ git show-ref -d refs/remotes/dgit/dgit/stable 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=refs/remotes/dgit/dgit/stable 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 336s + local val 336s + for g in $* 336s ++ t-git-get-ref refs/heads/dgit/unstable 336s ++ local ref=refs/heads/dgit/unstable 336s ++ case "$ref" in 336s ++ git show-ref -d refs/heads/dgit/unstable 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s ++ test 1 = 1 336s + val= 336s + '[' x '!=' x ']' 336s + for g in $* 336s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 336s ++ local ref=refs/remotes/dgit/dgit/unstable 336s ++ case "$ref" in 336s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s ++ test 1 = 1 336s + val= 336s + '[' x '!=' x ']' 336s + set -e 336s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 336s ++ t-v-tag 336s ++ echo refs/tags/archive/test-dummy/1.1 336s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.1 336s + local g 336s + for g in $* 336s + t-ref-same refs/dgit/stable 336s + local name=refs/dgit/stable 336s + local val 336s ++ t-git-get-ref refs/dgit/stable 336s ++ local ref=refs/dgit/stable 336s ++ case "$ref" in 336s ++ git show-ref -d refs/dgit/stable 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val refs/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=refs/dgit/stable 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s + for g in $* 336s + t-ref-same refs/tags/archive/test-dummy/1.1 336s + local name=refs/tags/archive/test-dummy/1.1 336s + local val 336s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 336s ++ local ref=refs/tags/archive/test-dummy/1.1 336s ++ case "$ref" in 336s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 336s + local name=refs/tags/archive/test-dummy/1.1 336s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 336s + t_ref_names+=("$name") 336s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 336s + t-refs-notexist refs/dgit/unstable 336s + local val 336s + for g in $* 336s ++ t-git-get-ref refs/dgit/unstable 336s ++ local ref=refs/dgit/unstable 336s ++ case "$ref" in 336s ++ git show-ref -d refs/dgit/unstable 336s ++ perl -ne ' 336s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 336s END { print "$x\n" if length $x; } 336s ' 336s ++ test 1 = 1 336s + val= 336s + '[' x '!=' x ']' 336s ++ t-v-tag 336s ++ echo refs/tags/archive/test-dummy/1.1 336s + git verify-tag refs/tags/archive/test-dummy/1.1 336s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 336s gpg: Signature made Mon Mar 31 12:23:48 2025 UTC 336s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 336s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 336s gpg: WARNING: This key is not certified with a trusted signature! 336s gpg: There is no indication that the signature belongs to the owner. 336s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 336s + t-archive-process-incoming stable 336s + local suite=stable 336s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 336s + t-archive-query stable 336s + local suite=stable 336s + local dscf=main/example_1.1.dsc 336s + t-archive-query-aq stable example 1.1 main/example_1.1.dsc 336s + local suite=stable 336s + local p=example 336s + local v=1.1 336s + local dscf=main/example_1.1.dsc 336s + local sha 336s ++ sha256sum 336s + sha='08ef6ff7612933187c4582661e727f6ab09fe5c282ad27500e3e44875678fc91 -' 336s + echo '1.1 08ef6ff7612933187c4582661e727f6ab09fe5c282ad27500e3e44875678fc91 main/example_1.1.dsc' 336s + t-aq-archive-updated stable example 336s + local suite=stable 336s + local p=example 336s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 336s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 336s + perl -wne ' 336s use JSON; 336s use strict; 336s our @v; 336s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 336s push @v, { 336s "version" => "$1", 336s "sha256sum" => "$2", 336s "component" => "$3", 336s "filename" => "$4", 336s }; 336s END { 336s my $json = JSON->new->canonical(); 336s print $json->encode(\@v) or die $!; 336s } 336s ' 336s + git checkout -b stable 336s Switched to a new branch 'stable' 336s + echo stable 336s + git add which 336s + t-commit Stable '' stable 336s + local msg=Stable 336s + v=1.2 336s + t-debchange --force-distribution -v1.2 --distribution stable Stable 336s + DEBEMAIL=dgit-tests@example.org 336s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.2 --distribution stable Stable 336s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.2 --distribution stable Stable 336s debchange warning: Unable to determine if stable is a valid Ubuntu release. 336s libdistro-info-perl is not installed, Debian release names are not known. 336s libdistro-info-perl is not installed, Ubuntu release names are not known. 336s + git add debian/changelog 336s + debcommit 336s git commit -m Stable 336s [stable d5060e0] Stable 336s 2 files changed, 7 insertions(+), 1 deletion(-) 336s + revision=3 336s + push-to stable stable 336s + t-refs-same-start 336s + unset t_ref_val 336s + t_ref_names=() 336s + t-ref-head 336s + local val 336s ++ git rev-parse HEAD 336s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 336s + t-ref-same-val HEAD d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 336s + local name=HEAD 336s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 336s + case "${t_ref_val-unset}" in 336s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 336s + t_ref_names+=("$name") 336s + t-dgit build 336s + local dgit=dgit 336s + pwd 336s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 336s + : ' 336s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 336s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 337s | git rev-parse --show-toplevel 337s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 337s | git config -z --get-regexp --local '.*' 337s | git config -z --get-regexp --local '.*' 337s | git config -z --get-regexp --global '.*' 337s | git config -z --get-regexp --system '.*' 337s format , quilt mode linear 337s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 337s warning: could not open directory 'debian/source/': No such file or directory 337s => `' 337s + git diff --quiet HEAD 337s massage split -F. 337s massage done 3 -b. 337s format , quilt mode linear 337s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 337s warning: could not open directory 'debian/source/': No such file or directory 337s => `' 337s + git diff --quiet HEAD 337s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 337s dpkg-buildpackage: info: source package example 337s dpkg-buildpackage: info: source version 1.2 337s dpkg-buildpackage: info: source distribution stable 337s dpkg-buildpackage: info: source changed by dgit test git user 337s fakeroot debian/rules clean 337s EXAMPLE RULES TARGET clean 337s dh_clean 337s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 337s | git clean -dn 337s => `' 337s | git rev-parse 'HEAD~0' 337s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 337s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 337s CD work 337s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 337s + git reset -q --hard d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 337s CD .. 337s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 337s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 337s dpkg-source: warning: source directory 'work' is not - 'example-1.2' 337s dpkg-source: info: using source format '1.0' 337s dpkg-source: info: building example in example_1.2.tar.gz 337s dpkg-source: info: building example in example_1.2.dsc 337s CD work 337s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 337s changelog will contain changes since 1.1 337s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.2_source.changes dpkg-genchanges -S -v1.1 337s dpkg-genchanges: info: including full source code in upload 337s CD .. 337s moving example_1.2.dsc, example_1.2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 337s renaming (Files) example_1.2.tar.gz 337s renaming (dsc) example_1.2.dsc 337s renaming (changes) example_1.2_source.changes 337s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 337s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v1.1 337s dpkg-buildpackage: info: source package example 337s dpkg-buildpackage: info: source version 1.2 337s dpkg-buildpackage: info: source distribution stable 337s dpkg-buildpackage: info: source changed by dgit test git user 337s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 337s dpkg-buildpackage: info: host architecture amd64 337s debian/rules build 337s EXAMPLE RULES TARGET build 337s fakeroot debian/rules binary 337s EXAMPLE RULES TARGET binary 337s dh_install 337s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 337s dh_gencontrol 338s dh_builddeb 338s dpkg-deb: building package 'example' in '../example_1.2_all.deb'. 338s dpkg-genbuildinfo --build=binary -O../example_1.2_amd64.buildinfo 338s dpkg-genchanges --build=binary -v1.1 -O../example_1.2_amd64.changes 338s dpkg-genchanges: info: binary-only upload (no source code included) 338s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 338s dpkg-buildpackage: info: binary-only upload (no source included) 338s CD .. 338s + mergechanges -f example_1.2_source.changes example_1.2_amd64.changes 338s dgit ok: build successful, results in example_1.2_multi.changes 338s 338s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 338s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 338s ' 338s + t-dgit push --new stable 338s + local dgit=dgit 338s + pwd 338s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 338s + : ' 338s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 338s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 338s | git rev-parse --show-toplevel 338s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 338s | git config -z --get-regexp --local '.*' 338s | git config -z --get-regexp --local '.*' 338s | git config -z --get-regexp --global '.*' 338s | git config -z --get-regexp --system '.*' 338s format , quilt mode linear 338s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 338s warning: could not open directory 'debian/source/': No such file or directory 338s => `' 338s + git diff --quiet HEAD 338s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 338s canonical suite name is stable 338s actually entering push 338s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 338s => `1' 338s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/stable dgit-rewrite/map 338s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/stable)|(?:refs/dgit\-rewrite\/map) 338s git_lrfetch_sane iteration 0 338s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/stable refs/dgit-rewrite/map 338s => 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit/stable 338s => 65f3306326426656cf76596731634df803e54ca5 refs/tags/archive/test-dummy/1.1 338s => fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/tags/test-dummy/1.1 338s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/stable:refs/dgit-fetch/test-dummy/dgit/stable 338s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/stable:refs/dgit-fetch/test-dummy/dgit/stable' 338s | git for-each-ref refs/dgit-fetch/test-dummy 338s |> 6ede489d12a09dd148d1f78c3a2179afddf29843 commit refs/dgit-fetch/test-dummy/dgit/stable 338s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 338s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 338s git_lrfetch_sane: tidying any old suite lrfetchrefs 338s | git for-each-ref refs/dgit-fetch/stable 338s git_lrfetch_sane: git fetch --no-insane emulation complete 338s $VAR1 = { 338s 'refs/dgit-fetch/test-dummy/dgit/stable' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 338s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'fef24af37f82b5d8a0f8ee83188af5756ddf403f', 338s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5' 338s }; 338s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 338s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/tags/archive/test-dummy/1.1 338s currently refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 338s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/tags/test-dummy/1.1 338s currently refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 338s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 338s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 338s offered refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 338s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 338s offered refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 338s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 338s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.1.dsc... 338s get_archive_dsc: Version 1.1 338s last upload to archive: specified git info (test-dummy) 338s GCF| git cat-file --batch 338s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 338s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 338s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 338s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 338s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 338s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 338s previous reference hash=6ede489d12a09dd148d1f78c3a2179afddf29843 338s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 339s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s fetch mergeinfos: 339s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 339s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 339s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s + git update-ref -m 'dgit fetch stable' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 339s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 339s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 339s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 339s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 339s + git check-ref-format archive/test-dummy/1.2 339s | git symbolic-ref -q HEAD 339s => `refs/heads/stable' 339s | git rev-parse 'HEAD~0' 339s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 339s ffq_prev_branchinfo branch current refs/heads/stable 339s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/stable' 339s => `' 339s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/stable' 339s => `' 339s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 339s warning: could not open directory 'debian/source/': No such file or directory 339s => `' 339s + git diff --quiet HEAD 339s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 339s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 339s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.2' 339s => `' 339s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 339s checking that example_1.2.dsc corresponds to HEAD 339s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.2.dsc 339s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.2.dsc) 339s dpkg-source: info: extracting example in example-1.2 339s dpkg-source: info: unpacking example_1.2.tar.gz 339s CD example-1.2 339s | find -name .git -prune -print0 339s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 339s + git add -Af . 339s | git write-tree 339s => `04b91662ca770360f547964817f3b334b327a676' 339s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 339s + git diff --quiet 04b91662ca770360f547964817f3b334b327a676 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s files_compare_inputs example_1.2.dsc 339s files_compare_inputs example_1.2.dsc Checksums-Sha256 339s files_compare_inputs example_1.2.dsc Checksums-Sha256 example_1.2.tar.gz 339s files_compare_inputs example_1.2.dsc Checksums-Sha1 339s files_compare_inputs example_1.2.dsc Checksums-Sha1 example_1.2.tar.gz 339s files_compare_inputs example_1.2.dsc Files 339s files_compare_inputs example_1.2.dsc Files example_1.2.tar.gz 339s files_compare_inputs example_1.2_multi.changes 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.dsc 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.tar.gz 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_all.deb 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_amd64.buildinfo 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.dsc 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.tar.gz 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_all.deb 339s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_amd64.buildinfo 339s files_compare_inputs example_1.2_multi.changes Files 339s files_compare_inputs example_1.2_multi.changes Files example_1.2.dsc 339s files_compare_inputs example_1.2_multi.changes Files example_1.2.tar.gz 339s files_compare_inputs example_1.2_multi.changes Files example_1.2_all.deb 339s files_compare_inputs example_1.2_multi.changes Files example_1.2_amd64.buildinfo 339s checking origs needed (1.2)... 339s checking origs needed placement 'devel extra'... 339s origs example_1.2.tar.gz | 22390cb6d6349ce2058dce0e096ce3c4 765 example_1.2.tar.gz 339s ../example_1.2_multi.changes already has appropriate .orig(s) (if any) 339s push_tagwants: $VAR1 = [ 339s '1.2', 339s 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 339s undef, 339s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 339s ]; 339s $VAR2 = [ 339s { 339s 'Tfn' => sub { "DUMMY" }, 339s 'TagFn' => sub { "DUMMY" }, 339s 'View' => 'dgit', 339s 'TfSuffix' => '', 339s 'Tag' => 'archive/test-dummy/1.2', 339s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 339s }, 339s { 339s 'View' => 'dgit', 339s 'TagFn' => sub { "DUMMY" }, 339s 'Tfn' => sub { "DUMMY" }, 339s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 339s 'Tag' => 'test-dummy/1.2', 339s 'TfSuffix' => '-dgit' 339s } 339s ]; 339s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 339s => `1530000000 +0000' 339s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 339s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 339s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 339s => `0f49ccc6a2e9e93e1c2d414065de1285215161dd' 339s + git verify-tag 0f49ccc6a2e9e93e1c2d414065de1285215161dd 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s gpg: Signature made Mon Mar 31 12:23:52 2025 UTC 339s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 339s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 339s gpg: WARNING: This key is not certified with a trusted signature! 339s gpg: There is no indication that the signature belongs to the owner. 339s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 339s + git update-ref refs/tags/archive/test-dummy/1.2 0f49ccc6a2e9e93e1c2d414065de1285215161dd 339s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 339s => `5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72' 339s + git verify-tag 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s gpg: Signature made Mon Mar 31 12:23:52 2025 UTC 339s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 339s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 339s gpg: WARNING: This key is not certified with a trusted signature! 339s gpg: There is no indication that the signature belongs to the owner. 339s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 339s + git update-ref refs/tags/test-dummy/1.2 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 339s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 339s => `1' 339s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git d5060e0b2c66d5369fd8d88a498efa3d9f2706e0:refs/dgit/stable refs/tags/archive/test-dummy/1.2 refs/tags/test-dummy/1.2 339s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 339s 6ede489..d5060e0 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 -> refs/dgit/stable 339s * [new tag] archive/test-dummy/1.2 -> archive/test-dummy/1.2 339s * [new tag] test-dummy/1.2 -> test-dummy/1.2 339s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.2_multi.changes 339s signfile dsc ../example_1.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s 339s signfile buildinfo ../example_1.2_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s 339s fixup_changes dsc ../example_1.2.dsc ../example_1.2_multi.changes 339s fixup_changes buildinfo ../example_1.2_amd64.buildinfo ../example_1.2_multi.changes 339s signfile changes ../example_1.2_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 339s 339s Successfully signed dsc, buildinfo, changes files 339s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.2_multi.changes 339s gpg: ../example_1.2_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 339s gpg: ../example_1.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 339s D: Setting host argument. 339s Checking signature on .changes 339s Checking signature on .dsc 339s Uploading to test-dummy (via local to localhost): 339s Successfully uploaded packages. 339s dgit ok: pushed and uploaded 1.2 339s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 339s del_lrfetchrefs... 339s del_lrfetchrefs: 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit-fetch/test-dummy/dgit/stable 339s del_lrfetchrefs: 65f3306326426656cf76596731634df803e54ca5 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 339s del_lrfetchrefs: fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 339s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 339s ' 339s + t-pushed-good stable stable 339s + local branch=stable 339s + local suite=stable 339s + t-refs-same refs/heads/stable 339s + local g 339s + for g in $* 339s + t-ref-same refs/heads/stable 339s + local name=refs/heads/stable 339s + local val 339s ++ t-git-get-ref refs/heads/stable 339s ++ local ref=refs/heads/stable 339s ++ case "$ref" in 339s ++ git show-ref -d refs/heads/stable 339s ++ perl -ne ' 339s $x = $1 if m#^(\w+) \Qrefs/heads/stable\E(?:\^\{\})?$#; 339s END { print "$x\n" if length $x; } 339s ' 339s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s + t-ref-same-val refs/heads/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s + local name=refs/heads/stable 339s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s + case "${t_ref_val-unset}" in 339s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 339s + t_ref_names+=("$name") 339s + t-pushed-good-core 339s + t-ref-dsc-dgit 339s + t-incoming-dsc 339s + local dsc=example_1.2.dsc 339s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 339s + local val 339s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc Dgit 339s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 339s ++ local field=Dgit 339s ++ perl -e ' 339s use Dpkg::Control::Hash; 339s my $h = new Dpkg::Control::Hash allow_pgp=>1; 339s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc"); 339s my $val = $h->{"Dgit"},"\n"; 339s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc Dgit" unless defined $val; 339s print $val,"\n"; 339s ' 340s + val='d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 340s ++ perl -e ' 340s $_=shift @ARGV; 340s die "Dgit $_ ?" unless m/^\w+\b/; 340s print $&,"\n" or die $!; 340s ' 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 340s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 340s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t_ref_names+=("$name") 340s ++ t-v-tag 340s ++ echo refs/tags/archive/test-dummy/1.2 340s + t-refs-same refs/tags/archive/test-dummy/1.2 refs/remotes/dgit/dgit/stable 340s + local g 340s + for g in $* 340s + t-ref-same refs/tags/archive/test-dummy/1.2 340s + local name=refs/tags/archive/test-dummy/1.2 340s + local val 340s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 340s ++ local ref=refs/tags/archive/test-dummy/1.2 340s ++ case "$ref" in 340s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + local name=refs/tags/archive/test-dummy/1.2 340s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t_ref_names+=("$name") 340s + for g in $* 340s + t-ref-same refs/remotes/dgit/dgit/stable 340s + local name=refs/remotes/dgit/dgit/stable 340s + local val 340s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 340s ++ local ref=refs/remotes/dgit/dgit/stable 340s ++ case "$ref" in 340s ++ git show-ref -d refs/remotes/dgit/dgit/stable 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t-ref-same-val refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + local name=refs/remotes/dgit/dgit/stable 340s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t_ref_names+=("$name") 340s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 340s + local val 340s + for g in $* 340s ++ t-git-get-ref refs/heads/dgit/unstable 340s ++ local ref=refs/heads/dgit/unstable 340s ++ case "$ref" in 340s ++ git show-ref -d refs/heads/dgit/unstable 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s ++ test 1 = 1 340s + val= 340s + '[' x '!=' x ']' 340s + for g in $* 340s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 340s ++ local ref=refs/remotes/dgit/dgit/unstable 340s ++ case "$ref" in 340s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s ++ test 1 = 1 340s + val= 340s + '[' x '!=' x ']' 340s + set -e 340s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 340s ++ t-v-tag 340s ++ echo refs/tags/archive/test-dummy/1.2 340s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.2 340s + local g 340s + for g in $* 340s + t-ref-same refs/dgit/stable 340s + local name=refs/dgit/stable 340s + local val 340s ++ t-git-get-ref refs/dgit/stable 340s ++ local ref=refs/dgit/stable 340s ++ case "$ref" in 340s ++ git show-ref -d refs/dgit/stable 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t-ref-same-val refs/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + local name=refs/dgit/stable 340s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t_ref_names+=("$name") 340s + for g in $* 340s + t-ref-same refs/tags/archive/test-dummy/1.2 340s + local name=refs/tags/archive/test-dummy/1.2 340s + local val 340s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 340s ++ local ref=refs/tags/archive/test-dummy/1.2 340s ++ case "$ref" in 340s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + local name=refs/tags/archive/test-dummy/1.2 340s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 340s + t_ref_names+=("$name") 340s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 340s + t-refs-notexist refs/dgit/unstable 340s + local val 340s + for g in $* 340s ++ t-git-get-ref refs/dgit/unstable 340s ++ local ref=refs/dgit/unstable 340s ++ case "$ref" in 340s ++ git show-ref -d refs/dgit/unstable 340s ++ perl -ne ' 340s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 340s END { print "$x\n" if length $x; } 340s ' 340s ++ test 1 = 1 340s + val= 340s + '[' x '!=' x ']' 340s ++ t-v-tag 340s ++ echo refs/tags/archive/test-dummy/1.2 340s + git verify-tag refs/tags/archive/test-dummy/1.2 340s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 340s gpg: Signature made Mon Mar 31 12:23:52 2025 UTC 340s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 340s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 340s gpg: WARNING: This key is not certified with a trusted signature! 340s gpg: There is no indication that the signature belongs to the owner. 340s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 340s + t-archive-process-incoming stable 340s + local suite=stable 340s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 340s + t-archive-query stable 340s + local suite=stable 340s + local dscf=main/example_1.2.dsc 340s + t-archive-query-aq stable example 1.2 main/example_1.2.dsc 340s + local suite=stable 340s + local p=example 340s + local v=1.2 340s + local dscf=main/example_1.2.dsc 340s + local sha 340s ++ sha256sum 340s + sha='e1a0b69d06db7bbf96d3e448c6487620831f0c9c5fa60a8610e02f61a0ef387c -' 340s + echo '1.2 e1a0b69d06db7bbf96d3e448c6487620831f0c9c5fa60a8610e02f61a0ef387c main/example_1.2.dsc' 340s + t-aq-archive-updated stable example 340s + local suite=stable 340s + local p=example 340s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 340s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 340s + perl -wne ' 340s use JSON; 340s use strict; 340s our @v; 340s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 340s push @v, { 340s "version" => "$1", 340s "sha256sum" => "$2", 340s "component" => "$3", 340s "filename" => "$4", 340s }; 340s END { 340s my $json = JSON->new->canonical(); 340s print $json->encode(\@v) or die $!; 340s } 340s ' 340s + git checkout master 340s Switched to branch 'master' 340s + majorv=2 340s + revision=0 340s + echo sid 340s + git add which 340s + t-commit Sid 340s + local msg=Sid 340s + v=2.0 340s + t-debchange --force-distribution -v2.0 --distribution unstable Sid 340s + DEBEMAIL=dgit-tests@example.org 340s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.0 --distribution unstable Sid 340s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.0 --distribution unstable Sid 340s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 340s libdistro-info-perl is not installed, Debian release names are not known. 340s libdistro-info-perl is not installed, Ubuntu release names are not known. 340s + git add debian/changelog 340s + debcommit 340s git commit -m Sid 340s [master 1c97ddd] Sid 340s 2 files changed, 7 insertions(+), 1 deletion(-) 340s + revision=1 340s + push-to master sid 340s + t-refs-same-start 340s + unset t_ref_val 340s + t_ref_names=() 340s + t-ref-head 340s + local val 340s ++ git rev-parse HEAD 340s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 340s + t-ref-same-val HEAD 1c97ddd6759afae0eea88cf10027c6cba8866ea1 340s + local name=HEAD 340s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 340s + case "${t_ref_val-unset}" in 340s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 340s + t_ref_names+=("$name") 340s + t-dgit build 340s + local dgit=dgit 340s + pwd 340s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 340s + : ' 340s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 340s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 340s | git rev-parse --show-toplevel 340s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 340s | git config -z --get-regexp --local '.*' 340s | git config -z --get-regexp --local '.*' 340s | git config -z --get-regexp --global '.*' 340s | git config -z --get-regexp --system '.*' 340s format , quilt mode linear 340s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 340s warning: could not open directory 'debian/source/': No such file or directory 340s => `' 340s + git diff --quiet HEAD 340s massage split -F. 340s massage done 3 -b. 340s format , quilt mode linear 340s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 340s warning: could not open directory 'debian/source/': No such file or directory 340s => `' 340s + git diff --quiet HEAD 340s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 340s dpkg-buildpackage: info: source package example 340s dpkg-buildpackage: info: source version 2.0 340s dpkg-buildpackage: info: source distribution unstable 340s dpkg-buildpackage: info: source changed by dgit test git user 340s fakeroot debian/rules clean 340s EXAMPLE RULES TARGET clean 340s dh_clean 340s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 340s | git clean -dn 340s => `' 340s | git rev-parse 'HEAD~0' 340s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 340s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 340s CD work 340s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 340s + git reset -q --hard 1c97ddd6759afae0eea88cf10027c6cba8866ea1 340s CD .. 340s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 340s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 340s dpkg-source: warning: source directory 'work' is not - 'example-2.0' 340s dpkg-source: info: using source format '1.0' 340s dpkg-source: info: building example in example_2.0.tar.gz 340s dpkg-source: info: building example in example_2.0.dsc 340s CD work 340s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 340s package seems new, not specifying -v 340s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0_source.changes dpkg-genchanges -S 340s dpkg-genchanges: info: including full source code in upload 340s CD .. 340s moving example_2.0.dsc, example_2.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 340s renaming (Files) example_2.0.tar.gz 340s renaming (dsc) example_2.0.dsc 340s renaming (changes) example_2.0_source.changes 340s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 340s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 340s dpkg-buildpackage: info: source package example 340s dpkg-buildpackage: info: source version 2.0 340s dpkg-buildpackage: info: source distribution unstable 340s dpkg-buildpackage: info: source changed by dgit test git user 340s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 340s dpkg-buildpackage: info: host architecture amd64 341s debian/rules build 341s EXAMPLE RULES TARGET build 341s fakeroot debian/rules binary 341s EXAMPLE RULES TARGET binary 341s dh_install 341s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 341s dh_gencontrol 341s dh_builddeb 341s dpkg-deb: building package 'example' in '../example_2.0_all.deb'. 341s dpkg-genbuildinfo --build=binary -O../example_2.0_amd64.buildinfo 341s dpkg-genchanges --build=binary -O../example_2.0_amd64.changes 341s dpkg-genchanges: info: binary-only upload (no source code included) 341s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 341s dpkg-buildpackage: info: binary-only upload (no source included) 341s CD .. 341s + mergechanges -f example_2.0_source.changes example_2.0_amd64.changes 341s dgit ok: build successful, results in example_2.0_multi.changes 341s 341s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 341s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 341s ' 341s + t-dgit push --new sid 341s + local dgit=dgit 341s + pwd 341s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 341s + : ' 341s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 341s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 342s | git rev-parse --show-toplevel 342s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 342s | git config -z --get-regexp --local '.*' 342s | git config -z --get-regexp --local '.*' 342s | git config -z --get-regexp --global '.*' 342s | git config -z --get-regexp --system '.*' 342s format , quilt mode linear 342s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 342s warning: could not open directory 'debian/source/': No such file or directory 342s => `' 342s + git diff --quiet HEAD 342s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 342s canonical suite name for unstable is sid 342s actually entering push 342s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 342s => `1' 342s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 342s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 342s git_lrfetch_sane iteration 0 342s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 342s => 65f3306326426656cf76596731634df803e54ca5 refs/tags/archive/test-dummy/1.1 342s => 0f49ccc6a2e9e93e1c2d414065de1285215161dd refs/tags/archive/test-dummy/1.2 342s => fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/tags/test-dummy/1.1 342s => 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 refs/tags/test-dummy/1.2 342s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* 342s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' 342s | git for-each-ref refs/dgit-fetch/test-dummy 342s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 342s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 342s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 342s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 342s git_lrfetch_sane: tidying any old suite lrfetchrefs 342s | git for-each-ref refs/dgit-fetch/sid 342s git_lrfetch_sane: git fetch --no-insane emulation complete 342s $VAR1 = { 342s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5', 342s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'fef24af37f82b5d8a0f8ee83188af5756ddf403f', 342s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72', 342s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '0f49ccc6a2e9e93e1c2d414065de1285215161dd' 342s }; 342s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 342s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/tags/archive/test-dummy/1.1 342s currently refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 342s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/tags/archive/test-dummy/1.2 342s currently refs/tags/archive/test-dummy/1.2=0f49ccc6a2e9e93e1c2d414065de1285215161dd 342s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/tags/test-dummy/1.1 342s currently refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 342s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/tags/test-dummy/1.2 342s currently refs/tags/test-dummy/1.2=5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 342s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 342s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 342s offered refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 342s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 342s offered refs/tags/archive/test-dummy/1.2=0f49ccc6a2e9e93e1c2d414065de1285215161dd 342s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 342s offered refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 342s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 342s offered refs/tags/test-dummy/1.2=5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 342s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 342s get_archive_dsc: nothing in archive, returning undef 342s no version available from the archive 342s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 342s => `' 342s previous reference hash= 342s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 342s => `' 342s fetch_from_archive: lastfetch= 342s nothing found! 342s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 342s + git check-ref-format archive/test-dummy/2.0 342s | git symbolic-ref -q HEAD 342s => `refs/heads/master' 342s | git rev-parse 'HEAD~0' 342s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 342s ffq_prev_branchinfo branch current refs/heads/master 342s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 342s => `' 342s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 342s => `' 342s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 342s warning: could not open directory 'debian/source/': No such file or directory 342s => `' 342s + git diff --quiet HEAD 342s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0' 342s => `' 342s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 342s checking that example_2.0.dsc corresponds to HEAD 342s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.dsc 342s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.dsc) 342s dpkg-source: info: extracting example in example-2.0 342s dpkg-source: info: unpacking example_2.0.tar.gz 342s CD example-2.0 342s | find -name .git -prune -print0 342s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 342s + git add -Af . 342s | git write-tree 342s => `18c935f7d9e9d6f4e8c714dba79cea37f4a6c413' 342s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 342s + git diff --quiet 18c935f7d9e9d6f4e8c714dba79cea37f4a6c413 1c97ddd6759afae0eea88cf10027c6cba8866ea1 342s files_compare_inputs example_2.0.dsc 342s files_compare_inputs example_2.0.dsc Checksums-Sha256 342s files_compare_inputs example_2.0.dsc Checksums-Sha256 example_2.0.tar.gz 342s files_compare_inputs example_2.0.dsc Checksums-Sha1 342s files_compare_inputs example_2.0.dsc Checksums-Sha1 example_2.0.tar.gz 342s files_compare_inputs example_2.0.dsc Files 342s files_compare_inputs example_2.0.dsc Files example_2.0.tar.gz 342s files_compare_inputs example_2.0_multi.changes 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.dsc 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.tar.gz 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_all.deb 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_amd64.buildinfo 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.dsc 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.tar.gz 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_all.deb 342s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_amd64.buildinfo 342s files_compare_inputs example_2.0_multi.changes Files 342s files_compare_inputs example_2.0_multi.changes Files example_2.0.dsc 342s files_compare_inputs example_2.0_multi.changes Files example_2.0.tar.gz 342s files_compare_inputs example_2.0_multi.changes Files example_2.0_all.deb 342s files_compare_inputs example_2.0_multi.changes Files example_2.0_amd64.buildinfo 342s checking origs needed (2.0)... 342s checking origs needed placement 'devel extra'... 342s origs example_2.0.tar.gz | e99199f6be70638923c1fd68d14d7f9c 763 example_2.0.tar.gz 342s ../example_2.0_multi.changes already has appropriate .orig(s) (if any) 342s push_tagwants: $VAR1 = [ 342s '2.0', 342s '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 342s undef, 342s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 342s ]; 342s $VAR2 = [ 342s { 342s 'View' => 'dgit', 342s 'Tag' => 'archive/test-dummy/2.0', 342s 'TagFn' => sub { "DUMMY" }, 342s 'TfSuffix' => '', 342s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 342s 'Tfn' => sub { "DUMMY" } 342s }, 342s { 342s 'Tag' => 'test-dummy/2.0', 342s 'View' => 'dgit', 342s 'TagFn' => sub { "DUMMY" }, 342s 'TfSuffix' => '-dgit', 342s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 342s 'Tfn' => sub { "DUMMY" } 342s } 342s ]; 342s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 342s => `1530000000 +0000' 342s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 342s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 342s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 342s => `4c75ff42ae5362904d89ac5df671f62019f62b7f' 342s + git verify-tag 4c75ff42ae5362904d89ac5df671f62019f62b7f 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s gpg: Signature made Mon Mar 31 12:23:55 2025 UTC 342s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 342s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 342s gpg: WARNING: This key is not certified with a trusted signature! 342s gpg: There is no indication that the signature belongs to the owner. 342s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 342s + git update-ref refs/tags/archive/test-dummy/2.0 4c75ff42ae5362904d89ac5df671f62019f62b7f 342s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 342s => `ab129be336336126c19013e292508ea31311d478' 342s + git verify-tag ab129be336336126c19013e292508ea31311d478 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s gpg: Signature made Mon Mar 31 12:23:55 2025 UTC 342s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 342s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 342s gpg: WARNING: This key is not certified with a trusted signature! 342s gpg: There is no indication that the signature belongs to the owner. 342s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 342s + git update-ref refs/tags/test-dummy/2.0 ab129be336336126c19013e292508ea31311d478 342s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 342s => `1' 342s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 1c97ddd6759afae0eea88cf10027c6cba8866ea1:refs/dgit/sid refs/tags/archive/test-dummy/2.0 refs/tags/test-dummy/2.0 342s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 342s * [new reference] 1c97ddd6759afae0eea88cf10027c6cba8866ea1 -> refs/dgit/sid 342s * [new tag] archive/test-dummy/2.0 -> archive/test-dummy/2.0 342s * [new tag] test-dummy/2.0 -> test-dummy/2.0 342s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 342s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0_multi.changes 342s signfile dsc ../example_2.0.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s 342s signfile buildinfo ../example_2.0_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s 342s fixup_changes dsc ../example_2.0.dsc ../example_2.0_multi.changes 342s fixup_changes buildinfo ../example_2.0_amd64.buildinfo ../example_2.0_multi.changes 342s signfile changes ../example_2.0_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 342s 342s Successfully signed dsc, buildinfo, changes files 342s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0_multi.changes 343s gpg: ../example_2.0_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 343s gpg: ../example_2.0.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 343s D: Setting host argument. 343s Checking signature on .changes 343s Checking signature on .dsc 343s Uploading to test-dummy (via local to localhost): 343s Successfully uploaded packages. 343s dgit ok: pushed and uploaded 2.0 343s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 343s del_lrfetchrefs... 343s del_lrfetchrefs: 65f3306326426656cf76596731634df803e54ca5 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 343s del_lrfetchrefs: 0f49ccc6a2e9e93e1c2d414065de1285215161dd refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 343s del_lrfetchrefs: fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 343s del_lrfetchrefs: 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 343s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 343s ' 343s + t-pushed-good master sid 343s + local branch=master 343s + local suite=sid 343s + t-refs-same refs/heads/master 343s + local g 343s + for g in $* 343s + t-ref-same refs/heads/master 343s + local name=refs/heads/master 343s + local val 343s ++ t-git-get-ref refs/heads/master 343s ++ local ref=refs/heads/master 343s ++ case "$ref" in 343s ++ git show-ref -d refs/heads/master 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val refs/heads/master 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=refs/heads/master 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s + t-pushed-good-core 343s + t-ref-dsc-dgit 343s + t-incoming-dsc 343s + local dsc=example_2.0.dsc 343s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 343s + local val 343s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc Dgit 343s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 343s ++ local field=Dgit 343s ++ perl -e ' 343s use Dpkg::Control::Hash; 343s my $h = new Dpkg::Control::Hash allow_pgp=>1; 343s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc"); 343s my $val = $h->{"Dgit"},"\n"; 343s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc Dgit" unless defined $val; 343s print $val,"\n"; 343s ' 343s + val='1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 343s ++ perl -e ' 343s $_=shift @ARGV; 343s die "Dgit $_ ?" unless m/^\w+\b/; 343s print $&,"\n" or die $!; 343s ' '1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s ++ t-v-tag 343s ++ echo refs/tags/archive/test-dummy/2.0 343s + t-refs-same refs/tags/archive/test-dummy/2.0 refs/remotes/dgit/dgit/sid 343s + local g 343s + for g in $* 343s + t-ref-same refs/tags/archive/test-dummy/2.0 343s + local name=refs/tags/archive/test-dummy/2.0 343s + local val 343s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 343s ++ local ref=refs/tags/archive/test-dummy/2.0 343s ++ case "$ref" in 343s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=refs/tags/archive/test-dummy/2.0 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s + for g in $* 343s + t-ref-same refs/remotes/dgit/dgit/sid 343s + local name=refs/remotes/dgit/dgit/sid 343s + local val 343s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 343s ++ local ref=refs/remotes/dgit/dgit/sid 343s ++ case "$ref" in 343s ++ git show-ref -d refs/remotes/dgit/dgit/sid 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=refs/remotes/dgit/dgit/sid 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 343s + local val 343s + for g in $* 343s ++ t-git-get-ref refs/heads/dgit/unstable 343s ++ local ref=refs/heads/dgit/unstable 343s ++ case "$ref" in 343s ++ git show-ref -d refs/heads/dgit/unstable 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s ++ test 1 = 1 343s + val= 343s + '[' x '!=' x ']' 343s + for g in $* 343s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 343s ++ local ref=refs/remotes/dgit/dgit/unstable 343s ++ case "$ref" in 343s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s ++ test 1 = 1 343s + val= 343s + '[' x '!=' x ']' 343s + set -e 343s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 343s ++ t-v-tag 343s ++ echo refs/tags/archive/test-dummy/2.0 343s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.0 343s + local g 343s + for g in $* 343s + t-ref-same refs/dgit/sid 343s + local name=refs/dgit/sid 343s + local val 343s ++ t-git-get-ref refs/dgit/sid 343s ++ local ref=refs/dgit/sid 343s ++ case "$ref" in 343s ++ git show-ref -d refs/dgit/sid 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val refs/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=refs/dgit/sid 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s + for g in $* 343s + t-ref-same refs/tags/archive/test-dummy/2.0 343s + local name=refs/tags/archive/test-dummy/2.0 343s + local val 343s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 343s ++ local ref=refs/tags/archive/test-dummy/2.0 343s ++ case "$ref" in 343s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + local name=refs/tags/archive/test-dummy/2.0 343s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 343s + t_ref_names+=("$name") 343s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 343s + t-refs-notexist refs/dgit/unstable 343s + local val 343s + for g in $* 343s ++ t-git-get-ref refs/dgit/unstable 343s ++ local ref=refs/dgit/unstable 343s ++ case "$ref" in 343s ++ git show-ref -d refs/dgit/unstable 343s ++ perl -ne ' 343s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 343s END { print "$x\n" if length $x; } 343s ' 343s ++ test 1 = 1 343s + val= 343s + '[' x '!=' x ']' 343s ++ t-v-tag 343s ++ echo refs/tags/archive/test-dummy/2.0 343s + git verify-tag refs/tags/archive/test-dummy/2.0 343s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 343s gpg: Signature made Mon Mar 31 12:23:55 2025 UTC 343s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 343s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 343s gpg: WARNING: This key is not certified with a trusted signature! 343s gpg: There is no indication that the signature belongs to the owner. 343s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 343s + t-archive-process-incoming sid 343s + local suite=sid 343s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 343s + t-archive-query sid 343s + local suite=sid 343s + local dscf=main/example_2.0.dsc 343s + t-archive-query-aq sid example 2.0 main/example_2.0.dsc 343s + local suite=sid 343s + local p=example 343s + local v=2.0 343s + local dscf=main/example_2.0.dsc 343s + local sha 343s ++ sha256sum 343s + sha='67e3b9fb8eb21620bf4adc2eac56f43b2ec510f5727dd9b4a38567a38ac8c5f1 -' 343s + echo '2.0 67e3b9fb8eb21620bf4adc2eac56f43b2ec510f5727dd9b4a38567a38ac8c5f1 main/example_2.0.dsc' 343s + t-aq-archive-updated sid example 343s + local suite=sid 343s + local p=example 343s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 343s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 343s + perl -wne ' 343s use JSON; 343s use strict; 343s our @v; 343s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 343s push @v, { 343s "version" => "$1", 343s "sha256sum" => "$2", 343s "component" => "$3", 343s "filename" => "$4", 343s }; 343s END { 343s my $json = JSON->new->canonical(); 343s print $json->encode(\@v) or die $!; 343s } 343s ' 343s + echo sid-again 343s + git add which 343s + t-commit Sid 343s + local msg=Sid 343s + v=2.1 343s + t-debchange --force-distribution -v2.1 --distribution unstable Sid 343s + DEBEMAIL=dgit-tests@example.org 343s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.1 --distribution unstable Sid 343s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.1 --distribution unstable Sid 343s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 343s libdistro-info-perl is not installed, Debian release names are not known. 343s libdistro-info-perl is not installed, Ubuntu release names are not known. 343s + git add debian/changelog 343s + debcommit 343s git commit -m Sid 343s [master d5d72bd] Sid 343s 2 files changed, 7 insertions(+) 343s + revision=2 343s + push-to master sid 343s + t-refs-same-start 343s + unset t_ref_val 343s + t_ref_names=() 343s + t-ref-head 343s + local val 343s ++ git rev-parse HEAD 343s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 343s + t-ref-same-val HEAD d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 343s + local name=HEAD 343s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 343s + case "${t_ref_val-unset}" in 343s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 343s + t_ref_names+=("$name") 343s + t-dgit build 343s + local dgit=dgit 343s + pwd 343s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 343s + : ' 343s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 343s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 343s | git rev-parse --show-toplevel 343s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 343s | git config -z --get-regexp --local '.*' 343s | git config -z --get-regexp --local '.*' 343s | git config -z --get-regexp --global '.*' 343s | git config -z --get-regexp --system '.*' 343s format , quilt mode linear 343s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 343s warning: could not open directory 'debian/source/': No such file or directory 343s => `' 343s + git diff --quiet HEAD 343s massage split -F. 343s massage done 3 -b. 343s format , quilt mode linear 343s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 343s warning: could not open directory 'debian/source/': No such file or directory 343s => `' 343s + git diff --quiet HEAD 343s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 343s dpkg-buildpackage: info: source package example 343s dpkg-buildpackage: info: source version 2.1 343s dpkg-buildpackage: info: source distribution unstable 343s dpkg-buildpackage: info: source changed by dgit test git user 343s fakeroot debian/rules clean 343s EXAMPLE RULES TARGET clean 343s dh_clean 343s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 343s | git clean -dn 343s => `' 343s | git rev-parse 'HEAD~0' 343s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 343s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 343s CD work 343s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 343s + git reset -q --hard d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 343s CD .. 343s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 343s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 343s dpkg-source: warning: source directory 'work' is not - 'example-2.1' 343s dpkg-source: info: using source format '1.0' 343s dpkg-source: info: building example in example_2.1.tar.gz 343s dpkg-source: info: building example in example_2.1.dsc 343s CD work 343s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 343s changelog will contain changes since 2.0 343s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.1_source.changes dpkg-genchanges -S -v2.0 343s dpkg-genchanges: info: including full source code in upload 343s CD .. 343s moving example_2.1.dsc, example_2.1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 343s renaming (Files) example_2.1.tar.gz 343s renaming (dsc) example_2.1.dsc 343s renaming (changes) example_2.1_source.changes 343s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 343s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v2.0 343s dpkg-buildpackage: info: source package example 343s dpkg-buildpackage: info: source version 2.1 343s dpkg-buildpackage: info: source distribution unstable 343s dpkg-buildpackage: info: source changed by dgit test git user 343s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 343s dpkg-buildpackage: info: host architecture amd64 344s debian/rules build 344s EXAMPLE RULES TARGET build 344s fakeroot debian/rules binary 344s EXAMPLE RULES TARGET binary 344s dh_install 344s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 344s dh_gencontrol 344s dh_builddeb 344s dpkg-deb: building package 'example' in '../example_2.1_all.deb'. 344s dpkg-genbuildinfo --build=binary -O../example_2.1_amd64.buildinfo 344s dpkg-genchanges --build=binary -v2.0 -O../example_2.1_amd64.changes 344s dpkg-genchanges: info: binary-only upload (no source code included) 344s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 344s dpkg-buildpackage: info: binary-only upload (no source included) 344s CD .. 344s + mergechanges -f example_2.1_source.changes example_2.1_amd64.changes 345s dgit ok: build successful, results in example_2.1_multi.changes 345s 345s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 345s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 345s ' 345s + t-dgit push --new sid 345s + local dgit=dgit 345s + pwd 345s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 345s + : ' 345s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 345s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 345s | git rev-parse --show-toplevel 345s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 345s | git config -z --get-regexp --local '.*' 345s | git config -z --get-regexp --local '.*' 345s | git config -z --get-regexp --global '.*' 345s | git config -z --get-regexp --system '.*' 345s format , quilt mode linear 345s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 345s warning: could not open directory 'debian/source/': No such file or directory 345s => `' 345s + git diff --quiet HEAD 345s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 345s canonical suite name for unstable is sid 345s actually entering push 345s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 345s => `1' 345s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 345s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 345s git_lrfetch_sane iteration 0 345s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 345s => 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit/sid 345s => 65f3306326426656cf76596731634df803e54ca5 refs/tags/archive/test-dummy/1.1 345s => 0f49ccc6a2e9e93e1c2d414065de1285215161dd refs/tags/archive/test-dummy/1.2 345s => 4c75ff42ae5362904d89ac5df671f62019f62b7f refs/tags/archive/test-dummy/2.0 345s => fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/tags/test-dummy/1.1 345s => 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 refs/tags/test-dummy/1.2 345s => ab129be336336126c19013e292508ea31311d478 refs/tags/test-dummy/2.0 345s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 345s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 345s | git for-each-ref refs/dgit-fetch/test-dummy 345s |> 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit refs/dgit-fetch/test-dummy/dgit/sid 345s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 345s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 345s |> 4c75ff42ae5362904d89ac5df671f62019f62b7f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 345s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 345s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 345s |> ab129be336336126c19013e292508ea31311d478 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 345s git_lrfetch_sane: tidying any old suite lrfetchrefs 345s | git for-each-ref refs/dgit-fetch/sid 345s git_lrfetch_sane: git fetch --no-insane emulation complete 345s $VAR1 = { 345s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'ab129be336336126c19013e292508ea31311d478', 345s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '0f49ccc6a2e9e93e1c2d414065de1285215161dd', 345s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 345s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '4c75ff42ae5362904d89ac5df671f62019f62b7f', 345s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72', 345s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5', 345s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'fef24af37f82b5d8a0f8ee83188af5756ddf403f' 345s }; 345s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 345s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/tags/archive/test-dummy/1.1 345s currently refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 345s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/tags/archive/test-dummy/1.2 345s currently refs/tags/archive/test-dummy/1.2=0f49ccc6a2e9e93e1c2d414065de1285215161dd 345s |> 4c75ff42ae5362904d89ac5df671f62019f62b7f tag refs/tags/archive/test-dummy/2.0 345s currently refs/tags/archive/test-dummy/2.0=4c75ff42ae5362904d89ac5df671f62019f62b7f 345s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/tags/test-dummy/1.1 345s currently refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 345s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/tags/test-dummy/1.2 345s currently refs/tags/test-dummy/1.2=5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 345s |> ab129be336336126c19013e292508ea31311d478 tag refs/tags/test-dummy/2.0 345s currently refs/tags/test-dummy/2.0=ab129be336336126c19013e292508ea31311d478 345s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 345s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 345s offered refs/tags/archive/test-dummy/1.1=65f3306326426656cf76596731634df803e54ca5 345s |> 0f49ccc6a2e9e93e1c2d414065de1285215161dd tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 345s offered refs/tags/archive/test-dummy/1.2=0f49ccc6a2e9e93e1c2d414065de1285215161dd 345s |> 4c75ff42ae5362904d89ac5df671f62019f62b7f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 345s offered refs/tags/archive/test-dummy/2.0=4c75ff42ae5362904d89ac5df671f62019f62b7f 345s |> fef24af37f82b5d8a0f8ee83188af5756ddf403f tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 345s offered refs/tags/test-dummy/1.1=fef24af37f82b5d8a0f8ee83188af5756ddf403f 345s |> 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 345s offered refs/tags/test-dummy/1.2=5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 345s |> ab129be336336126c19013e292508ea31311d478 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 345s offered refs/tags/test-dummy/2.0=ab129be336336126c19013e292508ea31311d478 345s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 345s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0.dsc... 345s get_archive_dsc: Version 2.0 345s last upload to archive: specified git info (test-dummy) 345s GCF| git cat-file --batch 345s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 345s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 345s GCF>| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s GCF<| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit 250 345s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s previous reference hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s fetch_from_archive: lastfetch=1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s fetch mergeinfos: 345s commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1 Dgit field in .dsc from archive 345s fetch hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s | git log -n2 1c97ddd6759afae0eea88cf10027c6cba8866ea1 345s => `commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1'... 345s | git ls-tree -lrz -- 1c97ddd6759afae0eea88cf10027c6cba8866ea1: 345s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 345s + git check-ref-format archive/test-dummy/2.1 345s | git symbolic-ref -q HEAD 345s => `refs/heads/master' 345s | git rev-parse 'HEAD~0' 345s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 345s ffq_prev_branchinfo branch current refs/heads/master 345s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 345s => `' 345s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 345s => `' 345s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 345s warning: could not open directory 'debian/source/': No such file or directory 345s => `' 345s + git diff --quiet HEAD 345s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 345s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 345s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.1' 345s => `' 345s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 345s checking that example_2.1.dsc corresponds to HEAD 345s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.dsc 345s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.dsc) 345s dpkg-source: info: extracting example in example-2.1 345s dpkg-source: info: unpacking example_2.1.tar.gz 345s CD example-2.1 345s | find -name .git -prune -print0 345s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 345s + git add -Af . 345s | git write-tree 345s => `0a454783758b3963f285d311a15fe86e962c54d4' 345s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 345s + git diff --quiet 0a454783758b3963f285d311a15fe86e962c54d4 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 345s files_compare_inputs example_2.1.dsc 345s files_compare_inputs example_2.1.dsc Checksums-Sha256 345s files_compare_inputs example_2.1.dsc Checksums-Sha256 example_2.1.tar.gz 345s files_compare_inputs example_2.1.dsc Checksums-Sha1 345s files_compare_inputs example_2.1.dsc Checksums-Sha1 example_2.1.tar.gz 345s files_compare_inputs example_2.1.dsc Files 345s files_compare_inputs example_2.1.dsc Files example_2.1.tar.gz 345s files_compare_inputs example_2.1_multi.changes 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.dsc 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.tar.gz 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_all.deb 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_amd64.buildinfo 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.dsc 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.tar.gz 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_all.deb 345s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_amd64.buildinfo 345s files_compare_inputs example_2.1_multi.changes Files 345s files_compare_inputs example_2.1_multi.changes Files example_2.1.dsc 345s files_compare_inputs example_2.1_multi.changes Files example_2.1.tar.gz 345s files_compare_inputs example_2.1_multi.changes Files example_2.1_all.deb 345s files_compare_inputs example_2.1_multi.changes Files example_2.1_amd64.buildinfo 345s checking origs needed (2.1)... 345s checking origs needed placement 'devel extra'... 345s origs example_2.1.tar.gz | 3c579320ad06b5c818289baa3f0ecb96 1021 example_2.1.tar.gz 345s ../example_2.1_multi.changes already has appropriate .orig(s) (if any) 345s push_tagwants: $VAR1 = [ 345s '2.1', 345s 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 345s undef, 345s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 345s ]; 345s $VAR2 = [ 345s { 345s 'Tfn' => sub { "DUMMY" }, 345s 'View' => 'dgit', 345s 'TagFn' => sub { "DUMMY" }, 345s 'Tag' => 'archive/test-dummy/2.1', 345s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 345s 'TfSuffix' => '' 345s }, 345s { 345s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 345s 'TfSuffix' => '-dgit', 345s 'Tfn' => sub { "DUMMY" }, 345s 'View' => 'dgit', 345s 'TagFn' => sub { "DUMMY" }, 345s 'Tag' => 'test-dummy/2.1' 345s } 345s ]; 345s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 345s => `1530000000 +0000' 345s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 345s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 345s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 345s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 345s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 345s => `f947bd5aaece17e5c5523ef03462e1b433272d23' 345s + git verify-tag f947bd5aaece17e5c5523ef03462e1b433272d23 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 345s gpg: Signature made Mon Mar 31 12:23:58 2025 UTC 345s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 345s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 345s gpg: WARNING: This key is not certified with a trusted signature! 345s gpg: There is no indication that the signature belongs to the owner. 345s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 345s + git update-ref refs/tags/archive/test-dummy/2.1 f947bd5aaece17e5c5523ef03462e1b433272d23 345s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 345s => `61a5917df8eb676ea11601d89e0bbed33d284f83' 345s + git verify-tag 61a5917df8eb676ea11601d89e0bbed33d284f83 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 345s gpg: Signature made Mon Mar 31 12:23:58 2025 UTC 345s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 345s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 345s gpg: WARNING: This key is not certified with a trusted signature! 345s gpg: There is no indication that the signature belongs to the owner. 345s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 345s + git update-ref refs/tags/test-dummy/2.1 61a5917df8eb676ea11601d89e0bbed33d284f83 345s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 345s => `1' 345s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:refs/dgit/sid refs/tags/archive/test-dummy/2.1 refs/tags/test-dummy/2.1 345s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 345s 1c97ddd..d5d72bd d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> refs/dgit/sid 345s * [new tag] archive/test-dummy/2.1 -> archive/test-dummy/2.1 345s * [new tag] test-dummy/2.1 -> test-dummy/2.1 345s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 345s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.1_multi.changes 345s signfile dsc ../example_2.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 345s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s 346s signfile buildinfo ../example_2.1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 346s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s 346s fixup_changes dsc ../example_2.1.dsc ../example_2.1_multi.changes 346s fixup_changes buildinfo ../example_2.1_amd64.buildinfo ../example_2.1_multi.changes 346s signfile changes ../example_2.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 346s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s 346s Successfully signed dsc, buildinfo, changes files 346s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.1_multi.changes 346s gpg: ../example_2.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 346s gpg: ../example_2.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 346s D: Setting host argument. 346s Checking signature on .changes 346s Checking signature on .dsc 346s Uploading to test-dummy (via local to localhost): 346s Successfully uploaded packages. 346s dgit ok: pushed and uploaded 2.1 346s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 346s del_lrfetchrefs... 346s del_lrfetchrefs: 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit-fetch/test-dummy/dgit/sid 346s del_lrfetchrefs: 65f3306326426656cf76596731634df803e54ca5 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 346s del_lrfetchrefs: 0f49ccc6a2e9e93e1c2d414065de1285215161dd refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 346s del_lrfetchrefs: 4c75ff42ae5362904d89ac5df671f62019f62b7f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 346s del_lrfetchrefs: fef24af37f82b5d8a0f8ee83188af5756ddf403f refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 346s del_lrfetchrefs: 5bf1fe5a84a5d0dc7adafbb62e541f67f3e7fd72 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 346s del_lrfetchrefs: ab129be336336126c19013e292508ea31311d478 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 346s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 346s ' 346s + t-pushed-good master sid 346s + local branch=master 346s + local suite=sid 346s + t-refs-same refs/heads/master 346s + local g 346s + for g in $* 346s + t-ref-same refs/heads/master 346s + local name=refs/heads/master 346s + local val 346s ++ t-git-get-ref refs/heads/master 346s ++ local ref=refs/heads/master 346s ++ case "$ref" in 346s ++ git show-ref -d refs/heads/master 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val refs/heads/master d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=refs/heads/master 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s + t-pushed-good-core 346s + t-ref-dsc-dgit 346s + t-incoming-dsc 346s + local dsc=example_2.1.dsc 346s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 346s + local val 346s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc Dgit 346s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 346s ++ local field=Dgit 346s ++ perl -e ' 346s use Dpkg::Control::Hash; 346s my $h = new Dpkg::Control::Hash allow_pgp=>1; 346s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc"); 346s my $val = $h->{"Dgit"},"\n"; 346s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc Dgit" unless defined $val; 346s print $val,"\n"; 346s ' 346s + val='d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 346s ++ perl -e ' 346s $_=shift @ARGV; 346s die "Dgit $_ ?" unless m/^\w+\b/; 346s print $&,"\n" or die $!; 346s ' 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s ++ t-v-tag 346s ++ echo refs/tags/archive/test-dummy/2.1 346s + t-refs-same refs/tags/archive/test-dummy/2.1 refs/remotes/dgit/dgit/sid 346s + local g 346s + for g in $* 346s + t-ref-same refs/tags/archive/test-dummy/2.1 346s + local name=refs/tags/archive/test-dummy/2.1 346s + local val 346s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 346s ++ local ref=refs/tags/archive/test-dummy/2.1 346s ++ case "$ref" in 346s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=refs/tags/archive/test-dummy/2.1 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s + for g in $* 346s + t-ref-same refs/remotes/dgit/dgit/sid 346s + local name=refs/remotes/dgit/dgit/sid 346s + local val 346s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 346s ++ local ref=refs/remotes/dgit/dgit/sid 346s ++ case "$ref" in 346s ++ git show-ref -d refs/remotes/dgit/dgit/sid 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=refs/remotes/dgit/dgit/sid 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 346s + local val 346s + for g in $* 346s ++ t-git-get-ref refs/heads/dgit/unstable 346s ++ local ref=refs/heads/dgit/unstable 346s ++ case "$ref" in 346s ++ git show-ref -d refs/heads/dgit/unstable 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s ++ test 1 = 1 346s + val= 346s + '[' x '!=' x ']' 346s + for g in $* 346s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 346s ++ local ref=refs/remotes/dgit/dgit/unstable 346s ++ case "$ref" in 346s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s ++ test 1 = 1 346s + val= 346s + '[' x '!=' x ']' 346s + set -e 346s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 346s ++ t-v-tag 346s ++ echo refs/tags/archive/test-dummy/2.1 346s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.1 346s + local g 346s + for g in $* 346s + t-ref-same refs/dgit/sid 346s + local name=refs/dgit/sid 346s + local val 346s ++ t-git-get-ref refs/dgit/sid 346s ++ local ref=refs/dgit/sid 346s ++ case "$ref" in 346s ++ git show-ref -d refs/dgit/sid 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val refs/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=refs/dgit/sid 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s + for g in $* 346s + t-ref-same refs/tags/archive/test-dummy/2.1 346s + local name=refs/tags/archive/test-dummy/2.1 346s + local val 346s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 346s ++ local ref=refs/tags/archive/test-dummy/2.1 346s ++ case "$ref" in 346s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + local name=refs/tags/archive/test-dummy/2.1 346s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + case "${t_ref_val-unset}" in 346s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 346s + t_ref_names+=("$name") 346s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 346s + t-refs-notexist refs/dgit/unstable 346s + local val 346s + for g in $* 346s ++ t-git-get-ref refs/dgit/unstable 346s ++ local ref=refs/dgit/unstable 346s ++ case "$ref" in 346s ++ git show-ref -d refs/dgit/unstable 346s ++ perl -ne ' 346s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 346s END { print "$x\n" if length $x; } 346s ' 346s ++ test 1 = 1 346s + val= 346s + '[' x '!=' x ']' 346s ++ t-v-tag 346s ++ echo refs/tags/archive/test-dummy/2.1 346s + git verify-tag refs/tags/archive/test-dummy/2.1 346s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 346s gpg: Signature made Mon Mar 31 12:23:58 2025 UTC 346s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 346s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 346s gpg: WARNING: This key is not certified with a trusted signature! 346s gpg: There is no indication that the signature belongs to the owner. 346s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 346s + t-archive-process-incoming sid 346s + local suite=sid 346s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 346s + t-archive-query sid 346s + local suite=sid 346s + local dscf=main/example_2.1.dsc 346s + t-archive-query-aq sid example 2.1 main/example_2.1.dsc 346s + local suite=sid 346s + local p=example 346s + local v=2.1 346s + local dscf=main/example_2.1.dsc 346s + local sha 346s ++ sha256sum 346s + sha='12e2be454e5054ff298934cf2b9833efeda3d48ad52ae4aa660a8f9f87aa4645 -' 346s + echo '2.1 12e2be454e5054ff298934cf2b9833efeda3d48ad52ae4aa660a8f9f87aa4645 main/example_2.1.dsc' 346s + t-aq-archive-updated sid example 346s + local suite=sid 346s + local p=example 346s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 346s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 346s + perl -wne ' 346s use JSON; 346s use strict; 346s our @v; 346s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 346s push @v, { 346s "version" => "$1", 346s "sha256sum" => "$2", 346s "component" => "$3", 346s "filename" => "$4", 346s }; 346s END { 346s my $json = JSON->new->canonical(); 346s print $json->encode(\@v) or die $!; 346s } 346s ' 346s + git clean -xdff 346s Removing debian/.debhelper/ 346s Removing debian/example.debhelper.log 346s Removing debian/example.substvars 346s Removing debian/example/ 346s Removing debian/files 346s + t-setup-done 'v suitespecs majorv revision' 'aq git mirror example' ' 346s t-select-package example 346s ' 346s + local 'savevars=v suitespecs majorv revision' 346s + local 'savedirs=aq git mirror example' 346s + local 'importeval= 346s t-select-package example 346s ' 346s + local import=IMPORT.examplegit 346s + exec 346s + local vn 346s + for vn in $savevars 346s ++ eval 'printf '\''%s\n'\'' "$v"' 346s +++ printf '%s\n' 2.1 346s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 346s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 346s ' v 2.1 346s + for vn in $savevars 346s ++ eval 'printf '\''%s\n'\'' "$suitespecs"' 346s +++ printf '%s\n' 'sid:unstable stable testing' 346s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 346s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 346s ' suitespecs 'sid:unstable stable testing' 346s + for vn in $savevars 346s ++ eval 'printf '\''%s\n'\'' "$majorv"' 346s +++ printf '%s\n' 2 346s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 346s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 346s ' majorv 2 346s + for vn in $savevars 346s ++ eval 'printf '\''%s\n'\'' "$revision"' 346s +++ printf '%s\n' 2 346s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 346s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 346s ' revision 2 346s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 346s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 346s print STDERR "saving-exporting $vn\n"; 346s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 346s or die $!; 346s } 346s ' 346s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 346s saving-exporting DGIT_TEST_REAL_GPG 346s saving-exporting DGIT_TEST_REAL_GPG_AGENT 346s + set -e 346s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 346s + tar cf IMPORT.examplegit.tar aq git mirror example 346s + printf '\n%s\n' ' 346s t-select-package example 346s ' 346s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit 346s + rc=0 346s + set +x 346s + set +e 346s + pwd 346s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 346s + '[' x '!=' x ']' 346s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 346s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 346s + set -e 346s + test 0 = 0 346s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 346s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 346s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit 346s ++ v=2.1 346s ++ suitespecs='sid:unstable stable testing' 346s ++ majorv=2 346s ++ revision=2 346s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 346s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 346s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 346s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 346s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 346s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 346s ++ t-select-package example 346s ++ p=example 346s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 346s + t-tstunt-parsechangelog 346s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 346s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s + local var=PATH 346s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s + eval ' 346s case "$PATH" in 346s "$tstunt:"*) ;; 346s *":$tstunt:"*) ;; 346s "") PATH="$tstunt" ;; 346s *) PATH="$tstunt:$PATH" ;; 346s esac 346s export PATH 346s ' 346s ++ case "$PATH" in 346s ++ export PATH 346s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s + local var=PERLLIB 346s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s + eval ' 346s case "$PERLLIB" in 346s "$tstunt:"*) ;; 346s *":$tstunt:"*) ;; 346s "") PERLLIB="$tstunt" ;; 346s *) PERLLIB="$tstunt:$PERLLIB" ;; 346s esac 346s export PERLLIB 346s ' 346s ++ case "$PERLLIB" in 346s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 346s ++ export PERLLIB 346s + local f 346s + for f in "$@" 346s + t-tstunt--save-real dpkg-parsechangelog 346s + local f=dpkg-parsechangelog 346s + case "$f" in 346s + local rc 346s + local real 346s + set +e 347s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 347s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 347s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 347s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 347s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 347s ++ type -p dpkg-parsechangelog 347s + real=/usr/bin/dpkg-parsechangelog 347s + rc=0 347s + set -e 347s + case $rc in 347s + local varname=dpkg_parsechangelog 347s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 347s + eval ' 347s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 347s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 347s ' 347s ++ : /usr/bin/dpkg-parsechangelog 347s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 347s + f=./dpkg-parsechangelog 347s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 347s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 347s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 347s + for f in "$@" 347s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 347s + local f=Dpkg/Changelog/Parse.pm 347s + case "$f" in 347s + return 347s + f=./Dpkg/Changelog/Parse.pm 347s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 347s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 347s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 347s + mkdir map 347s + cd map 347s + git init 347s hint: Using 'master' as the name for the initial branch. This default branch name 347s hint: is subject to change. To configure the initial branch name to use in all 347s hint: of your new repositories, which will suppress this warning, call: 347s hint: 347s hint: git config --global init.defaultBranch 347s hint: 347s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 347s hint: 'development'. The just-created branch can be renamed via this command: 347s hint: 347s hint: git branch -m 347s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/map/.git/ 347s + cd .. 347s + cd example 347s + filter refs/heads/master refs/remotes/dgit/dgit/sid 347s + git filter-branch --msg-filter 'sed s/Sid/Spong/' --tag-name-filter cat '^archive/test-dummy/2.0' refs/heads/master refs/remotes/dgit/dgit/sid 347s Rewrite d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 (1/1) (0 seconds passed, remaining 0 predicted) 347s Ref 'refs/heads/master' was rewritten 347s Ref 'refs/remotes/dgit/dgit/sid' was rewritten 347s archive/test-dummy/2.1 -> archive/test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 347s gpg signature stripped from tag object f947bd5aaece17e5c5523ef03462e1b433272d23 347s test-dummy/2.1 -> test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 347s gpg signature stripped from tag object 61a5917df8eb676ea11601d89e0bbed33d284f83 347s + for r in "$@" 347s + record-map refs/heads/master 347s ++ t-git-get-ref-exact refs/original/refs/heads/master 347s ++ local ref=refs/original/refs/heads/master 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/heads/master' 347s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 347s ++ t-git-get-ref-exact refs/heads/master 347s ++ local ref=refs/heads/master 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/heads/master' 347s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 347s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 347s + for r in "$@" 347s + record-map refs/remotes/dgit/dgit/sid 347s ++ t-git-get-ref-exact refs/original/refs/remotes/dgit/dgit/sid 347s ++ local ref=refs/original/refs/remotes/dgit/dgit/sid 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/remotes/dgit/dgit/sid' 347s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 347s ++ t-git-get-ref-exact refs/remotes/dgit/dgit/sid 347s ++ local ref=refs/remotes/dgit/dgit/sid 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 347s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 347s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 347s + t-ref-head 347s + local val 347s ++ git rev-parse HEAD 347s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + t-ref-same-val HEAD 607a66789db97a80a676b4ffbf45275c5b7fe795 347s + local name=HEAD 347s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + case "${t_ref_val-unset}" in 347s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + t_ref_names+=("$name") 347s + cd ../git/example.git 347s + filter refs/dgit/sid 347s + git filter-branch --msg-filter 'sed s/Sid/Spong/' --tag-name-filter cat '^archive/test-dummy/2.0' refs/dgit/sid 347s Rewrite d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 (1/1) (0 seconds passed, remaining 0 predicted) 347s Ref 'refs/dgit/sid' was rewritten 347s archive/test-dummy/2.1 -> archive/test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 347s gpg signature stripped from tag object f947bd5aaece17e5c5523ef03462e1b433272d23 347s test-dummy/2.1 -> test-dummy/2.1 (d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> 607a66789db97a80a676b4ffbf45275c5b7fe795) 347s gpg signature stripped from tag object 61a5917df8eb676ea11601d89e0bbed33d284f83 347s + for r in "$@" 347s + record-map refs/dgit/sid 347s ++ t-git-get-ref-exact refs/original/refs/dgit/sid 347s ++ local ref=refs/original/refs/dgit/sid 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/original/refs/dgit/sid' 347s + old=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 347s ++ t-git-get-ref-exact refs/dgit/sid 347s ++ local ref=refs/dgit/sid 347s ++ case "$ref" in 347s ++ git for-each-ref '--format=%(objectname)' '[r]efs/dgit/sid' 347s + new=607a66789db97a80a676b4ffbf45275c5b7fe795 347s + '[' d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 = 607a66789db97a80a676b4ffbf45275c5b7fe795 ']' 347s + echo 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 607a66789db97a80a676b4ffbf45275c5b7fe795' 347s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/map 347s + git add map 347s + git commit -m 'by test suite' 347s [master (root-commit) 3b495a6] by test suite 347s 1 file changed, 3 insertions(+) 347s create mode 100644 map 347s + git push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git master:refs/dgit-rewrite/map 347s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 347s * [new reference] master -> refs/dgit-rewrite/map 347s + cd .. 347s + suitespecs=avon 347s + t-reprepro-cfg ds- downstream 347s + local rrinst=ds- 347s + local rrdistro=downstream 347s + local etcapt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt 347s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 347s + t-git-config dgit-distro.downstream.archive-query aptget: 347s + git config --global dgit-distro.downstream.archive-query aptget: 347s + t-git-config dgit-distro.downstream.mirror file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/ 347s + git config --global dgit-distro.downstream.mirror file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/ 347s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt 347s + cat 347s + export APT_CONFIG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/conf 347s + APT_CONFIG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/conf 347s + gpg --export Hannibal 347s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 347s + fakeroot apt-key add 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8)). 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s W: Unable to read /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d/ - DirectoryExists (2: No such file or directory) 347s OK 347s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/apt.conf.d 347s + t-reprepro-setup ds- 347s + local rrinst=ds- 347s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 347s + local rrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/conf 347s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/conf 347s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/pool/main 347s + exec 347s + local arch 347s ++ dpkg --print-architecture 347s + arch=amd64 347s + for suitespec in $suitespecs 347s + local suite=avon 347s + local sname=avon 347s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/dists 347s + '[' avon '!=' avon ']' 347s + cat 347s + distro= 347s + dscf=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 347s + t-reprepro-includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc ds- 347s + local suite=avon 347s + local dscf=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 347s + local rrinst=ds- 347s + t-reprepro--run includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 347s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 347s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 347s Exporting indices... 347s + t-reprepro-regen ds- 347s + local rrinst=ds- 347s + t-reprepro--run export 347s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 347s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror export 347s + mkdir example.import 347s + cd example.import 347s + git init 347s hint: Using 'master' as the name for the initial branch. This default branch name 347s hint: is subject to change. To configure the initial branch name to use in all 347s hint: of your new repositories, which will suppress this warning, call: 347s hint: 347s hint: git config --global init.defaultBranch 347s hint: 347s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 347s hint: 'development'. The just-created branch can be renamed via this command: 347s hint: 347s hint: git branch -m 347s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import/.git/ 347s + t-dgit import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc x 347s + local dgit=dgit 347s + pwd 347s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 347s + : ' 347s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 347s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc x 348s | git rev-parse --show-toplevel 348s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --global '.*' 348s | git config -z --get-regexp --system '.*' 348s | git check-ref-format --normalize refs/heads/x 348s => `refs/heads/x' 348s | git symbolic-ref -q HEAD 348s => `refs/heads/master' 348s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/x' 348s => `' 348s gpgv: Signature made Mon Mar 31 12:23:49 2025 UTC 348s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 348s gpgv: Can't check signature: No public key 348s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 348s Dgit metadata in .dsc: specified git info (test-dummy) 348s dgit: import-dsc of .dsc with Dgit field, using git hash 348s .dsc names distro test-dummy: fetching rewrite map 348s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 348s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 348s git_lrfetch_sane iteration 0 348s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 348s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 348s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 348s | git for-each-ref refs/dgit-fetch/test-dummy 348s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s git_lrfetch_sane: git fetch --no-insane emulation complete 348s $VAR1 = { 348s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 348s }; 348s GCF| git cat-file --batch 348s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 348s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 348s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 348s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 missing 348s .dsc names distro test-dummy: fetching additional commits 348s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/1.1 348s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/1\.1) 348s git_lrfetch_sane iteration 0 348s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/1.1 348s => 65f3306326426656cf76596731634df803e54ca5 refs/tags/archive/test-dummy/1.1 348s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 348s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' 348s | git for-each-ref refs/dgit-fetch/test-dummy 348s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 348s git_lrfetch_sane: git fetch --no-insane emulation complete 348s $VAR1 = { 348s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5', 348s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 348s }; 348s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 348s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 348s | sh -ec 'echo 6ede489d12a09dd148d1f78c3a2179afddf29843 | git cat-file --batch-check' 348s => `6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255' 348s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc' refs/heads/x 6ede489d12a09dd148d1f78c3a2179afddf29843 348s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 348s dgit: import-dsc: updated git ref refs/heads/x 348s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 348s ' 348s + cd .. 348s + t-git-config dgit-suite.avon.distro downstream 348s + git config --global dgit-suite.avon.distro downstream 348s + t-git-config dgit-distro.downstream.git-check false 348s + git config --global dgit-distro.downstream.git-check false 348s + t-dgit clone example avon example.avon 348s + local dgit=dgit 348s + pwd 348s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 348s + : ' 348s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 348s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example avon example.avon 348s | git config -z --get-regexp --global '.*' 348s | git config -z --get-regexp --system '.*' 348s clone main body 348s CD example.avon 348s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget 348s + apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' update 348s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon InRelease [2077 B] 348s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon InRelease [2077 B] 348s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main Sources [549 B] 348s Reading package lists... 348s W: file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/dists/avon/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 348s release file Codename: avon 348s canonical suite name is avon 348s + git init -q 348s | git config -z --get-regexp --local '.*' 348s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 348s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 348s + git config user.name 'dgit test git user' 348s is_gitattrs_setup: found nothing 348s starting new git history 348s + git config remote.dgit.skipdefaultupdate true 348s | apt-cache -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' showsrc example 348s => `Package: example'... 348s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' --download-only --only-source source example 348s Reading package lists... 348s Need to get 0 B/1925 B of source archives. 348s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main example 1.1 (dsc) [1167 B] 348s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main example 1.1 (tar) [758 B] 348s Download complete and in download only mode 348s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_1.1.dsc... 348s get_archive_dsc: Version 1.1 348s last upload to archive: specified git info (test-dummy) 348s .dsc names distro test-dummy: fetching rewrite map 348s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 348s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 348s git_lrfetch_sane iteration 0 348s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 348s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 348s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 348s | git for-each-ref refs/dgit-fetch/test-dummy 348s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s git_lrfetch_sane: tidying any old suite lrfetchrefs 348s | git for-each-ref refs/dgit-fetch/avon 348s git_lrfetch_sane: git fetch --no-insane emulation complete 348s $VAR1 = { 348s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 348s }; 348s GCF| git cat-file --batch 348s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 348s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 348s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 348s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 missing 348s .dsc names distro test-dummy: fetching additional commits 348s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/1.1 348s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/1\.1) 348s git_lrfetch_sane iteration 0 348s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/1.1 348s => 65f3306326426656cf76596731634df803e54ca5 refs/tags/archive/test-dummy/1.1 348s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 348s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/1.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' 348s | git for-each-ref refs/dgit-fetch/test-dummy 348s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 348s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 348s git_lrfetch_sane: tidying any old suite lrfetchrefs 348s | git for-each-ref refs/dgit-fetch/avon 348s git_lrfetch_sane: git fetch --no-insane emulation complete 348s $VAR1 = { 348s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 348s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5' 348s }; 348s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 348s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 348s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/downstream/dgit/avon' 348s => `' 348s previous reference hash= 348s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/avon' 348s => `' 348s fetch_from_archive: lastfetch= 348s fetch mergeinfos: 348s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 348s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 348s + git update-ref -m 'dgit fetch avon' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 348s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 348s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 348s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/avon 6ede489d12a09dd148d1f78c3a2179afddf29843 348s => `' 348s + git reset --hard refs/remotes/dgit/dgit/avon 348s HEAD is now at 6ede489 Ancestor 348s + bash -ec ' set -o pipefail 348s git ls-tree -r --name-only -z HEAD | '\\' 348s xargs -0r touch -h -r . -- 348s ' 348s dgit ok: ready for work in example.avon 348s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.avon 348s del_lrfetchrefs... 348s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 348s ' 348s + perl -i -pe 's/ test-dummy / unknown-distro / if m/^Dgit:/' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 348s + cd example.import 348s + t-expect-fail 'hinted url with protocol file which is unsafe' t-dgit import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 348s + local 'mpat=hinted url with protocol file which is unsafe' 348s + shift 348s + set +o pipefail 348s + LC_MESSAGES=C 348s + LANGUAGE=C 348s + t-dgit import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 348s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 348s + local dgit=dgit 348s + pwd 348s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 348s + : ' 348s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 348s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 348s | git rev-parse --show-toplevel 348s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --global '.*' 348s | git config -z --get-regexp --system '.*' 348s | git check-ref-format --normalize refs/heads/xunk 348s => `refs/heads/xunk' 348s | git symbolic-ref -q HEAD 348s => `refs/heads/master' 348s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/xunk' 348s => `' 348s gpgv: Signature made Mon Mar 31 12:23:49 2025 UTC 348s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 348s gpgv: Can't check signature: No public key 348s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 348s Dgit metadata in .dsc: specified git info (unknown-distro) 348s dgit: import-dsc of .dsc with Dgit field, using git hash 348s .dsc names distro unknown-distro: fetching rewrite map 348s 348s dgit: error: .dsc Dgit metadata is in context of distro unknown-distro 348s dgit: for which we have no configured url; 348s dgit: .dsc provides hinted url with protocol file which is unsafe. 348s dgit: (can be overridden by config - consult documentation) 348s + local 'ps=255 0' 348s + set -o pipefail 348s + case $ps in 348s + t-grep-mpat 'hinted url with protocol file which is unsafe' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 348s + local 'mpat=hinted url with protocol file which is unsafe' 348s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 348s + local grepper=fgrep 348s + case "$mpat" in 348s + fgrep -e 'hinted url with protocol file which is unsafe' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 348s dgit: .dsc provides hinted url with protocol file which is unsafe. 348s + t-git-config dgit.dsc-url-proto-ok.file true 348s + git config --global dgit.dsc-url-proto-ok.file true 348s + t-dgit import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 348s + local dgit=dgit 348s + pwd 348s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 348s + : ' 348s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 348s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc xunk 348s | git rev-parse --show-toplevel 348s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --local '.*' 348s | git config -z --get-regexp --global '.*' 348s | git config -z --get-regexp --system '.*' 348s | git check-ref-format --normalize refs/heads/xunk 348s => `refs/heads/xunk' 348s | git symbolic-ref -q HEAD 348s => `refs/heads/master' 348s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/xunk' 348s => `' 348s gpgv: Signature made Mon Mar 31 12:23:49 2025 UTC 348s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 348s gpgv: Can't check signature: No public key 348s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc 348s Dgit metadata in .dsc: specified git info (unknown-distro) 348s dgit: import-dsc of .dsc with Dgit field, using git hash 348s .dsc names distro unknown-distro: fetching rewrite map 348s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 348s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 348s git_lrfetch_sane iteration 0 348s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 348s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 348s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/unknown-distro/dgit-rewrite/map 348s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/unknown-distro/dgit-rewrite/map' 348s | git for-each-ref refs/dgit-fetch/unknown-distro 348s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/unknown-distro/dgit-rewrite/map 348s git_lrfetch_sane: git fetch --no-insane emulation complete 348s $VAR1 = { 348s 'refs/dgit-fetch/unknown-distro/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 348s }; 348s GCF| git cat-file --batch 348s GCF>| refs/dgit-fetch/unknown-distro/dgit-rewrite/map:map 348s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 348s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 348s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 348s | sh -ec 'echo 6ede489d12a09dd148d1f78c3a2179afddf29843 | git cat-file --batch-check' 348s => `6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255' 348s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_1.1.dsc' refs/heads/xunk 6ede489d12a09dd148d1f78c3a2179afddf29843 348s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 348s dgit: import-dsc: updated git ref refs/heads/xunk 348s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 348s ' 348s + cd .. 348s + dscf=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 348s + t-reprepro-includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc ds- 348s + local suite=avon 348s + local dscf=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 348s + local rrinst=ds- 348s + t-reprepro--run includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 348s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 348s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror includedsc avon /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 348s Exporting indices... 348s Deleting files no longer referenced... 348s + t-reprepro-regen ds- 348s + local rrinst=ds- 348s + t-reprepro--run export 348s + local mir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror 348s + reprepro --outdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror --basedir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror export 348s + cd example.avon 348s + t-dgit fetch 348s + local dgit=dgit 348s + pwd 348s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.avon 348s + : ' 348s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 348s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 349s | git rev-parse --show-toplevel 349s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.avon' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --global '.*' 349s | git config -z --get-regexp --system '.*' 349s | git symbolic-ref -q HEAD 349s => `refs/heads/dgit/avon' 349s + sh -ec 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget 349s + apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' update 349s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon InRelease [2077 B] 349s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon InRelease [2077 B] 349s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main Sources [552 B] 349s Reading package lists... 349s W: file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror/dists/avon/InRelease: Key is stored in legacy trusted.gpg keyring (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-etc-apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details. 349s release file Codename: avon 349s canonical suite name is avon 349s | apt-cache -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' showsrc example 349s => `Package: example'... 349s + sh -ec 'cd "$1"/source; shift; exec "$@"' x /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget apt-get -c '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/apt.conf#downstream' --download-only --only-source source example 349s Reading package lists... 349s Need to get 0 B/2191 B of source archives. 349s Get:1 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main example 2.1 (dsc) [1170 B] 349s Get:2 file:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ds-mirror avon/main example 2.1 (tar) [1021 B] 349s Download complete and in download only mode 349s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.cache/dgit/aptget/source/example_2.1.dsc... 349s get_archive_dsc: Version 2.1 349s last upload to archive: specified git info (test-dummy) 349s .dsc names distro test-dummy: fetching rewrite map 349s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 349s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 349s git_lrfetch_sane iteration 0 349s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 349s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 349s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 349s | git for-each-ref refs/dgit-fetch/test-dummy 349s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 349s git_lrfetch_sane: tidying any old suite lrfetchrefs 349s | git for-each-ref refs/dgit-fetch/avon 349s git_lrfetch_sane: git fetch --no-insane emulation complete 349s $VAR1 = { 349s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5' 349s }; 349s GCF| git cat-file --batch 349s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 349s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 349s server's git history rewrite map contains a relevant entry! 349s using rewritten git hash in place of .dsc value 349s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 349s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 missing 349s .dsc names distro test-dummy: fetching additional commits 349s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/2.1 349s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/2\.1) 349s git_lrfetch_sane iteration 0 349s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/2.1 349s => c177cd6af7c529760c51622b3ad35cbd78404be1 refs/tags/archive/test-dummy/2.1 349s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 349s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' 349s | git for-each-ref refs/dgit-fetch/test-dummy 349s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 349s |> c177cd6af7c529760c51622b3ad35cbd78404be1 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 349s git_lrfetch_sane: tidying any old suite lrfetchrefs 349s | git for-each-ref refs/dgit-fetch/avon 349s git_lrfetch_sane: git fetch --no-insane emulation complete 349s $VAR1 = { 349s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'c177cd6af7c529760c51622b3ad35cbd78404be1', 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5' 349s }; 349s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 349s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252 349s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/downstream/dgit/avon' 349s => `' 349s previous reference hash= 349s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/avon' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 349s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s fetch mergeinfos: 349s commit 607a66789db97a80a676b4ffbf45275c5b7fe795 Dgit field in .dsc from archive 349s fetch hash=607a66789db97a80a676b4ffbf45275c5b7fe795 349s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s + git update-ref -m 'dgit fetch avon' DGIT_ARCHIVE 607a66789db97a80a676b4ffbf45275c5b7fe795 349s | git log -n2 607a66789db97a80a676b4ffbf45275c5b7fe795 349s => `commit 607a66789db97a80a676b4ffbf45275c5b7fe795'... 349s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/avon 607a66789db97a80a676b4ffbf45275c5b7fe795 349s => `' 349s dgit ok: fetched into refs/remotes/dgit/dgit/avon 349s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.avon 349s del_lrfetchrefs... 349s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 349s ' 349s + t-ref-same refs/remotes/dgit/dgit/avon 349s + local name=refs/remotes/dgit/dgit/avon 349s + local val 349s ++ t-git-get-ref refs/remotes/dgit/dgit/avon 349s ++ local ref=refs/remotes/dgit/dgit/avon 349s ++ case "$ref" in 349s ++ git show-ref -d refs/remotes/dgit/dgit/avon 349s ++ perl -ne ' 349s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/avon\E(?:\^\{\})?$#; 349s END { print "$x\n" if length $x; } 349s ' 349s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + t-ref-same-val refs/remotes/dgit/dgit/avon 607a66789db97a80a676b4ffbf45275c5b7fe795 349s + local name=refs/remotes/dgit/dgit/avon 349s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + case "${t_ref_val-unset}" in 349s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + t_ref_names+=("$name") 349s + cd ../example.import 349s + git init 349s Reinitialized existing Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import/.git/ 349s + t-dgit import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +x 349s + local dgit=dgit 349s + pwd 349s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 349s + : ' 349s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 349s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +x 349s | git rev-parse --show-toplevel 349s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --global '.*' 349s | git config -z --get-regexp --system '.*' 349s | git check-ref-format --normalize refs/heads/x 349s => `refs/heads/x' 349s | git symbolic-ref -q HEAD 349s => `refs/heads/master' 349s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/x' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s gpgv: Signature made Mon Mar 31 12:23:58 2025 UTC 349s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 349s gpgv: Can't check signature: No public key 349s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 349s Dgit metadata in .dsc: specified git info (test-dummy) 349s dgit: import-dsc of .dsc with Dgit field, using git hash 349s .dsc names distro test-dummy: fetching rewrite map 349s git_lrfetch_sane suppl=1 specs dgit-rewrite/map 349s git_lrfetch_sane specre=(?:refs/dgit\-rewrite\/map) 349s git_lrfetch_sane iteration 0 349s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/dgit-rewrite/map 349s => 3b495a6e749025fce4348080e1b3a30e1e640c90 refs/dgit-rewrite/map 349s git_lrfetch_sane fspecs +refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/dgit-rewrite/map:refs/dgit-fetch/test-dummy/dgit-rewrite/map' 349s | git for-each-ref refs/dgit-fetch/test-dummy 349s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 349s git_lrfetch_sane: git fetch --no-insane emulation complete 349s $VAR1 = { 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5', 349s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90' 349s }; 349s GCF| git cat-file --batch 349s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 349s GCF<| 51516389792c0bbd1377a84700d0d6916c8cde22 blob 246 349s server's git history rewrite map contains a relevant entry! 349s using rewritten git hash in place of .dsc value 349s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 349s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 missing 349s .dsc names distro test-dummy: fetching additional commits 349s git_lrfetch_sane suppl=1 specs tags/archive/test-dummy/2.1 349s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/2\.1) 349s git_lrfetch_sane iteration 0 349s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git refs/tags/archive/test-dummy/2.1 349s => c177cd6af7c529760c51622b3ad35cbd78404be1 refs/tags/archive/test-dummy/2.1 349s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 349s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/2.1:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' 349s | git for-each-ref refs/dgit-fetch/test-dummy 349s |> 3b495a6e749025fce4348080e1b3a30e1e640c90 commit refs/dgit-fetch/test-dummy/dgit-rewrite/map 349s |> 65f3306326426656cf76596731634df803e54ca5 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 349s |> c177cd6af7c529760c51622b3ad35cbd78404be1 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 349s git_lrfetch_sane: git fetch --no-insane emulation complete 349s $VAR1 = { 349s 'refs/dgit-fetch/test-dummy/dgit-rewrite/map' => '3b495a6e749025fce4348080e1b3a30e1e640c90', 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => '65f3306326426656cf76596731634df803e54ca5', 349s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'c177cd6af7c529760c51622b3ad35cbd78404be1' 349s }; 349s GCF>| 607a66789db97a80a676b4ffbf45275c5b7fe795 349s GCF<| 607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252 349s | sh -ec 'echo 607a66789db97a80a676b4ffbf45275c5b7fe795 | git cat-file --batch-check' 349s => `607a66789db97a80a676b4ffbf45275c5b7fe795 commit 252' 349s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 607a66789db97a80a676b4ffbf45275c5b7fe795 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 349s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 349s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +' refs/heads/x 607a66789db97a80a676b4ffbf45275c5b7fe795 349s | git ls-tree -lrz -- 607a66789db97a80a676b4ffbf45275c5b7fe795: 349s dgit: import-dsc: updated git ref refs/heads/x 349s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 349s ' 349s + t-ref-same refs/heads/x 349s + local name=refs/heads/x 349s + local val 349s ++ t-git-get-ref refs/heads/x 349s ++ local ref=refs/heads/x 349s ++ case "$ref" in 349s ++ git show-ref -d refs/heads/x 349s ++ perl -ne ' 349s $x = $1 if m#^(\w+) \Qrefs/heads/x\E(?:\^\{\})?$#; 349s END { print "$x\n" if length $x; } 349s ' 349s + val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + t-ref-same-val refs/heads/x 607a66789db97a80a676b4ffbf45275c5b7fe795 349s + local name=refs/heads/x 349s + local val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + case "${t_ref_val-unset}" in 349s + t_ref_val=607a66789db97a80a676b4ffbf45275c5b7fe795 349s + t_ref_names+=("$name") 349s + git show x 349s + grep Spong 349s Spong 349s + t-expect-fail 'Your git tree does not have that object' t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 349s + local 'mpat=Your git tree does not have that object' 349s + shift 349s + set +o pipefail 349s + LC_MESSAGES=C 349s + LANGUAGE=C 349s + t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 349s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 349s + local dgit=dgit 349s + pwd 349s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 349s + : ' 349s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 349s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --no-chase-dsc-distro import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 349s | git rev-parse --show-toplevel 349s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --global '.*' 349s | git config -z --get-regexp --system '.*' 349s | git check-ref-format --normalize refs/heads/y 349s => `refs/heads/y' 349s | git symbolic-ref -q HEAD 349s => `refs/heads/master' 349s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/y' 349s => `' 349s gpgv: Signature made Mon Mar 31 12:23:58 2025 UTC 349s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 349s gpgv: Can't check signature: No public key 349s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 349s Dgit metadata in .dsc: specified git info (test-dummy) 349s dgit: import-dsc of .dsc with Dgit field, using git hash 349s not chasing .dsc distro test-dummy: not fetching rewrite map 349s | sh -ec 'echo d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 | git cat-file --batch-check' 349s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 missing' 349s 349s dgit: error: .dsc contains Dgit field referring to object d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 349s dgit: Your git tree does not have that object. Try `git fetch' from a 349s dgit: plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again. 349s + local 'ps=255 0' 349s + set -o pipefail 349s + case $ps in 349s + t-grep-mpat 'Your git tree does not have that object' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 349s + local 'mpat=Your git tree does not have that object' 349s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 349s + local grepper=fgrep 349s + case "$mpat" in 349s + fgrep -e 'Your git tree does not have that object' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 349s dgit: Your git tree does not have that object. Try `git fetch' from a 349s + cd ../example 349s + t-dgit --no-chase-dsc-distro import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 349s + local dgit=dgit 349s + pwd 349s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 349s + : ' 349s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 349s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --no-chase-dsc-distro import-dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +y 349s | git rev-parse --show-toplevel 349s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --local '.*' 349s | git config -z --get-regexp --global '.*' 349s | git config -z --get-regexp --system '.*' 349s | git check-ref-format --normalize refs/heads/y 349s => `refs/heads/y' 349s | git symbolic-ref -q HEAD 349s => `refs/heads/master' 349s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/y' 349s => `' 349s gpgv: Signature made Mon Mar 31 12:23:58 2025 UTC 349s gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 349s gpgv: Can't check signature: No public key 349s dgit: warning: cannot verify signature /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc 349s Dgit metadata in .dsc: specified git info (test-dummy) 349s dgit: import-dsc of .dsc with Dgit field, using git hash 349s not chasing .dsc distro test-dummy: not fetching rewrite map 349s | sh -ec 'echo d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 | git cat-file --batch-check' 349s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit 250' 349s + git update-ref -m 'dgit import-dsc (Dgit): /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_2.1.dsc +' refs/heads/y d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 349s | git ls-tree -lrz -- d5d72bd268117528fdb90dd8ee4f0f2fe5432b61: 349s dgit: import-dsc: updated git ref refs/heads/y 349s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 349s ' 349s + git show y 349s + grep Sid 349s Sid 349s + * Sid 349s * Sid 349s + t-ok 349s + : ======================================== 349s + t-check-only-bpd 349s + '[' .. = .. ']' 349s + return 349s + t-fscks 349s + shopt -s nullglob 349s + for d in $tmp/*/.git $tmp/git/*.git 349s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.avon 349s + t-git-fsck 349s ++ git rev-parse --git-dir 349s + local fsckerrs=.git/dgit-test-fsck.errs 349s + set +e 349s + LC_MESSAGES=C 349s + tee .git/dgit-test-fsck.errs 349s + git fsck --no-dangling --strict 349s + ps='0 0' 349s + set -e 349s + local pats 349s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 349s + test '0 0' = '0 0' 349s + pats+=(-e 'notice: HEAD points to an unborn branch') 349s + pats+=(-e 'notice: No default references') 349s + set +e 349s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 349s + rc=1 349s + set -e 349s + case $rc in 349s + for d in $tmp/*/.git $tmp/git/*.git 349s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.import 349s + t-git-fsck 349s ++ git rev-parse --git-dir 349s + local fsckerrs=.git/dgit-test-fsck.errs 349s + set +e 349s + LC_MESSAGES=C 349s + git fsck --no-dangling --strict 349s + tee .git/dgit-test-fsck.errs 349s notice: HEAD points to an unborn branch (master) 349s + ps='0 0' 349s + set -e 349s + local pats 349s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 349s + test '0 0' = '0 0' 349s + pats+=(-e 'notice: HEAD points to an unborn branch') 349s + pats+=(-e 'notice: No default references') 349s + set +e 349s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 349s + rc=1 349s + set -e 349s + case $rc in 349s + for d in $tmp/*/.git $tmp/git/*.git 349s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 349s + t-git-fsck 349s ++ git rev-parse --git-dir 349s + local fsckerrs=.git/dgit-test-fsck.errs 349s + set +e 349s + tee .git/dgit-test-fsck.errs 349s + LC_MESSAGES=C 349s + git fsck --no-dangling --strict 349s + ps='0 0' 349s + set -e 349s + local pats 349s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 349s + test '0 0' = '0 0' 349s + pats+=(-e 'notice: HEAD points to an unborn branch') 349s + pats+=(-e 'notice: No default references') 349s + set +e 349s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 349s + rc=1 349s + set -e 349s + case $rc in 349s + for d in $tmp/*/.git $tmp/git/*.git 349s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/map 349s + t-git-fsck 349s ++ git rev-parse --git-dir 349s + local fsckerrs=.git/dgit-test-fsck.errs 349s + set +e 349s + LC_MESSAGES=C 349s + git fsck --no-dangling --strict 349s + tee .git/dgit-test-fsck.errs 349s + ps='0 0' 349s + set -e 349s + local pats 349s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 349s + test '0 0' = '0 0' 349s + pats+=(-e 'notice: HEAD points to an unborn branch') 349s + pats+=(-e 'notice: No default references') 349s + set +e 349s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 349s + rc=1 349s + set -e 349s + case $rc in 349s + for d in $tmp/*/.git $tmp/git/*.git 349s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 349s + t-git-fsck 349s ++ git rev-parse --git-dir 349s + local fsckerrs=./dgit-test-fsck.errs 349s + set +e 349s + LC_MESSAGES=C 349s + git fsck --no-dangling --strict 349s + tee ./dgit-test-fsck.errs 349s notice: HEAD points to an unborn branch (master) 349s + ps='0 0' 349s + set -e 349s + local pats 349s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 349s + test '0 0' = '0 0' 349s + pats+=(-e 'notice: HEAD points to an unborn branch') 349s + pats+=(-e 'notice: No default references') 349s + set +e 349s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 349s + rc=1 349s + set -e 349s + case $rc in 349s + t-save-artifacts 349s + artifacts=/tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts 349s + '[' x/tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts = x ']' 349s + '[' xtmp = x ']' 349s + GZIP=-1v 349s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/downstream-gitless-artifacts/downstream-gitless.tar.gz '--exclude=*.tar' . 349s gzip: warning: GZIP environment variable is deprecated; use an alias or script 349s 90.9% 349s + echo ok. 349s ok. 349s + rc=0 349s + set +x 349s + set +e 349s + pwd 349s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 349s + '[' x '!=' x ']' 349s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 349s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 349s + set -e 349s + test 0 = 0 350s autopkgtest [12:24:04]: test downstream-gitless: -----------------------] 350s downstream-gitless PASS 350s autopkgtest [12:24:04]: test downstream-gitless: - - - - - - - - - - results - - - - - - - - - - 350s autopkgtest [12:24:04]: test alternating-dgit: preparing testbed 404s autopkgtest [12:24:58]: testbed dpkg architecture: amd64 404s autopkgtest [12:24:58]: testbed apt version: 2.4.13 404s autopkgtest [12:24:58]: @@@@@@@@@@@@@@@@@@@@ test bed setup 404s autopkgtest [12:24:58]: testbed release detected to be: jammy 404s autopkgtest [12:24:58]: updating testbed package index (apt update) 404s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 404s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 404s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 404s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 405s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 405s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 405s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 405s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 405s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 405s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 405s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 405s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 405s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 405s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 405s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 405s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 405s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 408s Fetched 1719 kB in 1s (2981 kB/s) 409s Reading package lists... 409s autopkgtest [12:25:03]: upgrading testbed (apt dist-upgrade and autopurge) 409s Reading package lists... 410s Building dependency tree... 410s Reading state information... 410s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 410s Starting 2 pkgProblemResolver with broken count: 0 410s Done 411s Entering ResolveByKeep 411s 411s The following packages will be upgraded: 411s apt apt-utils libapt-pkg6.0 411s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 411s Need to get 2486 kB of archives. 411s After this operation, 0 B of additional disk space will be used. 411s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 411s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 411s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 411s Fetched 2486 kB in 0s (62.8 MB/s) 412s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 412s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 412s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 412s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 412s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 412s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 412s Unpacking apt (2.4.14) over (2.4.13) ... 412s Setting up apt (2.4.14) ... 412s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 412s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 412s Unpacking apt-utils (2.4.14) over (2.4.13) ... 412s Setting up apt-utils (2.4.14) ... 412s Processing triggers for man-db (2.10.2-1) ... 413s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 414s Reading package lists... 414s Building dependency tree... 414s Reading state information... 415s Starting pkgProblemResolver with broken count: 0 415s Starting 2 pkgProblemResolver with broken count: 0 415s Done 415s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 415s autopkgtest [12:25:09]: rebooting testbed after setup commands that affected boot 428s Reading package lists... 428s Building dependency tree... 428s Reading state information... 429s Starting pkgProblemResolver with broken count: 0 429s Starting 2 pkgProblemResolver with broken count: 0 429s Done 429s The following NEW packages will be installed: 429s autoconf automake autopoint autotools-dev bc build-essential 429s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 429s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 429s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 429s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 429s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 libcgi-pm-perl 429s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 429s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 429s libdynaloader-functions-perl libencode-locale-perl liberror-perl 429s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 429s libfile-homedir-perl libfile-libmagic-perl libfile-listing-perl 429s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 429s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 429s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 429s libhttp-message-perl libhttp-negotiate-perl libhttp-server-simple-perl 429s libhttp-server-simple-static-perl libimport-into-perl libio-html-perl 429s libio-pty-perl libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 429s libjson-perl liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 429s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 429s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 429s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 429s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 429s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 429s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 429s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 429s python3-dateutil python3-debian python3-gpg rpcsvc-proto sqlite3 wdiff 429s 0 upgraded, 117 newly installed, 0 to remove and 0 not upgraded. 429s Need to get 73.1 MB of archives. 429s After this operation, 247 MB of additional disk space will be used. 429s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 429s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 429s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 429s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 429s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 429s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 429s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 429s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 429s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 429s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 429s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 429s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 429s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 429s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 429s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 429s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 429s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 429s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 429s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 429s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 429s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 429s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 429s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 429s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 429s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 430s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 430s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 430s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 430s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 430s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 430s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 430s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 430s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 430s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 430s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 430s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 430s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 430s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 430s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 430s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 430s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 430s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 430s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 430s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 430s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 430s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 430s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 430s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 430s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 430s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 430s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 430s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 430s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 430s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 430s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 430s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 430s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 430s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 430s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 430s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 430s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 430s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 430s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 430s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 430s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 430s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 430s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 430s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 430s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 430s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 430s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 430s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 430s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 430s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 430s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 430s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 430s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 430s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 430s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 430s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 430s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 430s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 430s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 430s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 430s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 430s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 430s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 430s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 430s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 430s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 430s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 430s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 430s Get:93 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 430s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 430s Get:95 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 430s Get:96 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 430s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 430s Get:98 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 430s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 430s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 430s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 430s Get:102 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 430s Get:103 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 430s Get:104 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 430s Get:105 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 430s Get:106 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 430s Get:107 http://ftpmaster.internal/ubuntu jammy/main amd64 libcgi-pm-perl all 4.54-1 [188 kB] 430s Get:108 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 430s Get:109 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 430s Get:110 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-libmagic-perl amd64 1.23-1build2 [30.3 kB] 430s Get:111 http://ftpmaster.internal/ubuntu jammy/universe amd64 libhttp-server-simple-perl all 0.52-1.1 [23.2 kB] 430s Get:112 http://ftpmaster.internal/ubuntu jammy/universe amd64 libhttp-server-simple-static-perl all 0.14-1 [8896 B] 430s Get:113 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 430s Get:114 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 430s Get:115 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 430s Get:116 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 430s Get:117 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 431s Fetched 73.1 MB in 1s (105 MB/s) 431s Selecting previously unselected package m4. 431s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 431s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 431s Unpacking m4 (1.4.18-5ubuntu2) ... 431s Selecting previously unselected package autoconf. 431s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 431s Unpacking autoconf (2.71-2) ... 431s Selecting previously unselected package autotools-dev. 431s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 431s Unpacking autotools-dev (20220109.1) ... 431s Selecting previously unselected package automake. 431s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 431s Unpacking automake (1:1.16.5-1.3) ... 431s Selecting previously unselected package autopoint. 431s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 431s Unpacking autopoint (0.21-4ubuntu4) ... 431s Selecting previously unselected package bc. 431s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 431s Unpacking bc (1.07.1-3build1) ... 431s Selecting previously unselected package libc-dev-bin. 431s Preparing to unpack .../006-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 431s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 431s Selecting previously unselected package linux-libc-dev:amd64. 431s Preparing to unpack .../007-linux-libc-dev_5.15.0-135.146_amd64.deb ... 431s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 431s Selecting previously unselected package libcrypt-dev:amd64. 431s Preparing to unpack .../008-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 431s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 431s Selecting previously unselected package rpcsvc-proto. 431s Preparing to unpack .../009-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 431s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 431s Selecting previously unselected package libtirpc-dev:amd64. 431s Preparing to unpack .../010-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 431s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 431s Selecting previously unselected package libnsl-dev:amd64. 431s Preparing to unpack .../011-libnsl-dev_1.3.0-2build2_amd64.deb ... 431s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 431s Selecting previously unselected package libc6-dev:amd64. 431s Preparing to unpack .../012-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 431s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 431s Selecting previously unselected package gcc-11-base:amd64. 431s Preparing to unpack .../013-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package libisl23:amd64. 431s Preparing to unpack .../014-libisl23_0.24-2build1_amd64.deb ... 431s Unpacking libisl23:amd64 (0.24-2build1) ... 431s Selecting previously unselected package libmpc3:amd64. 431s Preparing to unpack .../015-libmpc3_1.2.1-2build1_amd64.deb ... 431s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 431s Selecting previously unselected package cpp-11. 431s Preparing to unpack .../016-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package cpp. 431s Preparing to unpack .../017-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 431s Unpacking cpp (4:11.2.0-1ubuntu1) ... 431s Selecting previously unselected package libcc1-0:amd64. 431s Preparing to unpack .../018-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package libgomp1:amd64. 431s Preparing to unpack .../019-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package libitm1:amd64. 431s Preparing to unpack .../020-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package libatomic1:amd64. 431s Preparing to unpack .../021-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package libasan6:amd64. 431s Preparing to unpack .../022-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 431s Selecting previously unselected package liblsan0:amd64. 431s Preparing to unpack .../023-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 431s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package libtsan0:amd64. 432s Preparing to unpack .../024-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package libubsan1:amd64. 432s Preparing to unpack .../025-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package libquadmath0:amd64. 432s Preparing to unpack .../026-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package libgcc-11-dev:amd64. 432s Preparing to unpack .../027-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package gcc-11. 432s Preparing to unpack .../028-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package gcc. 432s Preparing to unpack .../029-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 432s Unpacking gcc (4:11.2.0-1ubuntu1) ... 432s Selecting previously unselected package libstdc++-11-dev:amd64. 432s Preparing to unpack .../030-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package g++-11. 432s Preparing to unpack .../031-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 432s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 432s Selecting previously unselected package g++. 432s Preparing to unpack .../032-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 432s Unpacking g++ (4:11.2.0-1ubuntu1) ... 432s Selecting previously unselected package build-essential. 432s Preparing to unpack .../033-build-essential_12.9ubuntu3_amd64.deb ... 432s Unpacking build-essential (12.9ubuntu3) ... 432s Selecting previously unselected package libdebhelper-perl. 432s Preparing to unpack .../034-libdebhelper-perl_13.6ubuntu1_all.deb ... 432s Unpacking libdebhelper-perl (13.6ubuntu1) ... 432s Selecting previously unselected package libtool. 432s Preparing to unpack .../035-libtool_2.4.6-15build2_all.deb ... 432s Unpacking libtool (2.4.6-15build2) ... 432s Selecting previously unselected package dh-autoreconf. 432s Preparing to unpack .../036-dh-autoreconf_20_all.deb ... 432s Unpacking dh-autoreconf (20) ... 432s Selecting previously unselected package libarchive-zip-perl. 432s Preparing to unpack .../037-libarchive-zip-perl_1.68-1_all.deb ... 432s Unpacking libarchive-zip-perl (1.68-1) ... 432s Selecting previously unselected package libsub-override-perl. 432s Preparing to unpack .../038-libsub-override-perl_0.09-2_all.deb ... 432s Unpacking libsub-override-perl (0.09-2) ... 432s Selecting previously unselected package libfile-stripnondeterminism-perl. 432s Preparing to unpack .../039-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 432s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 432s Selecting previously unselected package dh-strip-nondeterminism. 432s Preparing to unpack .../040-dh-strip-nondeterminism_1.13.0-1_all.deb ... 432s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 432s Selecting previously unselected package debugedit. 432s Preparing to unpack .../041-debugedit_1%3a5.0-4build1_amd64.deb ... 432s Unpacking debugedit (1:5.0-4build1) ... 432s Selecting previously unselected package dwz. 432s Preparing to unpack .../042-dwz_0.14-1build2_amd64.deb ... 432s Unpacking dwz (0.14-1build2) ... 432s Selecting previously unselected package gettext. 432s Preparing to unpack .../043-gettext_0.21-4ubuntu4_amd64.deb ... 432s Unpacking gettext (0.21-4ubuntu4) ... 432s Selecting previously unselected package intltool-debian. 432s Preparing to unpack .../044-intltool-debian_0.35.0+20060710.5_all.deb ... 432s Unpacking intltool-debian (0.35.0+20060710.5) ... 432s Selecting previously unselected package po-debconf. 432s Preparing to unpack .../045-po-debconf_1.0.21+nmu1_all.deb ... 432s Unpacking po-debconf (1.0.21+nmu1) ... 432s Selecting previously unselected package debhelper. 432s Preparing to unpack .../046-debhelper_13.6ubuntu1_all.deb ... 432s Unpacking debhelper (13.6ubuntu1) ... 432s Selecting previously unselected package libfakeroot:amd64. 432s Preparing to unpack .../047-libfakeroot_1.28-1ubuntu1_amd64.deb ... 432s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 432s Selecting previously unselected package fakeroot. 432s Preparing to unpack .../048-fakeroot_1.28-1ubuntu1_amd64.deb ... 432s Unpacking fakeroot (1.28-1ubuntu1) ... 433s Selecting previously unselected package libfile-dirlist-perl. 433s Preparing to unpack .../049-libfile-dirlist-perl_0.05-2_all.deb ... 433s Unpacking libfile-dirlist-perl (0.05-2) ... 433s Selecting previously unselected package libfile-which-perl. 433s Preparing to unpack .../050-libfile-which-perl_1.23-1_all.deb ... 433s Unpacking libfile-which-perl (1.23-1) ... 433s Selecting previously unselected package libfile-homedir-perl. 433s Preparing to unpack .../051-libfile-homedir-perl_1.006-1_all.deb ... 433s Unpacking libfile-homedir-perl (1.006-1) ... 433s Selecting previously unselected package libfile-touch-perl. 433s Preparing to unpack .../052-libfile-touch-perl_0.12-1_all.deb ... 433s Unpacking libfile-touch-perl (0.12-1) ... 433s Selecting previously unselected package libio-pty-perl. 433s Preparing to unpack .../053-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 433s Unpacking libio-pty-perl (1:1.15-2build2) ... 433s Selecting previously unselected package libipc-run-perl. 433s Preparing to unpack .../054-libipc-run-perl_20200505.0-1_all.deb ... 433s Unpacking libipc-run-perl (20200505.0-1) ... 433s Selecting previously unselected package libclass-method-modifiers-perl. 433s Preparing to unpack .../055-libclass-method-modifiers-perl_2.13-1_all.deb ... 433s Unpacking libclass-method-modifiers-perl (2.13-1) ... 433s Selecting previously unselected package libclass-xsaccessor-perl. 433s Preparing to unpack .../056-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 433s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 433s Selecting previously unselected package libb-hooks-op-check-perl. 433s Preparing to unpack .../057-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 433s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 433s Selecting previously unselected package libdynaloader-functions-perl. 433s Preparing to unpack .../058-libdynaloader-functions-perl_0.003-1.1_all.deb ... 433s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 433s Selecting previously unselected package libdevel-callchecker-perl. 433s Preparing to unpack .../059-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 433s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 433s Selecting previously unselected package libparams-classify-perl. 433s Preparing to unpack .../060-libparams-classify-perl_0.015-1build5_amd64.deb ... 433s Unpacking libparams-classify-perl (0.015-1build5) ... 433s Selecting previously unselected package libmodule-runtime-perl. 433s Preparing to unpack .../061-libmodule-runtime-perl_0.016-1_all.deb ... 433s Unpacking libmodule-runtime-perl (0.016-1) ... 433s Selecting previously unselected package libimport-into-perl. 433s Preparing to unpack .../062-libimport-into-perl_1.002005-1_all.deb ... 433s Unpacking libimport-into-perl (1.002005-1) ... 433s Selecting previously unselected package librole-tiny-perl. 433s Preparing to unpack .../063-librole-tiny-perl_2.002004-1_all.deb ... 433s Unpacking librole-tiny-perl (2.002004-1) ... 433s Selecting previously unselected package libsub-quote-perl. 433s Preparing to unpack .../064-libsub-quote-perl_2.006006-1_all.deb ... 433s Unpacking libsub-quote-perl (2.006006-1) ... 433s Selecting previously unselected package libmoo-perl. 433s Preparing to unpack .../065-libmoo-perl_2.005004-3_all.deb ... 433s Unpacking libmoo-perl (2.005004-3) ... 433s Selecting previously unselected package libencode-locale-perl. 433s Preparing to unpack .../066-libencode-locale-perl_1.05-1.1_all.deb ... 433s Unpacking libencode-locale-perl (1.05-1.1) ... 433s Selecting previously unselected package libtimedate-perl. 433s Preparing to unpack .../067-libtimedate-perl_2.3300-2_all.deb ... 433s Unpacking libtimedate-perl (2.3300-2) ... 433s Selecting previously unselected package libhttp-date-perl. 433s Preparing to unpack .../068-libhttp-date-perl_6.05-1_all.deb ... 433s Unpacking libhttp-date-perl (6.05-1) ... 433s Selecting previously unselected package libfile-listing-perl. 433s Preparing to unpack .../069-libfile-listing-perl_6.14-1_all.deb ... 433s Unpacking libfile-listing-perl (6.14-1) ... 433s Selecting previously unselected package libhtml-tagset-perl. 433s Preparing to unpack .../070-libhtml-tagset-perl_3.20-4_all.deb ... 433s Unpacking libhtml-tagset-perl (3.20-4) ... 433s Selecting previously unselected package liburi-perl. 433s Preparing to unpack .../071-liburi-perl_5.10-1_all.deb ... 433s Unpacking liburi-perl (5.10-1) ... 433s Selecting previously unselected package libhtml-parser-perl:amd64. 433s Preparing to unpack .../072-libhtml-parser-perl_3.76-1build2_amd64.deb ... 433s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 433s Selecting previously unselected package libhtml-tree-perl. 433s Preparing to unpack .../073-libhtml-tree-perl_5.07-2_all.deb ... 433s Unpacking libhtml-tree-perl (5.07-2) ... 433s Selecting previously unselected package libio-html-perl. 433s Preparing to unpack .../074-libio-html-perl_1.004-2_all.deb ... 433s Unpacking libio-html-perl (1.004-2) ... 433s Selecting previously unselected package liblwp-mediatypes-perl. 433s Preparing to unpack .../075-liblwp-mediatypes-perl_6.04-1_all.deb ... 433s Unpacking liblwp-mediatypes-perl (6.04-1) ... 433s Selecting previously unselected package libhttp-message-perl. 433s Preparing to unpack .../076-libhttp-message-perl_6.36-1_all.deb ... 433s Unpacking libhttp-message-perl (6.36-1) ... 433s Selecting previously unselected package libhttp-cookies-perl. 433s Preparing to unpack .../077-libhttp-cookies-perl_6.10-1_all.deb ... 433s Unpacking libhttp-cookies-perl (6.10-1) ... 433s Selecting previously unselected package libhttp-negotiate-perl. 433s Preparing to unpack .../078-libhttp-negotiate-perl_6.01-1_all.deb ... 433s Unpacking libhttp-negotiate-perl (6.01-1) ... 433s Selecting previously unselected package perl-openssl-defaults:amd64. 433s Preparing to unpack .../079-perl-openssl-defaults_5build2_amd64.deb ... 433s Unpacking perl-openssl-defaults:amd64 (5build2) ... 433s Selecting previously unselected package libnet-ssleay-perl:amd64. 433s Preparing to unpack .../080-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 433s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 433s Selecting previously unselected package libio-socket-ssl-perl. 433s Preparing to unpack .../081-libio-socket-ssl-perl_2.074-2_all.deb ... 433s Unpacking libio-socket-ssl-perl (2.074-2) ... 433s Selecting previously unselected package libnet-http-perl. 433s Preparing to unpack .../082-libnet-http-perl_6.22-1_all.deb ... 433s Unpacking libnet-http-perl (6.22-1) ... 433s Selecting previously unselected package liblwp-protocol-https-perl. 433s Preparing to unpack .../083-liblwp-protocol-https-perl_6.10-1_all.deb ... 433s Unpacking liblwp-protocol-https-perl (6.10-1) ... 433s Selecting previously unselected package libtry-tiny-perl. 433s Preparing to unpack .../084-libtry-tiny-perl_0.31-1_all.deb ... 433s Unpacking libtry-tiny-perl (0.31-1) ... 433s Selecting previously unselected package libwww-robotrules-perl. 433s Preparing to unpack .../085-libwww-robotrules-perl_6.02-1_all.deb ... 433s Unpacking libwww-robotrules-perl (6.02-1) ... 433s Selecting previously unselected package libwww-perl. 433s Preparing to unpack .../086-libwww-perl_6.61-1_all.deb ... 433s Unpacking libwww-perl (6.61-1) ... 433s Selecting previously unselected package patchutils. 433s Preparing to unpack .../087-patchutils_0.4.2-1build2_amd64.deb ... 433s Unpacking patchutils (0.4.2-1build2) ... 433s Selecting previously unselected package wdiff. 433s Preparing to unpack .../088-wdiff_1.2.2-2build3_amd64.deb ... 433s Unpacking wdiff (1.2.2-2build3) ... 433s Selecting previously unselected package devscripts. 433s Preparing to unpack .../089-devscripts_2.22.1ubuntu1_amd64.deb ... 433s Unpacking devscripts (2.22.1ubuntu1) ... 433s Selecting previously unselected package liberror-perl. 433s Preparing to unpack .../090-liberror-perl_0.17029-1_all.deb ... 433s Unpacking liberror-perl (0.17029-1) ... 433s Selecting previously unselected package git-man. 433s Preparing to unpack .../091-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 433s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 433s Selecting previously unselected package git. 433s Preparing to unpack .../092-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 433s Unpacking git (1:2.34.1-1ubuntu1.12) ... 433s Selecting previously unselected package python3-dateutil. 433s Preparing to unpack .../093-python3-dateutil_2.8.1-6_all.deb ... 433s Unpacking python3-dateutil (2.8.1-6) ... 433s Selecting previously unselected package git-buildpackage. 433s Preparing to unpack .../094-git-buildpackage_0.9.25_all.deb ... 433s Unpacking git-buildpackage (0.9.25) ... 434s Selecting previously unselected package libexporter-tiny-perl. 434s Preparing to unpack .../095-libexporter-tiny-perl_1.002002-1_all.deb ... 434s Unpacking libexporter-tiny-perl (1.002002-1) ... 434s Selecting previously unselected package liblist-moreutils-xs-perl. 434s Preparing to unpack .../096-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 434s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 434s Selecting previously unselected package liblist-moreutils-perl. 434s Preparing to unpack .../097-liblist-moreutils-perl_0.430-2_all.deb ... 434s Unpacking liblist-moreutils-perl (0.430-2) ... 434s Selecting previously unselected package python3-debian. 434s Preparing to unpack .../098-python3-debian_0.1.43ubuntu1.1_all.deb ... 434s Unpacking python3-debian (0.1.43ubuntu1.1) ... 434s Selecting previously unselected package python3-gpg. 434s Preparing to unpack .../099-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 434s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 434s Selecting previously unselected package dput. 434s Preparing to unpack .../100-dput_1.1.0ubuntu2.1_all.deb ... 434s Unpacking dput (1.1.0ubuntu2.1) ... 434s Selecting previously unselected package libjson-perl. 434s Preparing to unpack .../101-libjson-perl_4.04000-1_all.deb ... 434s Unpacking libjson-perl (4.04000-1) ... 434s Selecting previously unselected package libtext-glob-perl. 434s Preparing to unpack .../102-libtext-glob-perl_0.11-2_all.deb ... 434s Unpacking libtext-glob-perl (0.11-2) ... 434s Selecting previously unselected package libwww-curl-perl. 434s Preparing to unpack .../103-libwww-curl-perl_4.17-7build2_amd64.deb ... 434s Unpacking libwww-curl-perl (4.17-7build2) ... 434s Selecting previously unselected package libtext-csv-perl. 434s Preparing to unpack .../104-libtext-csv-perl_2.01-1_all.deb ... 434s Unpacking libtext-csv-perl (2.01-1) ... 434s Selecting previously unselected package dgit. 434s Preparing to unpack .../105-dgit_9.15_all.deb ... 434s Unpacking dgit (9.15) ... 434s Selecting previously unselected package libcgi-pm-perl. 434s Preparing to unpack .../106-libcgi-pm-perl_4.54-1_all.deb ... 434s Unpacking libcgi-pm-perl (4.54-1) ... 434s Selecting previously unselected package libdbi-perl:amd64. 434s Preparing to unpack .../107-libdbi-perl_1.643-3build3_amd64.deb ... 434s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 434s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 434s Preparing to unpack .../108-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 434s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 434s Selecting previously unselected package libfile-libmagic-perl. 434s Preparing to unpack .../109-libfile-libmagic-perl_1.23-1build2_amd64.deb ... 434s Unpacking libfile-libmagic-perl (1.23-1build2) ... 434s Selecting previously unselected package libhttp-server-simple-perl. 434s Preparing to unpack .../110-libhttp-server-simple-perl_0.52-1.1_all.deb ... 434s Unpacking libhttp-server-simple-perl (0.52-1.1) ... 434s Selecting previously unselected package libhttp-server-simple-static-perl. 434s Preparing to unpack .../111-libhttp-server-simple-static-perl_0.14-1_all.deb ... 434s Unpacking libhttp-server-simple-static-perl (0.14-1) ... 434s Selecting previously unselected package sqlite3. 434s Preparing to unpack .../112-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 434s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 434s Selecting previously unselected package chiark-utils-bin. 434s Preparing to unpack .../113-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 434s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 434s Selecting previously unselected package dgit-infrastructure. 434s Preparing to unpack .../114-dgit-infrastructure_9.15_all.deb ... 434s Unpacking dgit-infrastructure (9.15) ... 434s Selecting previously unselected package libfaketime:amd64. 434s Preparing to unpack .../115-libfaketime_0.9.8-9_amd64.deb ... 434s Unpacking libfaketime:amd64 (0.9.8-9) ... 434s Selecting previously unselected package faketime. 434s Preparing to unpack .../116-faketime_0.9.8-9_amd64.deb ... 434s Unpacking faketime (0.9.8-9) ... 434s Setting up wdiff (1.2.2-2build3) ... 434s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 434s Setting up libfile-which-perl (1.23-1) ... 434s Setting up libdynaloader-functions-perl (0.003-1.1) ... 434s Setting up libtext-glob-perl (0.11-2) ... 434s Setting up libclass-method-modifiers-perl (2.13-1) ... 434s Setting up libio-pty-perl (1:1.15-2build2) ... 434s Setting up libarchive-zip-perl (1.68-1) ... 434s Setting up libhtml-tagset-perl (3.20-4) ... 434s Setting up libdebhelper-perl (13.6ubuntu1) ... 434s Setting up liblwp-mediatypes-perl (6.04-1) ... 434s Setting up libtry-tiny-perl (0.31-1) ... 434s Setting up perl-openssl-defaults:amd64 (5build2) ... 434s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 434s Setting up bc (1.07.1-3build1) ... 434s Setting up m4 (1.4.18-5ubuntu2) ... 434s Setting up libwww-curl-perl (4.17-7build2) ... 434s Setting up libencode-locale-perl (1.05-1.1) ... 434s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 434s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 434s Setting up chiark-utils-bin (6.1.2+nmu1) ... 434s Setting up fakeroot (1.28-1ubuntu1) ... 434s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 434s Setting up liberror-perl (0.17029-1) ... 434s Setting up patchutils (0.4.2-1build2) ... 434s Setting up autotools-dev (20220109.1) ... 434s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 434s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 434s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 434s Setting up python3-debian (0.1.43ubuntu1.1) ... 434s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up libmpc3:amd64 (1.2.1-2build1) ... 434s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up libio-html-perl (1.004-2) ... 434s Setting up autopoint (0.21-4ubuntu4) ... 434s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 434s Setting up libipc-run-perl (20200505.0-1) ... 434s Setting up libfile-libmagic-perl (1.23-1build2) ... 434s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 434s Setting up autoconf (2.71-2) ... 434s Setting up libtimedate-perl (2.3300-2) ... 434s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up dwz (0.14-1build2) ... 434s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 434s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 434s Setting up libjson-perl (4.04000-1) ... 434s Setting up librole-tiny-perl (2.002004-1) ... 434s Setting up debugedit (1:5.0-4build1) ... 434s Setting up libsub-override-perl (0.09-2) ... 434s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 434s Setting up python3-dateutil (2.8.1-6) ... 434s Setting up libsub-quote-perl (2.006006-1) ... 434s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 434s Setting up libexporter-tiny-perl (1.002002-1) ... 434s Setting up libfile-dirlist-perl (0.05-2) ... 434s Setting up libisl23:amd64 (0.24-2build1) ... 434s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 434s Setting up libfile-homedir-perl (1.006-1) ... 434s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up liburi-perl (5.10-1) ... 434s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 434s Setting up libfile-touch-perl (0.12-1) ... 434s Setting up libdbi-perl:amd64 (1.643-3build3) ... 434s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 434s Setting up libfaketime:amd64 (0.9.8-9) ... 434s Setting up libtext-csv-perl (2.01-1) ... 434s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 434s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 434s Setting up automake (1:1.16.5-1.3) ... 434s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 434s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 434s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 434s Setting up faketime (0.9.8-9) ... 434s Setting up libhttp-date-perl (6.05-1) ... 434s Setting up gettext (0.21-4ubuntu4) ... 434s Setting up libfile-listing-perl (6.14-1) ... 434s Setting up liblist-moreutils-perl (0.430-2) ... 434s Setting up libnet-http-perl (6.22-1) ... 434s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 434s Setting up dput (1.1.0ubuntu2.1) ... 434s Setting up intltool-debian (0.35.0+20060710.5) ... 434s Setting up git (1:2.34.1-1ubuntu1.12) ... 434s Setting up dh-strip-nondeterminism (1.13.0-1) ... 434s Setting up libwww-robotrules-perl (6.02-1) ... 434s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 434s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 434s Setting up cpp (4:11.2.0-1ubuntu1) ... 434s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 434s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 434s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 434s Setting up libio-socket-ssl-perl (2.074-2) ... 434s Setting up libhttp-message-perl (6.36-1) ... 434s Setting up libhttp-negotiate-perl (6.01-1) ... 434s Setting up libhttp-cookies-perl (6.10-1) ... 434s Setting up libtool (2.4.6-15build2) ... 434s Setting up po-debconf (1.0.21+nmu1) ... 434s Setting up libhtml-tree-perl (5.07-2) ... 434s Setting up libparams-classify-perl (0.015-1build5) ... 434s Setting up libcgi-pm-perl (4.54-1) ... 434s Setting up gcc (4:11.2.0-1ubuntu1) ... 435s Setting up dh-autoreconf (20) ... 435s Setting up libmodule-runtime-perl (0.016-1) ... 435s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 435s Setting up dgit-infrastructure (9.15) ... 435s Setting up libhttp-server-simple-perl (0.52-1.1) ... 435s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 435s Setting up libhttp-server-simple-static-perl (0.14-1) ... 435s Setting up libimport-into-perl (1.002005-1) ... 435s Setting up libmoo-perl (2.005004-3) ... 435s Setting up debhelper (13.6ubuntu1) ... 435s Setting up g++ (4:11.2.0-1ubuntu1) ... 435s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 435s Setting up build-essential (12.9ubuntu3) ... 435s Setting up liblwp-protocol-https-perl (6.10-1) ... 435s Setting up libwww-perl (6.61-1) ... 435s Setting up devscripts (2.22.1ubuntu1) ... 435s Setting up git-buildpackage (0.9.25) ... 435s Setting up dgit (9.15) ... 435s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 435s Processing triggers for man-db (2.10.2-1) ... 435s Processing triggers for install-info (6.8-4build1) ... 436s autopkgtest [12:25:30]: test alternating-dgit: [----------------------- 436s ++ set -o pipefail 436s ++ . tests/lib-core 436s ++ . tests/lib-restricts 436s ++ trap ' 436s rc=$? 436s set +x 436s test $rc = 0 || echo " 436s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 436s 436s Most relevant logs are just before assignment rc=$rc 436s Will now do cleanup etc. 436s " 436s set -x 436s set +e 436s pwd 436s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 436s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 436s set -e 436s test $rc = 0 || t-report-failure 436s ' EXIT 436s ++ t-filter-out-git-hyphen-dir 436s ++ local pathent 436s +++ type -p git-rev-parse 436s +++ : 436s ++ pathent= 436s ++ case "$pathent" in 436s ++ return 436s ++ t-set-intree 436s ++ '[' x = x ']' 436s ++ return 436s ++ : -D 436s ++ export DGIT_TEST_DEBUG 436s ++ : x 436s ++ export DGIT_TEST_DEBPUSH_DEBUG 436s ++ : 436s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 436s ++ GIT_COMMITTER_DATE='1530000000 +0100' 436s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 436s ++ GIT_AUTHOR_DATE='1530000000 +0100' 436s ++ export LC_CTYPE=C.UTF-8 436s ++ LC_CTYPE=C.UTF-8 436s ++ unset CDPATH 436s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 436s ++ FILTER_BRANCH_SQUELCH_WARNING=1 436s +++ pwd 436s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 436s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ testname=alternating-dgit 436s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ bpd=.. 436s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 436s ++ '[' x '!=' x ']' 436s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s +++ pwd 436s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ t-set-using-tmp 436s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 436s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 436s ++ export 'DEBFULLNAME=dgit test git user' 436s ++ DEBFULLNAME='dgit test git user' 436s ++ git config --global user.email dgit-test@debian.example.net 436s ++ git config --global user.name 'dgit test git user' 436s ++ git config --global protocol.ext.allow always 436s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 436s ++ env -0 436s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 436s ++ export DEBCHANGE_VENDOR=dpkg 436s ++ DEBCHANGE_VENDOR=dpkg 436s ++ unset VISUAL 436s ++ unset GIT_EDITOR 436s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 436s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 436s ++ cat 436s ++ schroot=build 436s ++ : aq 436s ++ : archive/test-dummy 436s ++ : sid:unstable 436s ++ t-git-config dgit.default.old-dsc-distro test-dummy 436s ++ git config --global dgit.default.old-dsc-distro test-dummy 436s ++ for import in ${autoimport-gnupg} 436s ++ case "$0" in 436s ++ t-setup-import gnupg 436s ++ local setupname=gnupg 436s ++ local setupsrc 436s ++ local lock 436s ++ '[' x = x ']' 436s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 436s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 436s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 436s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 436s cd "$1"; shift 436s setupname="$1"; shift 436s simport="$1"; shift 436s if [ -e "$simport" ]; then exit 0; fi 436s env - "$@" \ 436s "tests/setup/$setupname" 436s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 436s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 436s + shift 436s + setupname=gnupg 436s + shift 436s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 436s + shift 436s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 436s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/alternating-dgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/alternating-dgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/alternating-dgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/alternating-dgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 436s ++ set -o pipefail 436s ++ . tests/lib-core 436s ++ . tests/lib-restricts 436s ++ trap ' 436s rc=$? 436s set +x 436s test $rc = 0 || echo " 436s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 436s 436s Most relevant logs are just before assignment rc=$rc 436s Will now do cleanup etc. 436s " 436s set -x 436s set +e 436s pwd 436s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 436s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 436s set -e 436s test $rc = 0 || t-report-failure 436s ' EXIT 436s ++ t-filter-out-git-hyphen-dir 436s ++ local pathent 436s +++ type -p git-rev-parse 436s +++ : 436s ++ pathent= 436s ++ case "$pathent" in 436s ++ return 436s ++ t-set-intree 436s ++ '[' x = x ']' 436s ++ return 436s ++ : -D 436s ++ export DGIT_TEST_DEBUG 436s ++ : x 436s ++ export DGIT_TEST_DEBPUSH_DEBUG 436s ++ : 436s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 436s ++ GIT_COMMITTER_DATE='1530000000 +0100' 436s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 436s ++ GIT_AUTHOR_DATE='1530000000 +0100' 436s ++ export LC_CTYPE=C.UTF-8 436s ++ LC_CTYPE=C.UTF-8 436s ++ unset CDPATH 436s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 436s ++ FILTER_BRANCH_SQUELCH_WARNING=1 436s +++ pwd 436s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 436s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ testname=gnupg 436s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 436s ++ bpd=.. 436s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 436s ++ '[' x '!=' x ']' 436s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s +++ pwd 436s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ t-set-using-tmp 436s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 436s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 436s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 436s ++ export 'DEBFULLNAME=dgit test git user' 436s ++ DEBFULLNAME='dgit test git user' 436s ++ git config --global user.email dgit-test@debian.example.net 436s ++ git config --global user.name 'dgit test git user' 436s ++ git config --global protocol.ext.allow always 436s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 436s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 436s ++ export DEBCHANGE_VENDOR=dpkg 436s ++ DEBCHANGE_VENDOR=dpkg 436s ++ unset VISUAL 436s ++ unset GIT_EDITOR 436s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 436s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 436s ++ cat 436s ++ schroot=build 436s ++ : aq 436s ++ : archive/test-dummy 436s ++ : sid:unstable 436s ++ t-git-config dgit.default.old-dsc-distro test-dummy 436s ++ git config --global dgit.default.old-dsc-distro test-dummy 436s ++ for import in ${autoimport-gnupg} 436s ++ case "$0" in 436s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 436s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 436s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 436s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 436s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 436s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 436s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 436s + setup=' 436s export GNUPGHOME=$tmp/gnupg 436s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 436s 436s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 436s ssb rsa2048 2013-11-17 [E] 436s 436s sec rsa2048 2014-01-26 [SC] 436s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 436s uid [ultimate] Populus Romanus (test key) 436s ssb rsa2048 2014-01-26 [E] 436s 436s sec rsa2048 2014-01-26 [SC] 436s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 436s uid [ unknown] Hannibal (test key) 436s ssb rsa2048 2014-01-26 [E] 436s 436s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 436s export GNUPGHOME=$tmp/gnupg 436s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 436s 436s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + t-aq-archive-updated new example 437s + local suite=new 437s + local p=example 437s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + perl -wne ' 437s use JSON; 437s use strict; 437s our @v; 437s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 437s push @v, { 437s "version" => "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 437s + cat 437s + jsondelim=' },' 437s + for suitespec in $suitespecs 437s + local suite=stable 437s + local sname=stable 437s + t-aq-archive-updated stable example 437s + local suite=stable 437s + local p=example 437s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 437s + perl -wne ' 437s use JSON; 437s use strict; 437s our @v; 437s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 437s push @v, { 437s "version" => "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + t-aq-archive-updated new example 437s + local suite=new 437s + local p=example 437s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + perl -wne ' 437s use JSON; 437s use strict; 437s our @v; 437s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 437s push @v, { 437s "version" => "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + ln -sf stable /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 437s + cat 437s + jsondelim=' },' 437s + for suitespec in $suitespecs 437s + local suite=testing 437s + local sname=testing 437s + t-aq-archive-updated testing example 437s + local suite=testing 437s + local p=example 437s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 437s + perl -wne ' 437s use JSON; 437s use strict; 437s our @v; 437s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 437s push @v, { 437s "version" => "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + t-aq-archive-updated new example 437s + local suite=new 437s + local p=example 437s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 437s + perl -wne ' 437s use JSON; 437s use strict; 437s our @v; 437s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 437s push @v, { 437s "version" => "$1", 437s "sha256sum" => "$2", 437s "component" => "$3", 437s "filename" => "$4", 437s }; 437s END { 437s my $json = JSON->new->canonical(); 437s print $json->encode(\@v) or die $!; 437s } 437s ' 437s + ln -sf testing /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/testing 437s + cat 437s + jsondelim=' },' 437s + cat 437s + t-git-none 437s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 437s + set -e 437s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 437s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 437s + t-worktree 1.0 437s + rm -rf example 437s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0 437s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 437s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 437s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 437s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 437s + cd example 437s + git show-ref --verify --quiet refs/heads/master 437s + cd .. 437s + cd example 437s + revision=1 437s + echo ancestor 437s + git add which 437s + t-commit Ancestor '' stable 437s + local msg=Ancestor 437s + v=1.1 437s + t-debchange --force-distribution -v1.1 --distribution stable Ancestor 437s + DEBEMAIL=dgit-tests@example.org 437s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.1 --distribution stable Ancestor 437s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.1 --distribution stable Ancestor 437s debchange warning: Unable to determine if stable is a valid Ubuntu release. 437s libdistro-info-perl is not installed, Debian release names are not known. 437s libdistro-info-perl is not installed, Ubuntu release names are not known. 437s + git add debian/changelog 437s + debcommit 437s git commit -m Ancestor 437s [master 6ede489] Ancestor 437s 2 files changed, 7 insertions(+) 437s create mode 100644 which 437s + revision=2 437s + push-to master stable 437s + t-refs-same-start 437s + unset t_ref_val 437s + t_ref_names=() 437s + t-ref-head 437s + local val 437s ++ git rev-parse HEAD 437s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 437s + t-ref-same-val HEAD 6ede489d12a09dd148d1f78c3a2179afddf29843 437s + local name=HEAD 437s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 437s + case "${t_ref_val-unset}" in 437s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 437s + t_ref_names+=("$name") 437s + t-dgit build 437s + local dgit=dgit 437s + pwd 437s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 437s + : ' 437s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 437s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 437s | git rev-parse --show-toplevel 437s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 437s | git config -z --get-regexp --local '.*' 437s | git config -z --get-regexp --local '.*' 437s | git config -z --get-regexp --global '.*' 437s | git config -z --get-regexp --system '.*' 437s format , quilt mode linear 437s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 437s warning: could not open directory 'debian/source/': No such file or directory 437s => `' 437s + git diff --quiet HEAD 437s massage split -F. 437s massage done 3 -b. 437s format , quilt mode linear 437s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 437s warning: could not open directory 'debian/source/': No such file or directory 437s => `' 437s + git diff --quiet HEAD 437s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 437s dpkg-buildpackage: info: source package example 437s dpkg-buildpackage: info: source version 1.1 437s dpkg-buildpackage: info: source distribution stable 437s dpkg-buildpackage: info: source changed by dgit test git user 437s fakeroot debian/rules clean 437s EXAMPLE RULES TARGET clean 437s dh_clean 437s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 437s | git clean -dn 437s => `' 437s | git rev-parse 'HEAD~0' 437s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 437s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 437s CD work 437s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 437s + git reset -q --hard 6ede489d12a09dd148d1f78c3a2179afddf29843 437s CD .. 437s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 437s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 437s dpkg-source: warning: source directory 'work' is not - 'example-1.1' 437s dpkg-source: info: using source format '1.0' 437s dpkg-source: info: building example in example_1.1.tar.gz 437s dpkg-source: info: building example in example_1.1.dsc 437s CD work 437s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 437s package seems new, not specifying -v 437s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.1_source.changes dpkg-genchanges -S 438s dpkg-genchanges: info: including full source code in upload 438s CD .. 438s moving example_1.1.dsc, example_1.1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 438s renaming (Files) example_1.1.tar.gz 438s renaming (dsc) example_1.1.dsc 438s renaming (changes) example_1.1_source.changes 438s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 438s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 438s dpkg-buildpackage: info: source package example 438s dpkg-buildpackage: info: source version 1.1 438s dpkg-buildpackage: info: source distribution stable 438s dpkg-buildpackage: info: source changed by dgit test git user 438s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 438s dpkg-buildpackage: info: host architecture amd64 438s debian/rules build 438s EXAMPLE RULES TARGET build 438s fakeroot debian/rules binary 438s EXAMPLE RULES TARGET binary 438s dh_install 438s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 438s dh_gencontrol 438s dh_builddeb 438s dpkg-deb: building package 'example' in '../example_1.1_all.deb'. 438s dpkg-genbuildinfo --build=binary -O../example_1.1_amd64.buildinfo 438s dpkg-genchanges --build=binary -O../example_1.1_amd64.changes 438s dpkg-genchanges: info: binary-only upload (no source code included) 438s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 438s dpkg-buildpackage: info: binary-only upload (no source included) 438s CD .. 438s + mergechanges -f example_1.1_source.changes example_1.1_amd64.changes 439s dgit ok: build successful, results in example_1.1_multi.changes 439s 439s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 439s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 439s ' 439s + t-dgit push --new stable 439s + local dgit=dgit 439s + pwd 439s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 439s + : ' 439s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 439s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 439s | git rev-parse --show-toplevel 439s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 439s | git config -z --get-regexp --local '.*' 439s | git config -z --get-regexp --local '.*' 439s | git config -z --get-regexp --global '.*' 439s | git config -z --get-regexp --system '.*' 439s format , quilt mode linear 439s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 439s warning: could not open directory 'debian/source/': No such file or directory 439s => `' 439s + git diff --quiet HEAD 439s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 439s canonical suite name is stable 439s actually entering push 439s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 439s => `0' 439s + git config remote.dgit.skipdefaultupdate true 439s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 439s get_archive_dsc: nothing in archive, returning undef 439s no version available from the archive 439s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 439s => `' 439s previous reference hash= 439s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 439s => `' 439s fetch_from_archive: lastfetch= 439s nothing found! 439s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 439s + git check-ref-format archive/test-dummy/1.1 439s | git symbolic-ref -q HEAD 439s => `refs/heads/master' 439s | git rev-parse 'HEAD~0' 439s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 439s ffq_prev_branchinfo branch current refs/heads/master 439s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 439s => `' 439s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 439s => `' 439s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 439s warning: could not open directory 'debian/source/': No such file or directory 439s => `' 439s + git diff --quiet HEAD 439s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.1' 439s => `' 439s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 439s checking that example_1.1.dsc corresponds to HEAD 439s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.1.dsc 439s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.1.dsc) 439s dpkg-source: info: extracting example in example-1.1 439s dpkg-source: info: unpacking example_1.1.tar.gz 439s CD example-1.1 439s | find -name .git -prune -print0 439s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 439s + git add -Af . 439s | git write-tree 439s => `f903521c6c60a705864da4c6c6716f8fbff08fcf' 439s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 439s + git diff --quiet f903521c6c60a705864da4c6c6716f8fbff08fcf 6ede489d12a09dd148d1f78c3a2179afddf29843 439s files_compare_inputs example_1.1.dsc 439s files_compare_inputs example_1.1.dsc Checksums-Sha256 439s files_compare_inputs example_1.1.dsc Checksums-Sha256 example_1.1.tar.gz 439s files_compare_inputs example_1.1.dsc Checksums-Sha1 439s files_compare_inputs example_1.1.dsc Checksums-Sha1 example_1.1.tar.gz 439s files_compare_inputs example_1.1.dsc Files 439s files_compare_inputs example_1.1.dsc Files example_1.1.tar.gz 439s files_compare_inputs example_1.1_multi.changes 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.dsc 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1.tar.gz 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_all.deb 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha256 example_1.1_amd64.buildinfo 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.dsc 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1.tar.gz 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_all.deb 439s files_compare_inputs example_1.1_multi.changes Checksums-Sha1 example_1.1_amd64.buildinfo 439s files_compare_inputs example_1.1_multi.changes Files 439s files_compare_inputs example_1.1_multi.changes Files example_1.1.dsc 439s files_compare_inputs example_1.1_multi.changes Files example_1.1.tar.gz 439s files_compare_inputs example_1.1_multi.changes Files example_1.1_all.deb 439s files_compare_inputs example_1.1_multi.changes Files example_1.1_amd64.buildinfo 439s checking origs needed (1.1)... 439s checking origs needed placement 'devel extra'... 439s origs example_1.1.tar.gz | 34b381ab0da452e877e28d6c39cc00da 758 example_1.1.tar.gz 439s ../example_1.1_multi.changes already has appropriate .orig(s) (if any) 439s push_tagwants: $VAR1 = [ 439s '1.1', 439s '6ede489d12a09dd148d1f78c3a2179afddf29843', 439s undef, 439s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 439s ]; 439s $VAR2 = [ 439s { 439s 'Tag' => 'archive/test-dummy/1.1', 439s 'View' => 'dgit', 439s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 439s 'TfSuffix' => '', 439s 'Tfn' => sub { "DUMMY" }, 439s 'TagFn' => sub { "DUMMY" } 439s }, 439s { 439s 'View' => 'dgit', 439s 'Tag' => 'test-dummy/1.1', 439s 'Objid' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 439s 'Tfn' => sub { "DUMMY" }, 439s 'TfSuffix' => '-dgit', 439s 'TagFn' => sub { "DUMMY" } 439s } 439s ]; 439s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 439s => `1530000000 +0000' 439s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 439s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 439s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 439s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 439s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 439s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 439s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 439s => `db986af22779b497e88d14dd5c570d08aa97f433' 439s + git verify-tag db986af22779b497e88d14dd5c570d08aa97f433 439s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 439s gpg: Signature made Mon Mar 31 12:25:33 2025 UTC 439s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 439s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 439s gpg: WARNING: This key is not certified with a trusted signature! 439s gpg: There is no indication that the signature belongs to the owner. 439s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 439s + git update-ref refs/tags/archive/test-dummy/1.1 db986af22779b497e88d14dd5c570d08aa97f433 439s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 439s => `e085e2c1b3da17376756d6520252915e13bde377' 439s + git verify-tag e085e2c1b3da17376756d6520252915e13bde377 439s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 439s gpg: Signature made Mon Mar 31 12:25:33 2025 UTC 439s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 439s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 439s gpg: WARNING: This key is not certified with a trusted signature! 439s gpg: There is no indication that the signature belongs to the owner. 439s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 439s + git update-ref refs/tags/test-dummy/1.1 e085e2c1b3da17376756d6520252915e13bde377 439s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 439s => `0' 439s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 439s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6ede489d12a09dd148d1f78c3a2179afddf29843:refs/dgit/stable refs/tags/archive/test-dummy/1.1 refs/tags/test-dummy/1.1 439s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 439s * [new reference] 6ede489d12a09dd148d1f78c3a2179afddf29843 -> refs/dgit/stable 439s * [new tag] archive/test-dummy/1.1 -> archive/test-dummy/1.1 439s * [new tag] test-dummy/1.1 -> test-dummy/1.1 439s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 439s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.1_multi.changes 439s signfile dsc ../example_1.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s 440s signfile buildinfo ../example_1.1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s 440s fixup_changes dsc ../example_1.1.dsc ../example_1.1_multi.changes 440s fixup_changes buildinfo ../example_1.1_amd64.buildinfo ../example_1.1_multi.changes 440s signfile changes ../example_1.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s 440s Successfully signed dsc, buildinfo, changes files 440s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.1_multi.changes 440s gpg: ../example_1.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 440s gpg: ../example_1.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 440s D: Setting host argument. 440s Checking signature on .changes 440s Checking signature on .dsc 440s Uploading to test-dummy (via local to localhost): 440s Successfully uploaded packages. 440s dgit ok: pushed and uploaded 1.1 440s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 440s del_lrfetchrefs... 440s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 440s ' 440s + t-pushed-good master stable 440s + local branch=master 440s + local suite=stable 440s + t-refs-same refs/heads/master 440s + local g 440s + for g in $* 440s + t-ref-same refs/heads/master 440s + local name=refs/heads/master 440s + local val 440s ++ t-git-get-ref refs/heads/master 440s ++ local ref=refs/heads/master 440s ++ case "$ref" in 440s ++ git show-ref -d refs/heads/master 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val refs/heads/master 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=refs/heads/master 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s + t-pushed-good-core 440s + t-ref-dsc-dgit 440s + t-incoming-dsc 440s + local dsc=example_1.1.dsc 440s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 440s + local val 440s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc Dgit 440s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 440s ++ local field=Dgit 440s ++ perl -e ' 440s use Dpkg::Control::Hash; 440s my $h = new Dpkg::Control::Hash allow_pgp=>1; 440s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc"); 440s my $val = $h->{"Dgit"},"\n"; 440s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc Dgit" unless defined $val; 440s print $val,"\n"; 440s ' 440s + val='6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 440s ++ perl -e ' 440s $_=shift @ARGV; 440s die "Dgit $_ ?" unless m/^\w+\b/; 440s print $&,"\n" or die $!; 440s ' '6ede489d12a09dd148d1f78c3a2179afddf29843 test-dummy archive/test-dummy/1.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s ++ t-v-tag 440s ++ echo refs/tags/archive/test-dummy/1.1 440s + t-refs-same refs/tags/archive/test-dummy/1.1 refs/remotes/dgit/dgit/stable 440s + local g 440s + for g in $* 440s + t-ref-same refs/tags/archive/test-dummy/1.1 440s + local name=refs/tags/archive/test-dummy/1.1 440s + local val 440s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 440s ++ local ref=refs/tags/archive/test-dummy/1.1 440s ++ case "$ref" in 440s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=refs/tags/archive/test-dummy/1.1 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s + for g in $* 440s + t-ref-same refs/remotes/dgit/dgit/stable 440s + local name=refs/remotes/dgit/dgit/stable 440s + local val 440s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 440s ++ local ref=refs/remotes/dgit/dgit/stable 440s ++ case "$ref" in 440s ++ git show-ref -d refs/remotes/dgit/dgit/stable 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val refs/remotes/dgit/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=refs/remotes/dgit/dgit/stable 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 440s + local val 440s + for g in $* 440s ++ t-git-get-ref refs/heads/dgit/unstable 440s ++ local ref=refs/heads/dgit/unstable 440s ++ case "$ref" in 440s ++ git show-ref -d refs/heads/dgit/unstable 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s ++ test 1 = 1 440s + val= 440s + '[' x '!=' x ']' 440s + for g in $* 440s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 440s ++ local ref=refs/remotes/dgit/dgit/unstable 440s ++ case "$ref" in 440s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s ++ test 1 = 1 440s + val= 440s + '[' x '!=' x ']' 440s + set -e 440s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 440s ++ t-v-tag 440s ++ echo refs/tags/archive/test-dummy/1.1 440s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.1 440s + local g 440s + for g in $* 440s + t-ref-same refs/dgit/stable 440s + local name=refs/dgit/stable 440s + local val 440s ++ t-git-get-ref refs/dgit/stable 440s ++ local ref=refs/dgit/stable 440s ++ case "$ref" in 440s ++ git show-ref -d refs/dgit/stable 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val refs/dgit/stable 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=refs/dgit/stable 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s + for g in $* 440s + t-ref-same refs/tags/archive/test-dummy/1.1 440s + local name=refs/tags/archive/test-dummy/1.1 440s + local val 440s ++ t-git-get-ref refs/tags/archive/test-dummy/1.1 440s ++ local ref=refs/tags/archive/test-dummy/1.1 440s ++ case "$ref" in 440s ++ git show-ref -d refs/tags/archive/test-dummy/1.1 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.1\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s + val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t-ref-same-val refs/tags/archive/test-dummy/1.1 6ede489d12a09dd148d1f78c3a2179afddf29843 440s + local name=refs/tags/archive/test-dummy/1.1 440s + local val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + case "${t_ref_val-unset}" in 440s + t_ref_val=6ede489d12a09dd148d1f78c3a2179afddf29843 440s + t_ref_names+=("$name") 440s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 440s + t-refs-notexist refs/dgit/unstable 440s + local val 440s + for g in $* 440s ++ t-git-get-ref refs/dgit/unstable 440s ++ local ref=refs/dgit/unstable 440s ++ case "$ref" in 440s ++ git show-ref -d refs/dgit/unstable 440s ++ perl -ne ' 440s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 440s END { print "$x\n" if length $x; } 440s ' 440s ++ test 1 = 1 440s + val= 440s + '[' x '!=' x ']' 440s ++ t-v-tag 440s ++ echo refs/tags/archive/test-dummy/1.1 440s + git verify-tag refs/tags/archive/test-dummy/1.1 440s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 440s gpg: Signature made Mon Mar 31 12:25:33 2025 UTC 440s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 440s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 440s gpg: WARNING: This key is not certified with a trusted signature! 440s gpg: There is no indication that the signature belongs to the owner. 440s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 440s + t-archive-process-incoming stable 440s + local suite=stable 440s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.1_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 440s + t-archive-query stable 440s + local suite=stable 440s + local dscf=main/example_1.1.dsc 440s + t-archive-query-aq stable example 1.1 main/example_1.1.dsc 440s + local suite=stable 440s + local p=example 440s + local v=1.1 440s + local dscf=main/example_1.1.dsc 440s + local sha 440s ++ sha256sum 440s + sha='feff4d394cbee21ec5a7f3618bcfc64df8be13fd692df5fbc545cd0f581c40d8 -' 440s + echo '1.1 feff4d394cbee21ec5a7f3618bcfc64df8be13fd692df5fbc545cd0f581c40d8 main/example_1.1.dsc' 440s + t-aq-archive-updated stable example 440s + local suite=stable 440s + local p=example 440s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 440s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 440s + perl -wne ' 440s use JSON; 440s use strict; 440s our @v; 440s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 440s push @v, { 440s "version" => "$1", 440s "sha256sum" => "$2", 440s "component" => "$3", 440s "filename" => "$4", 440s }; 440s END { 440s my $json = JSON->new->canonical(); 440s print $json->encode(\@v) or die $!; 440s } 440s ' 440s + git checkout -b stable 440s Switched to a new branch 'stable' 440s + echo stable 440s + git add which 440s + t-commit Stable '' stable 440s + local msg=Stable 440s + v=1.2 440s + t-debchange --force-distribution -v1.2 --distribution stable Stable 440s + DEBEMAIL=dgit-tests@example.org 440s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v1.2 --distribution stable Stable 440s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v1.2 --distribution stable Stable 440s debchange warning: Unable to determine if stable is a valid Ubuntu release. 440s libdistro-info-perl is not installed, Debian release names are not known. 440s libdistro-info-perl is not installed, Ubuntu release names are not known. 440s + git add debian/changelog 440s + debcommit 441s git commit -m Stable 441s [stable d5060e0] Stable 441s 2 files changed, 7 insertions(+), 1 deletion(-) 441s + revision=3 441s + push-to stable stable 441s + t-refs-same-start 441s + unset t_ref_val 441s + t_ref_names=() 441s + t-ref-head 441s + local val 441s ++ git rev-parse HEAD 441s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 441s + t-ref-same-val HEAD d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 441s + local name=HEAD 441s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 441s + case "${t_ref_val-unset}" in 441s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 441s + t_ref_names+=("$name") 441s + t-dgit build 441s + local dgit=dgit 441s + pwd 441s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 441s + : ' 441s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 441s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 441s | git rev-parse --show-toplevel 441s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 441s | git config -z --get-regexp --local '.*' 441s | git config -z --get-regexp --local '.*' 441s | git config -z --get-regexp --global '.*' 441s | git config -z --get-regexp --system '.*' 441s format , quilt mode linear 441s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 441s warning: could not open directory 'debian/source/': No such file or directory 441s => `' 441s + git diff --quiet HEAD 441s massage split -F. 441s massage done 3 -b. 441s format , quilt mode linear 441s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 441s warning: could not open directory 'debian/source/': No such file or directory 441s => `' 441s + git diff --quiet HEAD 441s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 441s dpkg-buildpackage: info: source package example 441s dpkg-buildpackage: info: source version 1.2 441s dpkg-buildpackage: info: source distribution stable 441s dpkg-buildpackage: info: source changed by dgit test git user 441s fakeroot debian/rules clean 441s EXAMPLE RULES TARGET clean 441s dh_clean 441s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 441s | git clean -dn 441s => `' 441s | git rev-parse 'HEAD~0' 441s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 441s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 441s CD work 441s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 441s + git reset -q --hard d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 441s CD .. 441s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 441s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 441s dpkg-source: warning: source directory 'work' is not - 'example-1.2' 441s dpkg-source: info: using source format '1.0' 441s dpkg-source: info: building example in example_1.2.tar.gz 441s dpkg-source: info: building example in example_1.2.dsc 441s CD work 441s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 441s changelog will contain changes since 1.1 441s + sh -ec 'exec >../$1; shift; exec "$@"' x example_1.2_source.changes dpkg-genchanges -S -v1.1 441s dpkg-genchanges: info: including full source code in upload 441s CD .. 441s moving example_1.2.dsc, example_1.2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 441s renaming (Files) example_1.2.tar.gz 441s renaming (dsc) example_1.2.dsc 441s renaming (changes) example_1.2_source.changes 441s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 441s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v1.1 441s dpkg-buildpackage: info: source package example 441s dpkg-buildpackage: info: source version 1.2 441s dpkg-buildpackage: info: source distribution stable 441s dpkg-buildpackage: info: source changed by dgit test git user 441s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 441s dpkg-buildpackage: info: host architecture amd64 441s debian/rules build 441s EXAMPLE RULES TARGET build 441s fakeroot debian/rules binary 441s EXAMPLE RULES TARGET binary 441s dh_install 441s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 441s dh_gencontrol 442s dh_builddeb 442s dpkg-deb: building package 'example' in '../example_1.2_all.deb'. 442s dpkg-genbuildinfo --build=binary -O../example_1.2_amd64.buildinfo 442s dpkg-genchanges --build=binary -v1.1 -O../example_1.2_amd64.changes 442s dpkg-genchanges: info: binary-only upload (no source code included) 442s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 442s dpkg-buildpackage: info: binary-only upload (no source included) 442s CD .. 442s + mergechanges -f example_1.2_source.changes example_1.2_amd64.changes 442s dgit ok: build successful, results in example_1.2_multi.changes 442s 442s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 442s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 442s ' 442s + t-dgit push --new stable 442s + local dgit=dgit 442s + pwd 442s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 442s + : ' 442s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 442s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new stable 442s | git rev-parse --show-toplevel 442s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 442s | git config -z --get-regexp --local '.*' 442s | git config -z --get-regexp --local '.*' 442s | git config -z --get-regexp --global '.*' 442s | git config -z --get-regexp --system '.*' 442s format , quilt mode linear 442s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 442s warning: could not open directory 'debian/source/': No such file or directory 442s => `' 442s + git diff --quiet HEAD 442s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 442s canonical suite name is stable 442s actually entering push 442s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 442s => `1' 442s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/stable dgit-rewrite/map 442s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/stable)|(?:refs/dgit\-rewrite\/map) 442s git_lrfetch_sane iteration 0 442s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/stable refs/dgit-rewrite/map 442s => 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit/stable 442s => db986af22779b497e88d14dd5c570d08aa97f433 refs/tags/archive/test-dummy/1.1 442s => e085e2c1b3da17376756d6520252915e13bde377 refs/tags/test-dummy/1.1 442s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/stable:refs/dgit-fetch/test-dummy/dgit/stable 442s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/stable:refs/dgit-fetch/test-dummy/dgit/stable' 442s | git for-each-ref refs/dgit-fetch/test-dummy 442s |> 6ede489d12a09dd148d1f78c3a2179afddf29843 commit refs/dgit-fetch/test-dummy/dgit/stable 442s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 442s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 442s git_lrfetch_sane: tidying any old suite lrfetchrefs 442s | git for-each-ref refs/dgit-fetch/stable 442s git_lrfetch_sane: git fetch --no-insane emulation complete 442s $VAR1 = { 442s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'db986af22779b497e88d14dd5c570d08aa97f433', 442s 'refs/dgit-fetch/test-dummy/dgit/stable' => '6ede489d12a09dd148d1f78c3a2179afddf29843', 442s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'e085e2c1b3da17376756d6520252915e13bde377' 442s }; 443s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 443s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/tags/archive/test-dummy/1.1 443s currently refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 443s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/tags/test-dummy/1.1 443s currently refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 443s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 443s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 443s offered refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 443s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 443s offered refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 443s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable/example... 443s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.1.dsc... 443s get_archive_dsc: Version 1.1 443s last upload to archive: specified git info (test-dummy) 443s GCF| git cat-file --batch 443s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 443s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 443s GCF>| 6ede489d12a09dd148d1f78c3a2179afddf29843 443s GCF<| 6ede489d12a09dd148d1f78c3a2179afddf29843 commit 255 443s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/stable' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s previous reference hash=6ede489d12a09dd148d1f78c3a2179afddf29843 443s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/stable' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s fetch_from_archive: lastfetch=6ede489d12a09dd148d1f78c3a2179afddf29843 443s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s fetch mergeinfos: 443s commit 6ede489d12a09dd148d1f78c3a2179afddf29843 Dgit field in .dsc from archive 443s fetch hash=6ede489d12a09dd148d1f78c3a2179afddf29843 443s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 6ede489d12a09dd148d1f78c3a2179afddf29843 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s + git update-ref -m 'dgit fetch stable' DGIT_ARCHIVE 6ede489d12a09dd148d1f78c3a2179afddf29843 443s | git log -n2 6ede489d12a09dd148d1f78c3a2179afddf29843 443s => `commit 6ede489d12a09dd148d1f78c3a2179afddf29843'... 443s | git ls-tree -lrz -- 6ede489d12a09dd148d1f78c3a2179afddf29843: 443s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 443s + git check-ref-format archive/test-dummy/1.2 443s | git symbolic-ref -q HEAD 443s => `refs/heads/stable' 443s | git rev-parse 'HEAD~0' 443s => `d5060e0b2c66d5369fd8d88a498efa3d9f2706e0' 443s ffq_prev_branchinfo branch current refs/heads/stable 443s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/stable' 443s => `' 443s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/stable' 443s => `' 443s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 443s warning: could not open directory 'debian/source/': No such file or directory 443s => `' 443s + git diff --quiet HEAD 443s | git merge-base 6ede489d12a09dd148d1f78c3a2179afddf29843 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git rev-parse '6ede489d12a09dd148d1f78c3a2179afddf29843~0' 443s => `6ede489d12a09dd148d1f78c3a2179afddf29843' 443s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/1.2' 443s => `' 443s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 443s checking that example_1.2.dsc corresponds to HEAD 443s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.2.dsc 443s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.2.dsc) 443s dpkg-source: info: extracting example in example-1.2 443s dpkg-source: info: unpacking example_1.2.tar.gz 443s CD example-1.2 443s | find -name .git -prune -print0 443s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 443s + git add -Af . 443s | git write-tree 443s => `04b91662ca770360f547964817f3b334b327a676' 443s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 443s + git diff --quiet 04b91662ca770360f547964817f3b334b327a676 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 443s files_compare_inputs example_1.2.dsc 443s files_compare_inputs example_1.2.dsc Checksums-Sha256 443s files_compare_inputs example_1.2.dsc Checksums-Sha256 example_1.2.tar.gz 443s files_compare_inputs example_1.2.dsc Checksums-Sha1 443s files_compare_inputs example_1.2.dsc Checksums-Sha1 example_1.2.tar.gz 443s files_compare_inputs example_1.2.dsc Files 443s files_compare_inputs example_1.2.dsc Files example_1.2.tar.gz 443s files_compare_inputs example_1.2_multi.changes 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.dsc 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2.tar.gz 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_all.deb 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha256 example_1.2_amd64.buildinfo 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.dsc 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2.tar.gz 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_all.deb 443s files_compare_inputs example_1.2_multi.changes Checksums-Sha1 example_1.2_amd64.buildinfo 443s files_compare_inputs example_1.2_multi.changes Files 443s files_compare_inputs example_1.2_multi.changes Files example_1.2.dsc 443s files_compare_inputs example_1.2_multi.changes Files example_1.2.tar.gz 443s files_compare_inputs example_1.2_multi.changes Files example_1.2_all.deb 443s files_compare_inputs example_1.2_multi.changes Files example_1.2_amd64.buildinfo 443s checking origs needed (1.2)... 443s checking origs needed placement 'devel extra'... 443s origs example_1.2.tar.gz | 22390cb6d6349ce2058dce0e096ce3c4 765 example_1.2.tar.gz 443s ../example_1.2_multi.changes already has appropriate .orig(s) (if any) 443s push_tagwants: $VAR1 = [ 443s '1.2', 443s 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 443s undef, 443s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 443s ]; 443s $VAR2 = [ 443s { 443s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 443s 'TagFn' => sub { "DUMMY" }, 443s 'TfSuffix' => '', 443s 'Tfn' => sub { "DUMMY" }, 443s 'Tag' => 'archive/test-dummy/1.2', 443s 'View' => 'dgit' 443s }, 443s { 443s 'Objid' => 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0', 443s 'TagFn' => sub { "DUMMY" }, 443s 'Tfn' => sub { "DUMMY" }, 443s 'TfSuffix' => '-dgit', 443s 'View' => 'dgit', 443s 'Tag' => 'test-dummy/1.2' 443s } 443s ]; 443s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 443s => `1530000000 +0000' 443s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 443s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 443s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 443s => `9bfa0703537b50800b9e049930198105ec7eb910' 443s + git verify-tag 9bfa0703537b50800b9e049930198105ec7eb910 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s gpg: Signature made Mon Mar 31 12:25:36 2025 UTC 443s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 443s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 443s gpg: WARNING: This key is not certified with a trusted signature! 443s gpg: There is no indication that the signature belongs to the owner. 443s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 443s + git update-ref refs/tags/archive/test-dummy/1.2 9bfa0703537b50800b9e049930198105ec7eb910 443s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 443s => `6b34536340e84e96e97d215c14ed9eee90156ac4' 443s + git verify-tag 6b34536340e84e96e97d215c14ed9eee90156ac4 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s gpg: Signature made Mon Mar 31 12:25:36 2025 UTC 443s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 443s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 443s gpg: WARNING: This key is not certified with a trusted signature! 443s gpg: There is no indication that the signature belongs to the owner. 443s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 443s + git update-ref refs/tags/test-dummy/1.2 6b34536340e84e96e97d215c14ed9eee90156ac4 443s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 443s => `1' 443s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git d5060e0b2c66d5369fd8d88a498efa3d9f2706e0:refs/dgit/stable refs/tags/archive/test-dummy/1.2 refs/tags/test-dummy/1.2 443s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 443s 6ede489..d5060e0 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 -> refs/dgit/stable 443s * [new tag] archive/test-dummy/1.2 -> archive/test-dummy/1.2 443s * [new tag] test-dummy/1.2 -> test-dummy/1.2 443s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 443s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_1.2_multi.changes 443s signfile dsc ../example_1.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s 443s signfile buildinfo ../example_1.2_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s 443s fixup_changes dsc ../example_1.2.dsc ../example_1.2_multi.changes 443s fixup_changes buildinfo ../example_1.2_amd64.buildinfo ../example_1.2_multi.changes 443s signfile changes ../example_1.2_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 443s 443s Successfully signed dsc, buildinfo, changes files 443s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_1.2_multi.changes 444s gpg: ../example_1.2_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 444s gpg: ../example_1.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 444s D: Setting host argument. 444s Checking signature on .changes 444s Checking signature on .dsc 444s Uploading to test-dummy (via local to localhost): 444s Successfully uploaded packages. 444s dgit ok: pushed and uploaded 1.2 444s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 444s del_lrfetchrefs... 444s del_lrfetchrefs: 6ede489d12a09dd148d1f78c3a2179afddf29843 refs/dgit-fetch/test-dummy/dgit/stable 444s del_lrfetchrefs: db986af22779b497e88d14dd5c570d08aa97f433 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 444s del_lrfetchrefs: e085e2c1b3da17376756d6520252915e13bde377 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 444s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 444s ' 444s + t-pushed-good stable stable 444s + local branch=stable 444s + local suite=stable 444s + t-refs-same refs/heads/stable 444s + local g 444s + for g in $* 444s + t-ref-same refs/heads/stable 444s + local name=refs/heads/stable 444s + local val 444s ++ t-git-get-ref refs/heads/stable 444s ++ local ref=refs/heads/stable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/heads/stable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/heads/stable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val refs/heads/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=refs/heads/stable 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s + t-pushed-good-core 444s + t-ref-dsc-dgit 444s + t-incoming-dsc 444s + local dsc=example_1.2.dsc 444s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 444s + local val 444s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc Dgit 444s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 444s ++ local field=Dgit 444s ++ perl -e ' 444s use Dpkg::Control::Hash; 444s my $h = new Dpkg::Control::Hash allow_pgp=>1; 444s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc"); 444s my $val = $h->{"Dgit"},"\n"; 444s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc Dgit" unless defined $val; 444s print $val,"\n"; 444s ' 444s + val='d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 444s ++ perl -e ' 444s $_=shift @ARGV; 444s die "Dgit $_ ?" unless m/^\w+\b/; 444s print $&,"\n" or die $!; 444s ' 'd5060e0b2c66d5369fd8d88a498efa3d9f2706e0 test-dummy archive/test-dummy/1.2 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s ++ t-v-tag 444s ++ echo refs/tags/archive/test-dummy/1.2 444s + t-refs-same refs/tags/archive/test-dummy/1.2 refs/remotes/dgit/dgit/stable 444s + local g 444s + for g in $* 444s + t-ref-same refs/tags/archive/test-dummy/1.2 444s + local name=refs/tags/archive/test-dummy/1.2 444s + local val 444s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 444s ++ local ref=refs/tags/archive/test-dummy/1.2 444s ++ case "$ref" in 444s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=refs/tags/archive/test-dummy/1.2 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s + for g in $* 444s + t-ref-same refs/remotes/dgit/dgit/stable 444s + local name=refs/remotes/dgit/dgit/stable 444s + local val 444s ++ t-git-get-ref refs/remotes/dgit/dgit/stable 444s ++ local ref=refs/remotes/dgit/dgit/stable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/remotes/dgit/dgit/stable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/stable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val refs/remotes/dgit/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=refs/remotes/dgit/dgit/stable 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 444s + local val 444s + for g in $* 444s ++ t-git-get-ref refs/heads/dgit/unstable 444s ++ local ref=refs/heads/dgit/unstable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/heads/dgit/unstable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s ++ test 1 = 1 444s + val= 444s + '[' x '!=' x ']' 444s + for g in $* 444s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 444s ++ local ref=refs/remotes/dgit/dgit/unstable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s ++ test 1 = 1 444s + val= 444s + '[' x '!=' x ']' 444s + set -e 444s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 444s ++ t-v-tag 444s ++ echo refs/tags/archive/test-dummy/1.2 444s + t-refs-same refs/dgit/stable refs/tags/archive/test-dummy/1.2 444s + local g 444s + for g in $* 444s + t-ref-same refs/dgit/stable 444s + local name=refs/dgit/stable 444s + local val 444s ++ t-git-get-ref refs/dgit/stable 444s ++ local ref=refs/dgit/stable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/dgit/stable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/dgit/stable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val refs/dgit/stable d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=refs/dgit/stable 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s + for g in $* 444s + t-ref-same refs/tags/archive/test-dummy/1.2 444s + local name=refs/tags/archive/test-dummy/1.2 444s + local val 444s ++ t-git-get-ref refs/tags/archive/test-dummy/1.2 444s ++ local ref=refs/tags/archive/test-dummy/1.2 444s ++ case "$ref" in 444s ++ git show-ref -d refs/tags/archive/test-dummy/1.2 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/1.2\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s + val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t-ref-same-val refs/tags/archive/test-dummy/1.2 d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + local name=refs/tags/archive/test-dummy/1.2 444s + local val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=d5060e0b2c66d5369fd8d88a498efa3d9f2706e0 444s + t_ref_names+=("$name") 444s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 444s + t-refs-notexist refs/dgit/unstable 444s + local val 444s + for g in $* 444s ++ t-git-get-ref refs/dgit/unstable 444s ++ local ref=refs/dgit/unstable 444s ++ case "$ref" in 444s ++ git show-ref -d refs/dgit/unstable 444s ++ perl -ne ' 444s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 444s END { print "$x\n" if length $x; } 444s ' 444s ++ test 1 = 1 444s + val= 444s + '[' x '!=' x ']' 444s ++ t-v-tag 444s ++ echo refs/tags/archive/test-dummy/1.2 444s + git verify-tag refs/tags/archive/test-dummy/1.2 444s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 444s gpg: Signature made Mon Mar 31 12:25:36 2025 UTC 444s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 444s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 444s gpg: WARNING: This key is not certified with a trusted signature! 444s gpg: There is no indication that the signature belongs to the owner. 444s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 444s + t-archive-process-incoming stable 444s + local suite=stable 444s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_1.2_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 444s + t-archive-query stable 444s + local suite=stable 444s + local dscf=main/example_1.2.dsc 444s + t-archive-query-aq stable example 1.2 main/example_1.2.dsc 444s + local suite=stable 444s + local p=example 444s + local v=1.2 444s + local dscf=main/example_1.2.dsc 444s + local sha 444s ++ sha256sum 444s + sha='644346c252ce0f5f3d47f167d761ce150404bbe99ac2e64bf6991cb234f5cd4f -' 444s + echo '1.2 644346c252ce0f5f3d47f167d761ce150404bbe99ac2e64bf6991cb234f5cd4f main/example_1.2.dsc' 444s + t-aq-archive-updated stable example 444s + local suite=stable 444s + local p=example 444s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 444s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/stable 444s + perl -wne ' 444s use JSON; 444s use strict; 444s our @v; 444s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 444s push @v, { 444s "version" => "$1", 444s "sha256sum" => "$2", 444s "component" => "$3", 444s "filename" => "$4", 444s }; 444s END { 444s my $json = JSON->new->canonical(); 444s print $json->encode(\@v) or die $!; 444s } 444s ' 444s + git checkout master 444s Switched to branch 'master' 444s + majorv=2 444s + revision=0 444s + echo sid 444s + git add which 444s + t-commit Sid 444s + local msg=Sid 444s + v=2.0 444s + t-debchange --force-distribution -v2.0 --distribution unstable Sid 444s + DEBEMAIL=dgit-tests@example.org 444s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.0 --distribution unstable Sid 444s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.0 --distribution unstable Sid 444s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 444s libdistro-info-perl is not installed, Debian release names are not known. 444s libdistro-info-perl is not installed, Ubuntu release names are not known. 444s + git add debian/changelog 444s + debcommit 444s git commit -m Sid 444s [master 1c97ddd] Sid 444s 2 files changed, 7 insertions(+), 1 deletion(-) 444s + revision=1 444s + push-to master sid 444s + t-refs-same-start 444s + unset t_ref_val 444s + t_ref_names=() 444s + t-ref-head 444s + local val 444s ++ git rev-parse HEAD 444s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 444s + t-ref-same-val HEAD 1c97ddd6759afae0eea88cf10027c6cba8866ea1 444s + local name=HEAD 444s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 444s + case "${t_ref_val-unset}" in 444s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 444s + t_ref_names+=("$name") 444s + t-dgit build 444s + local dgit=dgit 444s + pwd 444s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 444s + : ' 444s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 444s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 444s | git rev-parse --show-toplevel 444s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 444s | git config -z --get-regexp --local '.*' 444s | git config -z --get-regexp --local '.*' 444s | git config -z --get-regexp --global '.*' 444s | git config -z --get-regexp --system '.*' 444s format , quilt mode linear 444s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 444s warning: could not open directory 'debian/source/': No such file or directory 444s => `' 444s + git diff --quiet HEAD 444s massage split -F. 444s massage done 3 -b. 444s format , quilt mode linear 444s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 444s warning: could not open directory 'debian/source/': No such file or directory 444s => `' 444s + git diff --quiet HEAD 444s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 444s dpkg-buildpackage: info: source package example 444s dpkg-buildpackage: info: source version 2.0 444s dpkg-buildpackage: info: source distribution unstable 444s dpkg-buildpackage: info: source changed by dgit test git user 444s fakeroot debian/rules clean 444s EXAMPLE RULES TARGET clean 444s dh_clean 444s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 444s | git clean -dn 444s => `' 444s | git rev-parse 'HEAD~0' 444s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 444s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 444s CD work 444s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 444s + git reset -q --hard 1c97ddd6759afae0eea88cf10027c6cba8866ea1 444s CD .. 444s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 444s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 444s dpkg-source: warning: source directory 'work' is not - 'example-2.0' 444s dpkg-source: info: using source format '1.0' 444s dpkg-source: info: building example in example_2.0.tar.gz 444s dpkg-source: info: building example in example_2.0.dsc 444s CD work 444s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 444s package seems new, not specifying -v 444s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0_source.changes dpkg-genchanges -S 445s dpkg-genchanges: info: including full source code in upload 445s CD .. 445s moving example_2.0.dsc, example_2.0_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 445s renaming (Files) example_2.0.tar.gz 445s renaming (dsc) example_2.0.dsc 445s renaming (changes) example_2.0_source.changes 445s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 445s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b 445s dpkg-buildpackage: info: source package example 445s dpkg-buildpackage: info: source version 2.0 445s dpkg-buildpackage: info: source distribution unstable 445s dpkg-buildpackage: info: source changed by dgit test git user 445s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 445s dpkg-buildpackage: info: host architecture amd64 445s debian/rules build 445s EXAMPLE RULES TARGET build 445s fakeroot debian/rules binary 445s EXAMPLE RULES TARGET binary 445s dh_install 445s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 445s dh_gencontrol 445s dh_builddeb 445s dpkg-deb: building package 'example' in '../example_2.0_all.deb'. 445s dpkg-genbuildinfo --build=binary -O../example_2.0_amd64.buildinfo 445s dpkg-genchanges --build=binary -O../example_2.0_amd64.changes 445s dpkg-genchanges: info: binary-only upload (no source code included) 445s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 445s dpkg-buildpackage: info: binary-only upload (no source included) 445s CD .. 445s + mergechanges -f example_2.0_source.changes example_2.0_amd64.changes 446s dgit ok: build successful, results in example_2.0_multi.changes 446s 446s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 446s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 446s ' 446s + t-dgit push --new sid 446s + local dgit=dgit 446s + pwd 446s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 446s + : ' 446s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 446s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 446s | git rev-parse --show-toplevel 446s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 446s | git config -z --get-regexp --local '.*' 446s | git config -z --get-regexp --local '.*' 446s | git config -z --get-regexp --global '.*' 446s | git config -z --get-regexp --system '.*' 446s format , quilt mode linear 446s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 446s warning: could not open directory 'debian/source/': No such file or directory 446s => `' 446s + git diff --quiet HEAD 446s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 446s canonical suite name for unstable is sid 446s actually entering push 446s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 446s => `1' 446s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 446s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 446s git_lrfetch_sane iteration 0 446s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 446s => db986af22779b497e88d14dd5c570d08aa97f433 refs/tags/archive/test-dummy/1.1 446s => 9bfa0703537b50800b9e049930198105ec7eb910 refs/tags/archive/test-dummy/1.2 446s => e085e2c1b3da17376756d6520252915e13bde377 refs/tags/test-dummy/1.1 446s => 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/tags/test-dummy/1.2 446s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* 446s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' 446s | git for-each-ref refs/dgit-fetch/test-dummy 446s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 446s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 446s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 446s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 446s git_lrfetch_sane: tidying any old suite lrfetchrefs 446s | git for-each-ref refs/dgit-fetch/sid 446s git_lrfetch_sane: git fetch --no-insane emulation complete 446s $VAR1 = { 446s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '9bfa0703537b50800b9e049930198105ec7eb910', 446s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '6b34536340e84e96e97d215c14ed9eee90156ac4', 446s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'e085e2c1b3da17376756d6520252915e13bde377', 446s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'db986af22779b497e88d14dd5c570d08aa97f433' 446s }; 446s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 446s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/tags/archive/test-dummy/1.1 446s currently refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 446s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/tags/archive/test-dummy/1.2 446s currently refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 446s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/tags/test-dummy/1.1 446s currently refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 446s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/tags/test-dummy/1.2 446s currently refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 446s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 446s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 446s offered refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 446s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 446s offered refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 446s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 446s offered refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 446s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 446s offered refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 446s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 446s get_archive_dsc: nothing in archive, returning undef 446s no version available from the archive 446s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 446s => `' 446s previous reference hash= 446s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 446s => `' 446s fetch_from_archive: lastfetch= 446s nothing found! 446s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 446s + git check-ref-format archive/test-dummy/2.0 446s | git symbolic-ref -q HEAD 446s => `refs/heads/master' 446s | git rev-parse 'HEAD~0' 446s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 446s ffq_prev_branchinfo branch current refs/heads/master 446s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 446s => `' 446s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 446s => `' 446s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 446s warning: could not open directory 'debian/source/': No such file or directory 446s => `' 446s + git diff --quiet HEAD 446s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0' 446s => `' 446s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 446s checking that example_2.0.dsc corresponds to HEAD 446s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.dsc 446s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.dsc) 446s dpkg-source: info: extracting example in example-2.0 446s dpkg-source: info: unpacking example_2.0.tar.gz 446s CD example-2.0 446s | find -name .git -prune -print0 446s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 446s + git add -Af . 446s | git write-tree 446s => `18c935f7d9e9d6f4e8c714dba79cea37f4a6c413' 446s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 446s + git diff --quiet 18c935f7d9e9d6f4e8c714dba79cea37f4a6c413 1c97ddd6759afae0eea88cf10027c6cba8866ea1 446s files_compare_inputs example_2.0.dsc 446s files_compare_inputs example_2.0.dsc Checksums-Sha256 446s files_compare_inputs example_2.0.dsc Checksums-Sha256 example_2.0.tar.gz 446s files_compare_inputs example_2.0.dsc Checksums-Sha1 446s files_compare_inputs example_2.0.dsc Checksums-Sha1 example_2.0.tar.gz 446s files_compare_inputs example_2.0.dsc Files 446s files_compare_inputs example_2.0.dsc Files example_2.0.tar.gz 446s files_compare_inputs example_2.0_multi.changes 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.dsc 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0.tar.gz 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_all.deb 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha256 example_2.0_amd64.buildinfo 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.dsc 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0.tar.gz 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_all.deb 446s files_compare_inputs example_2.0_multi.changes Checksums-Sha1 example_2.0_amd64.buildinfo 446s files_compare_inputs example_2.0_multi.changes Files 446s files_compare_inputs example_2.0_multi.changes Files example_2.0.dsc 446s files_compare_inputs example_2.0_multi.changes Files example_2.0.tar.gz 446s files_compare_inputs example_2.0_multi.changes Files example_2.0_all.deb 446s files_compare_inputs example_2.0_multi.changes Files example_2.0_amd64.buildinfo 446s checking origs needed (2.0)... 446s checking origs needed placement 'devel extra'... 446s origs example_2.0.tar.gz | e99199f6be70638923c1fd68d14d7f9c 763 example_2.0.tar.gz 446s ../example_2.0_multi.changes already has appropriate .orig(s) (if any) 446s push_tagwants: $VAR1 = [ 446s '2.0', 446s '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 446s undef, 446s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 446s ]; 446s $VAR2 = [ 446s { 446s 'View' => 'dgit', 446s 'TfSuffix' => '', 446s 'Tag' => 'archive/test-dummy/2.0', 446s 'TagFn' => sub { "DUMMY" }, 446s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 446s 'Tfn' => sub { "DUMMY" } 446s }, 446s { 446s 'Tfn' => sub { "DUMMY" }, 446s 'Objid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 446s 'Tag' => 'test-dummy/2.0', 446s 'TagFn' => sub { "DUMMY" }, 446s 'TfSuffix' => '-dgit', 446s 'View' => 'dgit' 446s } 446s ]; 446s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 446s => `1530000000 +0000' 446s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 446s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 446s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 446s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 446s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 446s => `87245e19d59683956b1d78f881da3ec5a9ca4d9f' 446s + git verify-tag 87245e19d59683956b1d78f881da3ec5a9ca4d9f 446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 446s gpg: Signature made Mon Mar 31 12:25:40 2025 UTC 446s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 446s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 446s gpg: WARNING: This key is not certified with a trusted signature! 446s gpg: There is no indication that the signature belongs to the owner. 446s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 446s + git update-ref refs/tags/archive/test-dummy/2.0 87245e19d59683956b1d78f881da3ec5a9ca4d9f 446s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 446s => `d95d8f49875b488186dcd81552002794b461260a' 446s + git verify-tag d95d8f49875b488186dcd81552002794b461260a 446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 446s gpg: Signature made Mon Mar 31 12:25:40 2025 UTC 446s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 446s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 446s gpg: WARNING: This key is not certified with a trusted signature! 446s gpg: There is no indication that the signature belongs to the owner. 446s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 446s + git update-ref refs/tags/test-dummy/2.0 d95d8f49875b488186dcd81552002794b461260a 446s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 446s => `1' 446s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 1c97ddd6759afae0eea88cf10027c6cba8866ea1:refs/dgit/sid refs/tags/archive/test-dummy/2.0 refs/tags/test-dummy/2.0 446s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 446s * [new reference] 1c97ddd6759afae0eea88cf10027c6cba8866ea1 -> refs/dgit/sid 446s * [new tag] archive/test-dummy/2.0 -> archive/test-dummy/2.0 446s * [new tag] test-dummy/2.0 -> test-dummy/2.0 446s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 446s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0_multi.changes 446s signfile dsc ../example_2.0.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 446s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s 447s signfile buildinfo ../example_2.0_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s 447s fixup_changes dsc ../example_2.0.dsc ../example_2.0_multi.changes 447s fixup_changes buildinfo ../example_2.0_amd64.buildinfo ../example_2.0_multi.changes 447s signfile changes ../example_2.0_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s 447s Successfully signed dsc, buildinfo, changes files 447s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0_multi.changes 447s gpg: ../example_2.0_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 447s gpg: ../example_2.0.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 447s D: Setting host argument. 447s Checking signature on .changes 447s Checking signature on .dsc 447s Uploading to test-dummy (via local to localhost): 447s Successfully uploaded packages. 447s dgit ok: pushed and uploaded 2.0 447s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 447s del_lrfetchrefs... 447s del_lrfetchrefs: db986af22779b497e88d14dd5c570d08aa97f433 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 447s del_lrfetchrefs: 9bfa0703537b50800b9e049930198105ec7eb910 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 447s del_lrfetchrefs: e085e2c1b3da17376756d6520252915e13bde377 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 447s del_lrfetchrefs: 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 447s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 447s ' 447s + t-pushed-good master sid 447s + local branch=master 447s + local suite=sid 447s + t-refs-same refs/heads/master 447s + local g 447s + for g in $* 447s + t-ref-same refs/heads/master 447s + local name=refs/heads/master 447s + local val 447s ++ t-git-get-ref refs/heads/master 447s ++ local ref=refs/heads/master 447s ++ case "$ref" in 447s ++ git show-ref -d refs/heads/master 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val refs/heads/master 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=refs/heads/master 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s + t-pushed-good-core 447s + t-ref-dsc-dgit 447s + t-incoming-dsc 447s + local dsc=example_2.0.dsc 447s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 447s + local val 447s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc Dgit 447s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 447s ++ local field=Dgit 447s ++ perl -e ' 447s use Dpkg::Control::Hash; 447s my $h = new Dpkg::Control::Hash allow_pgp=>1; 447s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc"); 447s my $val = $h->{"Dgit"},"\n"; 447s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc Dgit" unless defined $val; 447s print $val,"\n"; 447s ' 447s + val='1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 447s ++ perl -e ' 447s $_=shift @ARGV; 447s die "Dgit $_ ?" unless m/^\w+\b/; 447s print $&,"\n" or die $!; 447s ' '1c97ddd6759afae0eea88cf10027c6cba8866ea1 test-dummy archive/test-dummy/2.0 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s ++ t-v-tag 447s ++ echo refs/tags/archive/test-dummy/2.0 447s + t-refs-same refs/tags/archive/test-dummy/2.0 refs/remotes/dgit/dgit/sid 447s + local g 447s + for g in $* 447s + t-ref-same refs/tags/archive/test-dummy/2.0 447s + local name=refs/tags/archive/test-dummy/2.0 447s + local val 447s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 447s ++ local ref=refs/tags/archive/test-dummy/2.0 447s ++ case "$ref" in 447s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=refs/tags/archive/test-dummy/2.0 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s + for g in $* 447s + t-ref-same refs/remotes/dgit/dgit/sid 447s + local name=refs/remotes/dgit/dgit/sid 447s + local val 447s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 447s ++ local ref=refs/remotes/dgit/dgit/sid 447s ++ case "$ref" in 447s ++ git show-ref -d refs/remotes/dgit/dgit/sid 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val refs/remotes/dgit/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=refs/remotes/dgit/dgit/sid 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 447s + local val 447s + for g in $* 447s ++ t-git-get-ref refs/heads/dgit/unstable 447s ++ local ref=refs/heads/dgit/unstable 447s ++ case "$ref" in 447s ++ git show-ref -d refs/heads/dgit/unstable 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s ++ test 1 = 1 447s + val= 447s + '[' x '!=' x ']' 447s + for g in $* 447s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 447s ++ local ref=refs/remotes/dgit/dgit/unstable 447s ++ case "$ref" in 447s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s ++ test 1 = 1 447s + val= 447s + '[' x '!=' x ']' 447s + set -e 447s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 447s ++ t-v-tag 447s ++ echo refs/tags/archive/test-dummy/2.0 447s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.0 447s + local g 447s + for g in $* 447s + t-ref-same refs/dgit/sid 447s + local name=refs/dgit/sid 447s + local val 447s ++ t-git-get-ref refs/dgit/sid 447s ++ local ref=refs/dgit/sid 447s ++ case "$ref" in 447s ++ git show-ref -d refs/dgit/sid 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val refs/dgit/sid 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=refs/dgit/sid 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s + for g in $* 447s + t-ref-same refs/tags/archive/test-dummy/2.0 447s + local name=refs/tags/archive/test-dummy/2.0 447s + local val 447s ++ t-git-get-ref refs/tags/archive/test-dummy/2.0 447s ++ local ref=refs/tags/archive/test-dummy/2.0 447s ++ case "$ref" in 447s ++ git show-ref -d refs/tags/archive/test-dummy/2.0 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.0\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s + val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t-ref-same-val refs/tags/archive/test-dummy/2.0 1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + local name=refs/tags/archive/test-dummy/2.0 447s + local val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=1c97ddd6759afae0eea88cf10027c6cba8866ea1 447s + t_ref_names+=("$name") 447s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 447s + t-refs-notexist refs/dgit/unstable 447s + local val 447s + for g in $* 447s ++ t-git-get-ref refs/dgit/unstable 447s ++ local ref=refs/dgit/unstable 447s ++ case "$ref" in 447s ++ git show-ref -d refs/dgit/unstable 447s ++ perl -ne ' 447s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 447s END { print "$x\n" if length $x; } 447s ' 447s ++ test 1 = 1 447s + val= 447s + '[' x '!=' x ']' 447s ++ t-v-tag 447s ++ echo refs/tags/archive/test-dummy/2.0 447s + git verify-tag refs/tags/archive/test-dummy/2.0 447s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 447s gpg: Signature made Mon Mar 31 12:25:40 2025 UTC 447s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 447s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 447s gpg: WARNING: This key is not certified with a trusted signature! 447s gpg: There is no indication that the signature belongs to the owner. 447s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 447s + t-archive-process-incoming sid 447s + local suite=sid 447s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 447s + t-archive-query sid 447s + local suite=sid 447s + local dscf=main/example_2.0.dsc 447s + t-archive-query-aq sid example 2.0 main/example_2.0.dsc 447s + local suite=sid 447s + local p=example 447s + local v=2.0 447s + local dscf=main/example_2.0.dsc 447s + local sha 447s ++ sha256sum 447s + sha='1656d94589b0bae77d926427d3e618f0ba2403808f688ec773e27187d3269bc0 -' 447s + echo '2.0 1656d94589b0bae77d926427d3e618f0ba2403808f688ec773e27187d3269bc0 main/example_2.0.dsc' 447s + t-aq-archive-updated sid example 447s + local suite=sid 447s + local p=example 447s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 447s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 447s + perl -wne ' 447s use JSON; 447s use strict; 447s our @v; 447s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 447s push @v, { 447s "version" => "$1", 447s "sha256sum" => "$2", 447s "component" => "$3", 447s "filename" => "$4", 447s }; 447s END { 447s my $json = JSON->new->canonical(); 447s print $json->encode(\@v) or die $!; 447s } 447s ' 447s + echo sid-again 447s + git add which 447s + t-commit Sid 447s + local msg=Sid 447s + v=2.1 447s + t-debchange --force-distribution -v2.1 --distribution unstable Sid 447s + DEBEMAIL=dgit-tests@example.org 447s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.1 --distribution unstable Sid 447s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.1 --distribution unstable Sid 447s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 447s libdistro-info-perl is not installed, Debian release names are not known. 447s libdistro-info-perl is not installed, Ubuntu release names are not known. 447s + git add debian/changelog 447s + debcommit 447s git commit -m Sid 447s [master d5d72bd] Sid 447s 2 files changed, 7 insertions(+) 447s + revision=2 447s + push-to master sid 447s + t-refs-same-start 447s + unset t_ref_val 447s + t_ref_names=() 447s + t-ref-head 447s + local val 447s ++ git rev-parse HEAD 447s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 447s + t-ref-same-val HEAD d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 447s + local name=HEAD 447s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 447s + case "${t_ref_val-unset}" in 447s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 447s + t_ref_names+=("$name") 447s + t-dgit build 447s + local dgit=dgit 447s + pwd 447s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 447s + : ' 447s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 447s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A build 448s | git rev-parse --show-toplevel 448s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 448s | git config -z --get-regexp --local '.*' 448s | git config -z --get-regexp --local '.*' 448s | git config -z --get-regexp --global '.*' 448s | git config -z --get-regexp --system '.*' 448s format , quilt mode linear 448s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 448s warning: could not open directory 'debian/source/': No such file or directory 448s => `' 448s + git diff --quiet HEAD 448s massage split -F. 448s massage done 3 -b. 448s format , quilt mode linear 448s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 448s warning: could not open directory 'debian/source/': No such file or directory 448s => `' 448s + git diff --quiet HEAD 448s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 448s dpkg-buildpackage: info: source package example 448s dpkg-buildpackage: info: source version 2.1 448s dpkg-buildpackage: info: source distribution unstable 448s dpkg-buildpackage: info: source changed by dgit test git user 448s fakeroot debian/rules clean 448s EXAMPLE RULES TARGET clean 448s dh_clean 448s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 448s | git clean -dn 448s => `' 448s | git rev-parse 'HEAD~0' 448s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 448s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 448s CD work 448s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 448s + git reset -q --hard d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 448s CD .. 448s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 448s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 448s dpkg-source: warning: source directory 'work' is not - 'example-2.1' 448s dpkg-source: info: using source format '1.0' 448s dpkg-source: info: building example in example_2.1.tar.gz 448s dpkg-source: info: building example in example_2.1.dsc 448s CD work 448s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 448s changelog will contain changes since 2.0 448s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.1_source.changes dpkg-genchanges -S -v2.0 448s dpkg-genchanges: info: including full source code in upload 448s CD .. 448s moving example_2.1.dsc, example_2.1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 448s renaming (Files) example_2.1.tar.gz 448s renaming (dsc) example_2.1.dsc 448s renaming (changes) example_2.1_source.changes 448s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 448s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -us -uc -nc -b -v2.0 448s dpkg-buildpackage: info: source package example 448s dpkg-buildpackage: info: source version 2.1 448s dpkg-buildpackage: info: source distribution unstable 448s dpkg-buildpackage: info: source changed by dgit test git user 448s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 448s dpkg-buildpackage: info: host architecture amd64 448s debian/rules build 448s EXAMPLE RULES TARGET build 448s fakeroot debian/rules binary 448s EXAMPLE RULES TARGET binary 448s dh_install 448s dh_install: warning: Compatibility levels before 10 are deprecated (level 8 in use) 448s dh_gencontrol 448s dh_builddeb 448s dpkg-deb: building package 'example' in '../example_2.1_all.deb'. 448s dpkg-genbuildinfo --build=binary -O../example_2.1_amd64.buildinfo 449s dpkg-genchanges --build=binary -v2.0 -O../example_2.1_amd64.changes 449s dpkg-genchanges: info: binary-only upload (no source code included) 449s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 449s dpkg-buildpackage: info: binary-only upload (no source included) 449s CD .. 449s + mergechanges -f example_2.1_source.changes example_2.1_amd64.changes 449s dgit ok: build successful, results in example_2.1_multi.changes 449s 449s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 449s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 449s ' 449s + t-dgit push --new sid 449s + local dgit=dgit 449s + pwd 449s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 449s + : ' 449s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 449s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push --new sid 449s | git rev-parse --show-toplevel 449s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 449s | git config -z --get-regexp --local '.*' 449s | git config -z --get-regexp --local '.*' 449s | git config -z --get-regexp --global '.*' 449s | git config -z --get-regexp --system '.*' 449s format , quilt mode linear 449s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 449s warning: could not open directory 'debian/source/': No such file or directory 449s => `' 449s + git diff --quiet HEAD 449s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 449s canonical suite name for unstable is sid 449s actually entering push 449s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 449s => `1' 449s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 449s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 449s git_lrfetch_sane iteration 0 449s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 449s => 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit/sid 449s => db986af22779b497e88d14dd5c570d08aa97f433 refs/tags/archive/test-dummy/1.1 449s => 9bfa0703537b50800b9e049930198105ec7eb910 refs/tags/archive/test-dummy/1.2 449s => 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/tags/archive/test-dummy/2.0 449s => e085e2c1b3da17376756d6520252915e13bde377 refs/tags/test-dummy/1.1 449s => 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/tags/test-dummy/1.2 449s => d95d8f49875b488186dcd81552002794b461260a refs/tags/test-dummy/2.0 449s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 449s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 449s | git for-each-ref refs/dgit-fetch/test-dummy 449s |> 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit refs/dgit-fetch/test-dummy/dgit/sid 449s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 449s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 449s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 449s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 449s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 449s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 449s git_lrfetch_sane: tidying any old suite lrfetchrefs 449s | git for-each-ref refs/dgit-fetch/sid 449s git_lrfetch_sane: git fetch --no-insane emulation complete 449s $VAR1 = { 449s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'd95d8f49875b488186dcd81552002794b461260a', 449s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1c97ddd6759afae0eea88cf10027c6cba8866ea1', 449s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'e085e2c1b3da17376756d6520252915e13bde377', 449s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'db986af22779b497e88d14dd5c570d08aa97f433', 449s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '87245e19d59683956b1d78f881da3ec5a9ca4d9f', 449s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '6b34536340e84e96e97d215c14ed9eee90156ac4', 449s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '9bfa0703537b50800b9e049930198105ec7eb910' 449s }; 449s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 449s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/tags/archive/test-dummy/1.1 449s currently refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 449s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/tags/archive/test-dummy/1.2 449s currently refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 449s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/tags/archive/test-dummy/2.0 449s currently refs/tags/archive/test-dummy/2.0=87245e19d59683956b1d78f881da3ec5a9ca4d9f 449s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/tags/test-dummy/1.1 449s currently refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 449s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/tags/test-dummy/1.2 449s currently refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 449s |> d95d8f49875b488186dcd81552002794b461260a tag refs/tags/test-dummy/2.0 449s currently refs/tags/test-dummy/2.0=d95d8f49875b488186dcd81552002794b461260a 449s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 449s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 449s offered refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 449s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 449s offered refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 449s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 449s offered refs/tags/archive/test-dummy/2.0=87245e19d59683956b1d78f881da3ec5a9ca4d9f 449s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 449s offered refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 449s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 449s offered refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 449s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 449s offered refs/tags/test-dummy/2.0=d95d8f49875b488186dcd81552002794b461260a 449s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 449s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0.dsc... 449s get_archive_dsc: Version 2.0 449s last upload to archive: specified git info (test-dummy) 449s GCF| git cat-file --batch 449s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 449s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 449s GCF>| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s GCF<| 1c97ddd6759afae0eea88cf10027c6cba8866ea1 commit 250 449s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s previous reference hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s fetch_from_archive: lastfetch=1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s fetch mergeinfos: 449s commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1 Dgit field in .dsc from archive 449s fetch hash=1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 449s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 449s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s | git log -n2 1c97ddd6759afae0eea88cf10027c6cba8866ea1 449s => `commit 1c97ddd6759afae0eea88cf10027c6cba8866ea1'... 449s | git ls-tree -lrz -- 1c97ddd6759afae0eea88cf10027c6cba8866ea1: 449s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 449s + git check-ref-format archive/test-dummy/2.1 449s | git symbolic-ref -q HEAD 449s => `refs/heads/master' 449s | git rev-parse 'HEAD~0' 449s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 449s ffq_prev_branchinfo branch current refs/heads/master 449s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 449s => `' 449s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 449s => `' 449s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 450s warning: could not open directory 'debian/source/': No such file or directory 450s => `' 450s + git diff --quiet HEAD 450s | git merge-base 1c97ddd6759afae0eea88cf10027c6cba8866ea1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 450s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 450s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 450s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 450s | git rev-parse '1c97ddd6759afae0eea88cf10027c6cba8866ea1~0' 450s => `1c97ddd6759afae0eea88cf10027c6cba8866ea1' 450s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.1' 450s => `' 450s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 450s checking that example_2.1.dsc corresponds to HEAD 450s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.dsc 450s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.dsc) 450s dpkg-source: info: extracting example in example-2.1 450s dpkg-source: info: unpacking example_2.1.tar.gz 450s CD example-2.1 450s | find -name .git -prune -print0 450s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 450s + git add -Af . 450s | git write-tree 450s => `0a454783758b3963f285d311a15fe86e962c54d4' 450s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 450s + git diff --quiet 0a454783758b3963f285d311a15fe86e962c54d4 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 450s files_compare_inputs example_2.1.dsc 450s files_compare_inputs example_2.1.dsc Checksums-Sha256 450s files_compare_inputs example_2.1.dsc Checksums-Sha256 example_2.1.tar.gz 450s files_compare_inputs example_2.1.dsc Checksums-Sha1 450s files_compare_inputs example_2.1.dsc Checksums-Sha1 example_2.1.tar.gz 450s files_compare_inputs example_2.1.dsc Files 450s files_compare_inputs example_2.1.dsc Files example_2.1.tar.gz 450s files_compare_inputs example_2.1_multi.changes 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.dsc 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1.tar.gz 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_all.deb 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha256 example_2.1_amd64.buildinfo 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.dsc 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1.tar.gz 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_all.deb 450s files_compare_inputs example_2.1_multi.changes Checksums-Sha1 example_2.1_amd64.buildinfo 450s files_compare_inputs example_2.1_multi.changes Files 450s files_compare_inputs example_2.1_multi.changes Files example_2.1.dsc 450s files_compare_inputs example_2.1_multi.changes Files example_2.1.tar.gz 450s files_compare_inputs example_2.1_multi.changes Files example_2.1_all.deb 450s files_compare_inputs example_2.1_multi.changes Files example_2.1_amd64.buildinfo 450s checking origs needed (2.1)... 450s checking origs needed placement 'devel extra'... 450s origs example_2.1.tar.gz | 3c579320ad06b5c818289baa3f0ecb96 1021 example_2.1.tar.gz 450s ../example_2.1_multi.changes already has appropriate .orig(s) (if any) 450s push_tagwants: $VAR1 = [ 450s '2.1', 450s 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 450s undef, 450s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 450s ]; 450s $VAR2 = [ 450s { 450s 'Tfn' => sub { "DUMMY" }, 450s 'Tag' => 'archive/test-dummy/2.1', 450s 'TfSuffix' => '', 450s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 450s 'TagFn' => sub { "DUMMY" }, 450s 'View' => 'dgit' 450s }, 450s { 450s 'TagFn' => sub { "DUMMY" }, 450s 'Objid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 450s 'View' => 'dgit', 450s 'Tag' => 'test-dummy/2.1', 450s 'Tfn' => sub { "DUMMY" }, 450s 'TfSuffix' => '-dgit' 450s } 450s ]; 450s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 450s => `1530000000 +0000' 450s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 450s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 450s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 450s => `dc357e906c5f125afe65822cf25b1101b49af89e' 450s + git verify-tag dc357e906c5f125afe65822cf25b1101b49af89e 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s gpg: Signature made Mon Mar 31 12:25:43 2025 UTC 450s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 450s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 450s gpg: WARNING: This key is not certified with a trusted signature! 450s gpg: There is no indication that the signature belongs to the owner. 450s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 450s + git update-ref refs/tags/archive/test-dummy/2.1 dc357e906c5f125afe65822cf25b1101b49af89e 450s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 450s => `170a9399e0aca5d6f4c112ed2533ed6324e20f0e' 450s + git verify-tag 170a9399e0aca5d6f4c112ed2533ed6324e20f0e 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s gpg: Signature made Mon Mar 31 12:25:43 2025 UTC 450s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 450s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 450s gpg: WARNING: This key is not certified with a trusted signature! 450s gpg: There is no indication that the signature belongs to the owner. 450s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 450s + git update-ref refs/tags/test-dummy/2.1 170a9399e0aca5d6f4c112ed2533ed6324e20f0e 450s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 450s => `1' 450s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:refs/dgit/sid refs/tags/archive/test-dummy/2.1 refs/tags/test-dummy/2.1 450s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 450s 1c97ddd..d5d72bd d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 -> refs/dgit/sid 450s * [new tag] archive/test-dummy/2.1 -> archive/test-dummy/2.1 450s * [new tag] test-dummy/2.1 -> test-dummy/2.1 450s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 450s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.1_multi.changes 450s signfile dsc ../example_2.1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s 450s signfile buildinfo ../example_2.1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s 450s fixup_changes dsc ../example_2.1.dsc ../example_2.1_multi.changes 450s fixup_changes buildinfo ../example_2.1_amd64.buildinfo ../example_2.1_multi.changes 450s signfile changes ../example_2.1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 450s 450s Successfully signed dsc, buildinfo, changes files 450s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.1_multi.changes 451s gpg: ../example_2.1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 451s gpg: ../example_2.1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 451s D: Setting host argument. 451s Checking signature on .changes 451s Checking signature on .dsc 451s Uploading to test-dummy (via local to localhost): 451s Successfully uploaded packages. 451s dgit ok: pushed and uploaded 2.1 451s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 451s del_lrfetchrefs... 451s del_lrfetchrefs: 1c97ddd6759afae0eea88cf10027c6cba8866ea1 refs/dgit-fetch/test-dummy/dgit/sid 451s del_lrfetchrefs: db986af22779b497e88d14dd5c570d08aa97f433 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 451s del_lrfetchrefs: 9bfa0703537b50800b9e049930198105ec7eb910 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 451s del_lrfetchrefs: 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 451s del_lrfetchrefs: e085e2c1b3da17376756d6520252915e13bde377 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 451s del_lrfetchrefs: 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 451s del_lrfetchrefs: d95d8f49875b488186dcd81552002794b461260a refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 451s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 451s ' 451s + t-pushed-good master sid 451s + local branch=master 451s + local suite=sid 451s + t-refs-same refs/heads/master 451s + local g 451s + for g in $* 451s + t-ref-same refs/heads/master 451s + local name=refs/heads/master 451s + local val 451s ++ t-git-get-ref refs/heads/master 451s ++ local ref=refs/heads/master 451s ++ case "$ref" in 451s ++ git show-ref -d refs/heads/master 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val refs/heads/master d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=refs/heads/master 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s + t-pushed-good-core 451s + t-ref-dsc-dgit 451s + t-incoming-dsc 451s + local dsc=example_2.1.dsc 451s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 451s + local val 451s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc Dgit 451s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 451s ++ local field=Dgit 451s ++ perl -e ' 451s use Dpkg::Control::Hash; 451s my $h = new Dpkg::Control::Hash allow_pgp=>1; 451s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc"); 451s my $val = $h->{"Dgit"},"\n"; 451s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc Dgit" unless defined $val; 451s print $val,"\n"; 451s ' 451s + val='d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 451s ++ perl -e ' 451s $_=shift @ARGV; 451s die "Dgit $_ ?" unless m/^\w+\b/; 451s print $&,"\n" or die $!; 451s ' 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61 test-dummy archive/test-dummy/2.1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s ++ t-v-tag 451s ++ echo refs/tags/archive/test-dummy/2.1 451s + t-refs-same refs/tags/archive/test-dummy/2.1 refs/remotes/dgit/dgit/sid 451s + local g 451s + for g in $* 451s + t-ref-same refs/tags/archive/test-dummy/2.1 451s + local name=refs/tags/archive/test-dummy/2.1 451s + local val 451s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 451s ++ local ref=refs/tags/archive/test-dummy/2.1 451s ++ case "$ref" in 451s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=refs/tags/archive/test-dummy/2.1 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s + for g in $* 451s + t-ref-same refs/remotes/dgit/dgit/sid 451s + local name=refs/remotes/dgit/dgit/sid 451s + local val 451s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 451s ++ local ref=refs/remotes/dgit/dgit/sid 451s ++ case "$ref" in 451s ++ git show-ref -d refs/remotes/dgit/dgit/sid 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val refs/remotes/dgit/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=refs/remotes/dgit/dgit/sid 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 451s + local val 451s + for g in $* 451s ++ t-git-get-ref refs/heads/dgit/unstable 451s ++ local ref=refs/heads/dgit/unstable 451s ++ case "$ref" in 451s ++ git show-ref -d refs/heads/dgit/unstable 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s ++ test 1 = 1 451s + val= 451s + '[' x '!=' x ']' 451s + for g in $* 451s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 451s ++ local ref=refs/remotes/dgit/dgit/unstable 451s ++ case "$ref" in 451s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s ++ test 1 = 1 451s + val= 451s + '[' x '!=' x ']' 451s + set -e 451s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 451s ++ t-v-tag 451s ++ echo refs/tags/archive/test-dummy/2.1 451s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.1 451s + local g 451s + for g in $* 451s + t-ref-same refs/dgit/sid 451s + local name=refs/dgit/sid 451s + local val 451s ++ t-git-get-ref refs/dgit/sid 451s ++ local ref=refs/dgit/sid 451s ++ case "$ref" in 451s ++ git show-ref -d refs/dgit/sid 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val refs/dgit/sid d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=refs/dgit/sid 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s + for g in $* 451s + t-ref-same refs/tags/archive/test-dummy/2.1 451s + local name=refs/tags/archive/test-dummy/2.1 451s + local val 451s ++ t-git-get-ref refs/tags/archive/test-dummy/2.1 451s ++ local ref=refs/tags/archive/test-dummy/2.1 451s ++ case "$ref" in 451s ++ git show-ref -d refs/tags/archive/test-dummy/2.1 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.1\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s + val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t-ref-same-val refs/tags/archive/test-dummy/2.1 d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + local name=refs/tags/archive/test-dummy/2.1 451s + local val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + case "${t_ref_val-unset}" in 451s + t_ref_val=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 451s + t_ref_names+=("$name") 451s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 451s + t-refs-notexist refs/dgit/unstable 451s + local val 451s + for g in $* 451s ++ t-git-get-ref refs/dgit/unstable 451s ++ local ref=refs/dgit/unstable 451s ++ case "$ref" in 451s ++ git show-ref -d refs/dgit/unstable 451s ++ perl -ne ' 451s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 451s END { print "$x\n" if length $x; } 451s ' 451s ++ test 1 = 1 451s + val= 451s + '[' x '!=' x ']' 451s ++ t-v-tag 451s ++ echo refs/tags/archive/test-dummy/2.1 451s + git verify-tag refs/tags/archive/test-dummy/2.1 451s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 451s gpg: Signature made Mon Mar 31 12:25:43 2025 UTC 451s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 451s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 451s gpg: WARNING: This key is not certified with a trusted signature! 451s gpg: There is no indication that the signature belongs to the owner. 451s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 451s + t-archive-process-incoming sid 451s + local suite=sid 451s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_all.deb /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_amd64.buildinfo /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1_multi.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 451s + t-archive-query sid 451s + local suite=sid 451s + local dscf=main/example_2.1.dsc 451s + t-archive-query-aq sid example 2.1 main/example_2.1.dsc 451s + local suite=sid 451s + local p=example 451s + local v=2.1 451s + local dscf=main/example_2.1.dsc 451s + local sha 451s ++ sha256sum 451s + sha='8f57eca11ad86ee5c4a39828ae31892e58e4662f75cc8d8f2c4654d3d5a0bd13 -' 451s + echo '2.1 8f57eca11ad86ee5c4a39828ae31892e58e4662f75cc8d8f2c4654d3d5a0bd13 main/example_2.1.dsc' 451s + t-aq-archive-updated sid example 451s + local suite=sid 451s + local p=example 451s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 451s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 451s + perl -wne ' 451s use JSON; 451s use strict; 451s our @v; 451s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 451s push @v, { 451s "version" => "$1", 451s "sha256sum" => "$2", 451s "component" => "$3", 451s "filename" => "$4", 451s }; 451s END { 451s my $json = JSON->new->canonical(); 451s print $json->encode(\@v) or die $!; 451s } 451s ' 451s + git clean -xdff 451s Removing debian/.debhelper/ 451s Removing debian/example.debhelper.log 451s Removing debian/example.substvars 451s Removing debian/example/ 451s Removing debian/files 451s + t-setup-done 'v suitespecs majorv revision' 'aq git mirror example' ' 451s t-select-package example 451s ' 451s + local 'savevars=v suitespecs majorv revision' 451s + local 'savedirs=aq git mirror example' 451s + local 'importeval= 451s t-select-package example 451s ' 451s + local import=IMPORT.examplegit 451s + exec 451s + local vn 451s + for vn in $savevars 451s ++ eval 'printf '\''%s\n'\'' "$v"' 451s +++ printf '%s\n' 2.1 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 451s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 451s ' v 2.1 451s + for vn in $savevars 451s ++ eval 'printf '\''%s\n'\'' "$suitespecs"' 451s +++ printf '%s\n' 'sid:unstable stable testing' 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 451s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 451s ' suitespecs 'sid:unstable stable testing' 451s + for vn in $savevars 451s ++ eval 'printf '\''%s\n'\'' "$majorv"' 451s +++ printf '%s\n' 2 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 451s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 451s ' majorv 2 451s + for vn in $savevars 451s ++ eval 'printf '\''%s\n'\'' "$revision"' 451s +++ printf '%s\n' 2 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -e ' 451s printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1] 451s ' revision 2 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 451s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 451s print STDERR "saving-exporting $vn\n"; 451s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 451s or die $!; 451s } 451s ' 451s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 451s saving-exporting DGIT_TEST_REAL_GPG_AGENT 451s saving-exporting DGIT_TEST_REAL_GPG 451s + set -e 451s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s + tar cf IMPORT.examplegit.tar aq git mirror example 451s + printf '\n%s\n' ' 451s t-select-package example 451s ' 451s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit 451s + rc=0 451s + set +x 451s + set +e 451s + pwd 451s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 451s + '[' x '!=' x ']' 451s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 451s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s + set -e 451s + test 0 = 0 451s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 451s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.examplegit 451s ++ v=2.1 451s ++ suitespecs='sid:unstable stable testing' 451s ++ majorv=2 451s ++ revision=2 451s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 451s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 451s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s ++ t-select-package example 451s ++ p=example 451s ++ dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 451s + t-setup-import http-git-check 451s + local setupname=http-git-check 451s + local setupsrc 451s + local lock 451s + '[' x = x ']' 451s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 451s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 451s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check ']' 451s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 451s cd "$1"; shift 451s setupname="$1"; shift 451s simport="$1"; shift 451s if [ -e "$simport" ]; then exit 0; fi 451s env - "$@" \ 451s "tests/setup/$setupname" 451s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src http-git-check /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 451s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 451s + shift 451s + setupname=http-git-check 451s + shift 451s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 451s + shift 451s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check ']' 451s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/alternating-dgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/alternating-dgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/alternating-dgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/alternating-dgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/http-git-check 451s ++ set -o pipefail 451s ++ . tests/lib-core 451s ++ . tests/lib-restricts 451s ++ trap ' 451s rc=$? 451s set +x 451s test $rc = 0 || echo " 451s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 451s 451s Most relevant logs are just before assignment rc=$rc 451s Will now do cleanup etc. 451s " 451s set -x 451s set +e 451s pwd 451s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 451s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 451s set -e 451s test $rc = 0 || t-report-failure 451s ' EXIT 451s ++ t-filter-out-git-hyphen-dir 451s ++ local pathent 451s +++ type -p git-rev-parse 451s +++ : 451s ++ pathent= 451s ++ case "$pathent" in 451s ++ return 451s ++ t-set-intree 451s ++ '[' x = x ']' 451s ++ return 451s ++ : -D 451s ++ export DGIT_TEST_DEBUG 451s ++ : x 451s ++ export DGIT_TEST_DEBPUSH_DEBUG 451s ++ : 451s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 451s ++ GIT_COMMITTER_DATE='1530000000 +0100' 451s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 451s ++ GIT_AUTHOR_DATE='1530000000 +0100' 451s ++ export LC_CTYPE=C.UTF-8 451s ++ LC_CTYPE=C.UTF-8 451s ++ unset CDPATH 451s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 451s ++ FILTER_BRANCH_SQUELCH_WARNING=1 451s +++ pwd 451s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 451s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 451s ++ testname=http-git-check 451s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 451s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 451s ++ bpd=.. 451s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 451s ++ '[' x '!=' x ']' 451s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s +++ pwd 451s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ t-set-using-tmp 451s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 451s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 451s ++ export 'DEBFULLNAME=dgit test git user' 451s ++ DEBFULLNAME='dgit test git user' 451s ++ git config --global user.email dgit-test@debian.example.net 451s ++ git config --global user.name 'dgit test git user' 451s ++ git config --global protocol.ext.allow always 451s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 451s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 451s ++ export DEBCHANGE_VENDOR=dpkg 451s ++ DEBCHANGE_VENDOR=dpkg 451s ++ unset VISUAL 451s ++ unset GIT_EDITOR 451s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 451s ++ cat 451s ++ schroot=build 451s ++ : aq 451s ++ : archive/test-dummy 451s ++ : sid:unstable 451s ++ t-git-config dgit.default.old-dsc-distro test-dummy 451s ++ git config --global dgit.default.old-dsc-distro test-dummy 451s ++ for import in ${autoimport-gnupg} 451s ++ case "$0" in 451s ++ t-setup-import gnupg 451s ++ local setupname=gnupg 451s ++ local setupsrc 451s ++ local lock 451s ++ '[' x = x ']' 451s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 451s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 451s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 451s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 451s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s ++ . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 451s +++ DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 451s +++ DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 451s +++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s +++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s +++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 451s +++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 451s +++ export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 451s +++ cat 451s +++ : /usr/bin/gpg-agent 451s ++++ type -p gpg-agent 451s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s +++ export DGIT_STUNT_AGENT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/gpg-agent 451s +++ DGIT_STUNT_AGENT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/gpg-agent 451s +++ t-tstunt gpg 451s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s +++ local var=PATH 451s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s +++ eval ' 451s case "$PATH" in 451s "$tstunt:"*) ;; 451s *":$tstunt:"*) ;; 451s "") PATH="$tstunt" ;; 451s *) PATH="$tstunt:$PATH" ;; 451s esac 451s export PATH 451s ' 451s ++++ case "$PATH" in 451s ++++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 451s ++++ export PATH 451s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s +++ local var=PERLLIB 451s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s +++ eval ' 451s case "$PERLLIB" in 451s "$tstunt:"*) ;; 451s *":$tstunt:"*) ;; 451s "") PERLLIB="$tstunt" ;; 451s *) PERLLIB="$tstunt:$PERLLIB" ;; 451s esac 451s export PERLLIB 451s ' 451s ++++ case "$PERLLIB" in 451s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 451s ++++ export PERLLIB 451s +++ local f 451s +++ for f in "$@" 451s +++ t-tstunt--save-real gpg 451s +++ local f=gpg 451s +++ case "$f" in 451s +++ local rc 451s +++ local real 451s +++ set +e 451s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 451s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 451s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 451s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 451s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 451s ++++ type -p gpg 451s +++ real=/usr/bin/gpg 451s +++ rc=0 451s +++ set -e 451s +++ case $rc in 451s +++ local varname=gpg 451s +++ varname=DGIT_TEST_REAL_GPG 451s +++ eval ' 451s : ${DGIT_TEST_REAL_GPG:=$real} 451s export DGIT_TEST_REAL_GPG 451s ' 451s ++++ : /usr/bin/gpg 451s ++++ export DGIT_TEST_REAL_GPG 451s +++ f=./gpg 451s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 451s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 451s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 451s + t-dependencies libhttp-server-simple-static-perl 451s + : 'Hopefully installed: libhttp-server-simple-static-perl' 451s + t-setup-done '' --files-from=/dev/null ' 451s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 451s read <$tmp/must-clean/git-check.port git_check_port 451s 451s t-git-config --global dgit-distro.test-dummy.git-check url 451s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 451s t-git-config --global dgit-distro.test-dummy.git-check-url \ 451s http://127.0.0.1:$git_check_port 451s ' 451s + local savevars= 451s + local savedirs=--files-from=/dev/null 451s + local 'importeval= 451s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 451s read <$tmp/must-clean/git-check.port git_check_port 451s 451s t-git-config --global dgit-distro.test-dummy.git-check url 451s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 451s t-git-config --global dgit-distro.test-dummy.git-check-url \ 451s http://127.0.0.1:$git_check_port 451s ' 451s + local import=IMPORT.http-git-check 451s + exec 451s + local vn 451s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 451s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 451s print STDERR "saving-exporting $vn\n"; 451s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 451s or die $!; 451s } 451s ' 451s saving-exporting DGIT_TEST_REAL_GPG_AGENT 451s saving-exporting DGIT_TEST_REAL_GPG 451s + set -e 451s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 451s + printf '\n%s\n' ' 451s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 451s read <$tmp/must-clean/git-check.port git_check_port 451s 451s t-git-config --global dgit-distro.test-dummy.git-check url 451s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 451s t-git-config --global dgit-distro.test-dummy.git-check-url \ 451s http://127.0.0.1:$git_check_port 451s ' 451s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 451s + rc=0 451s + set +x 451s + set +e 451s + pwd 451s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 451s + '[' x '!=' x ']' 451s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 451s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s + set -e 451s + test 0 = 0 451s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 451s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 451s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 451s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 451s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 451s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 451s ++ read git_check_port 451s ++ t-git-config --global dgit-distro.test-dummy.git-check url 451s ++ git config --global --global dgit-distro.test-dummy.git-check url 451s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 451s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 451s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:45843 451s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:45843 451s + cd example 451s + git checkout -b nondgit 451s Switched to a new branch 'nondgit' 451s + t-commit 'non-dgit upload' 451s + local 'msg=non-dgit upload' 451s + v=2.2 451s + t-debchange --force-distribution -v2.2 --distribution unstable 'non-dgit upload' 451s + DEBEMAIL=dgit-tests@example.org 451s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.2 --distribution unstable 'non-dgit upload' 451s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ debchange --force-distribution -v2.2 --distribution unstable non-dgit upload 451s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 451s libdistro-info-perl is not installed, Debian release names are not known. 451s libdistro-info-perl is not installed, Ubuntu release names are not known. 451s + git add debian/changelog 451s + debcommit 451s git commit -m 'non-dgit upload' 451s [nondgit f9f283c] non-dgit upload 451s 1 file changed, 6 insertions(+) 451s + revision=3 451s + t-non-dgit-upload 451s + t-dgit -wgf build-source 451s + local dgit=dgit 451s + pwd 451s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 451s + : ' 451s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 451s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 451s | git rev-parse --show-toplevel 451s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 451s | git config -z --get-regexp --local '.*' 451s | git config -z --get-regexp --local '.*' 451s | git config -z --get-regexp --global '.*' 451s | git config -z --get-regexp --system '.*' 451s format , quilt mode linear 451s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 451s warning: could not open directory 'debian/source/': No such file or directory 451s => `' 451s + git diff --quiet HEAD 451s | git clean -dn 451s => `' 451s | git rev-parse 'HEAD~0' 451s => `f9f283c05d70ccdeafb6ce29433c21a951e1c754' 451s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 451s CD work 451s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 452s + git reset -q --hard f9f283c05d70ccdeafb6ce29433c21a951e1c754 452s CD .. 452s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 452s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 452s dpkg-source: warning: source directory 'work' is not - 'example-2.2' 452s dpkg-source: info: using source format '1.0' 452s dpkg-source: info: building example in example_2.2.tar.gz 452s dpkg-source: info: building example in example_2.2.dsc 452s CD work 452s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 452s changelog will contain changes since 2.1 452s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.2_source.changes dpkg-genchanges -S -v2.1 452s dpkg-genchanges: info: including full source code in upload 452s CD .. 452s moving example_2.2.dsc, example_2.2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 452s renaming (Files) example_2.2.tar.gz 452s renaming (dsc) example_2.2.dsc 452s renaming (changes) example_2.2_source.changes 452s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 452s dgit ok: source built, results in example_2.2.dsc and example_2.2_source.changes 452s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 452s ' 452s + cd .. 452s + c=example_2.2_source.changes 452s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.2_source.changes 452s signfile dsc example_2.2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 452s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 452s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 452s 452s fixup_changes dsc example_2.2.dsc example_2.2_source.changes 452s signfile changes example_2.2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 452s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 452s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 452s 452s Successfully signed dsc, changes files 452s + dput -c /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy example_2.2_source.changes 452s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 452s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 452s D: Setting host argument. 452s Checking signature on .changes 452s Checking signature on .dsc 452s Uploading to test-dummy (via local to localhost): 452s Successfully uploaded packages. 452s + t-archive-process-incoming sid 452s + local suite=sid 452s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.2.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 452s + t-archive-query sid 452s + local suite=sid 452s + local dscf=main/example_2.2.dsc 452s + t-archive-query-aq sid example 2.2 main/example_2.2.dsc 452s + local suite=sid 452s + local p=example 452s + local v=2.2 452s + local dscf=main/example_2.2.dsc 452s + local sha 452s ++ sha256sum 452s + sha='336819e151064b3e0c66d93c09dd98e548bcbfec3ac1542aa4fd250474fbf61f -' 452s + echo '2.2 336819e151064b3e0c66d93c09dd98e548bcbfec3ac1542aa4fd250474fbf61f main/example_2.2.dsc' 452s + t-aq-archive-updated sid example 452s + local suite=sid 452s + local p=example 452s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 452s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 452s + perl -wne ' 452s use JSON; 452s use strict; 452s our @v; 452s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 452s push @v, { 452s "version" => "$1", 452s "sha256sum" => "$2", 452s "component" => "$3", 452s "filename" => "$4", 452s }; 452s END { 452s my $json = JSON->new->canonical(); 452s print $json->encode(\@v) or die $!; 452s } 452s ' 452s + t-git-next-date 452s + GIT_COMMITTER_DATE='1530000001 +0100' 452s + GIT_AUTHOR_DATE='1530000001 +0100' 452s + cd example 452s + cd .. 452s + t-dgit clone example ./example.2 452s + local dgit=dgit 452s + pwd 452s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 452s + : ' 452s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 452s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example ./example.2 452s | git config -z --get-regexp --global '.*' 452s | git config -z --get-regexp --system '.*' 452s clone main body 452s CD ./example.2 452s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 452s canonical suite name for unstable is sid 452s query: fetching http://127.0.0.1:45843/example.git/HEAD... 452s dgit-repos check_for_git => 1. 452s + git init -q 452s | git config -z --get-regexp --local '.*' 452s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 452s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 452s + git config user.name 'dgit test git user' 452s is_gitattrs_setup: found nothing 452s fetching existing git history 452s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 452s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 452s git_lrfetch_sane iteration 0 452s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 452s => d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit/sid 452s => db986af22779b497e88d14dd5c570d08aa97f433 refs/tags/archive/test-dummy/1.1 452s => 9bfa0703537b50800b9e049930198105ec7eb910 refs/tags/archive/test-dummy/1.2 452s => 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/tags/archive/test-dummy/2.0 452s => dc357e906c5f125afe65822cf25b1101b49af89e refs/tags/archive/test-dummy/2.1 452s => e085e2c1b3da17376756d6520252915e13bde377 refs/tags/test-dummy/1.1 452s => 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/tags/test-dummy/1.2 452s => d95d8f49875b488186dcd81552002794b461260a refs/tags/test-dummy/2.0 452s => 170a9399e0aca5d6f4c112ed2533ed6324e20f0e refs/tags/test-dummy/2.1 452s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 452s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 453s | git for-each-ref refs/dgit-fetch/test-dummy 453s |> d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit refs/dgit-fetch/test-dummy/dgit/sid 453s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 453s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 453s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 453s |> dc357e906c5f125afe65822cf25b1101b49af89e tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 453s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 453s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 453s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 453s |> 170a9399e0aca5d6f4c112ed2533ed6324e20f0e tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 453s git_lrfetch_sane: tidying any old suite lrfetchrefs 453s | git for-each-ref refs/dgit-fetch/sid 453s git_lrfetch_sane: git fetch --no-insane emulation complete 453s $VAR1 = { 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '87245e19d59683956b1d78f881da3ec5a9ca4d9f', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.1' => '170a9399e0aca5d6f4c112ed2533ed6324e20f0e', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '9bfa0703537b50800b9e049930198105ec7eb910', 453s 'refs/dgit-fetch/test-dummy/dgit/sid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'e085e2c1b3da17376756d6520252915e13bde377', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'dc357e906c5f125afe65822cf25b1101b49af89e', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '6b34536340e84e96e97d215c14ed9eee90156ac4', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'd95d8f49875b488186dcd81552002794b461260a', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'db986af22779b497e88d14dd5c570d08aa97f433' 453s }; 453s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 453s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 453s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 453s offered refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 453s + git update-ref refs/tags/archive/test-dummy/1.1 db986af22779b497e88d14dd5c570d08aa97f433 '' 453s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 453s offered refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 453s + git update-ref refs/tags/archive/test-dummy/1.2 9bfa0703537b50800b9e049930198105ec7eb910 '' 453s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 453s offered refs/tags/archive/test-dummy/2.0=87245e19d59683956b1d78f881da3ec5a9ca4d9f 453s + git update-ref refs/tags/archive/test-dummy/2.0 87245e19d59683956b1d78f881da3ec5a9ca4d9f '' 453s |> dc357e906c5f125afe65822cf25b1101b49af89e tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 453s offered refs/tags/archive/test-dummy/2.1=dc357e906c5f125afe65822cf25b1101b49af89e 453s + git update-ref refs/tags/archive/test-dummy/2.1 dc357e906c5f125afe65822cf25b1101b49af89e '' 453s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 453s offered refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 453s + git update-ref refs/tags/test-dummy/1.1 e085e2c1b3da17376756d6520252915e13bde377 '' 453s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 453s offered refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 453s + git update-ref refs/tags/test-dummy/1.2 6b34536340e84e96e97d215c14ed9eee90156ac4 '' 453s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 453s offered refs/tags/test-dummy/2.0=d95d8f49875b488186dcd81552002794b461260a 453s + git update-ref refs/tags/test-dummy/2.0 d95d8f49875b488186dcd81552002794b461260a '' 453s |> 170a9399e0aca5d6f4c112ed2533ed6324e20f0e tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 453s offered refs/tags/test-dummy/2.1=170a9399e0aca5d6f4c112ed2533ed6324e20f0e 453s + git update-ref refs/tags/test-dummy/2.1 170a9399e0aca5d6f4c112ed2533ed6324e20f0e '' 453s + git config remote.dgit.skipdefaultupdate true 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.2.dsc... 453s get_archive_dsc: Version 2.2 453s last upload to archive: NO git hash 453s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 453s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 453s previous reference hash=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 453s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 453s => `' 453s fetch_from_archive: lastfetch= 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/unpack 453s considering reusing example_2.2.tar.gz: (No such file or directory) linked. 453s using existing example_2.2.tar.gz 453s considering saving example_2.2.tar.gz: (File exists) no need. 453s + dpkg-source --no-check -x -- example.dsc 453s dpkg-source: info: extracting example in example-2.2 453s dpkg-source: info: unpacking example_2.2.tar.gz 453s CD example-2.2 453s | find -name .git -prune -print0 453s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 453s + git add -Af . 453s | git write-tree 453s => `8ac575c6e3130344f4026dd12dec2c32922adfc2' 453s import clog search... 453s | dpkg-parsechangelog --format rfc822 --all 453s import clog 2.2 package changelog, entry no.1... 453s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 453s => `1530000000 +0000' 453s import main commit 453s | git hash-object -w -t commit ../commit.tmp 453s => `300feb37108f13148ad19d5656d9aef7a114e654' 453s synthesised git commit from .dsc 2.2 453s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:debian/changelog 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 453s fetch mergeinfos: 453s commit 300feb37108f13148ad19d5656d9aef7a114e654 Import of source package 453s commit d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 dgit suite branch on dgit git server 453s ReverseParents=1 Message=Record example (2.2) in archive suite sid 453s | git cat-file commit 300feb37108f13148ad19d5656d9aef7a114e654 453s => `tree 8ac575c6e3130344f4026dd12dec2c32922adfc2'... 453s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob 300feb37108f13148ad19d5656d9aef7a114e654:debian/changelog 453s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 453s => `1530000000 +0000' 453s | git hash-object -w -t commit /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/mergecommit 453s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 453s fetch hash=da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s | git merge-base d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 453s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 453s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 453s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 453s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 453s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s | git log -n2 da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s => `commit da7fba676047c6a8e72a018a88c1ef8c1478aa47'... 453s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s => `' 453s + git reset --hard refs/remotes/dgit/dgit/sid 453s HEAD is now at da7fba6 Record example (2.2) in archive suite sid 453s + bash -ec ' set -o pipefail 453s git ls-tree -r --name-only -z HEAD | '\\' 453s xargs -0r touch -h -r . -- 453s ' 453s dgit ok: ready for work in ./example.2 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 453s del_lrfetchrefs... 453s del_lrfetchrefs: d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit-fetch/test-dummy/dgit/sid 453s del_lrfetchrefs: db986af22779b497e88d14dd5c570d08aa97f433 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 453s del_lrfetchrefs: 9bfa0703537b50800b9e049930198105ec7eb910 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 453s del_lrfetchrefs: 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 453s del_lrfetchrefs: dc357e906c5f125afe65822cf25b1101b49af89e refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 453s del_lrfetchrefs: e085e2c1b3da17376756d6520252915e13bde377 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 453s del_lrfetchrefs: 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 453s del_lrfetchrefs: d95d8f49875b488186dcd81552002794b461260a refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 453s del_lrfetchrefs: 170a9399e0aca5d6f4c112ed2533ed6324e20f0e refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 453s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 453s ' 453s + cd example.2 453s + t-commit 'now a dgit upload again' 453s + local 'msg=now a dgit upload again' 453s + v=2.3 453s + t-debchange --force-distribution -v2.3 --distribution unstable 'now a dgit upload again' 453s + DEBEMAIL=dgit-tests@example.org 453s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange --force-distribution -v2.3 --distribution unstable 'now a dgit upload again' 453s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ debchange --force-distribution -v2.3 --distribution unstable now a dgit upload again 453s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 453s libdistro-info-perl is not installed, Debian release names are not known. 453s libdistro-info-perl is not installed, Ubuntu release names are not known. 453s + git add debian/changelog 453s + debcommit 453s git commit -m 'now a dgit upload again' 453s [dgit/sid 5ab2693] now a dgit upload again 453s 1 file changed, 6 insertions(+) 453s + revision=4 453s + t-dgit -wgf push-source 453s + local dgit=dgit 453s + pwd 453s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 453s + : ' 453s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 453s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 453s | git rev-parse --show-toplevel 453s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2' 453s | git config -z --get-regexp --local '.*' 453s | git config -z --get-regexp --local '.*' 453s | git config -z --get-regexp --global '.*' 453s | git config -z --get-regexp --system '.*' 453s format , quilt mode linear 453s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 453s warning: could not open directory 'debian/source/': No such file or directory 453s => `' 453s + git diff --quiet HEAD 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 453s canonical suite name for unstable is sid 453s | git rev-parse 'HEAD~0' 453s => `5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7' 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/unpack 453s CD work 453s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 453s + git reset -q --hard 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 453s CD .. 453s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 453s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 453s dpkg-source: warning: source directory 'work' is not - 'example-2.3' 453s dpkg-source: info: using source format '1.0' 453s dpkg-source: info: building example in example_2.3.tar.gz 453s dpkg-source: info: building example in example_2.3.dsc 453s CD work 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 453s changelog will contain changes since 2.2 453s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.3_source.changes dpkg-genchanges -S -v2.2 453s dpkg-genchanges: info: including full source code in upload 453s CD .. 453s moving example_2.3.dsc, example_2.3_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.. 453s renaming (Files) example_2.3.tar.gz 453s renaming (dsc) example_2.3.dsc 453s renaming (changes) example_2.3_source.changes 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 453s actually entering push 453s query: fetching http://127.0.0.1:45843/example.git/HEAD... 453s dgit-repos check_for_git => 1. 453s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 453s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 453s git_lrfetch_sane iteration 0 453s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 453s => d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit/sid 453s => db986af22779b497e88d14dd5c570d08aa97f433 refs/tags/archive/test-dummy/1.1 453s => 9bfa0703537b50800b9e049930198105ec7eb910 refs/tags/archive/test-dummy/1.2 453s => 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/tags/archive/test-dummy/2.0 453s => dc357e906c5f125afe65822cf25b1101b49af89e refs/tags/archive/test-dummy/2.1 453s => e085e2c1b3da17376756d6520252915e13bde377 refs/tags/test-dummy/1.1 453s => 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/tags/test-dummy/1.2 453s => d95d8f49875b488186dcd81552002794b461260a refs/tags/test-dummy/2.0 453s => 170a9399e0aca5d6f4c112ed2533ed6324e20f0e refs/tags/test-dummy/2.1 453s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 453s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 453s | git for-each-ref refs/dgit-fetch/test-dummy 453s |> d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 commit refs/dgit-fetch/test-dummy/dgit/sid 453s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 453s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 453s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 453s |> dc357e906c5f125afe65822cf25b1101b49af89e tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 453s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 453s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 453s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 453s |> 170a9399e0aca5d6f4c112ed2533ed6324e20f0e tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 453s git_lrfetch_sane: tidying any old suite lrfetchrefs 453s | git for-each-ref refs/dgit-fetch/sid 453s git_lrfetch_sane: git fetch --no-insane emulation complete 453s $VAR1 = { 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0' => 'd95d8f49875b488186dcd81552002794b461260a', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1' => 'dc357e906c5f125afe65822cf25b1101b49af89e', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.1' => '170a9399e0aca5d6f4c112ed2533ed6324e20f0e', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.1' => 'e085e2c1b3da17376756d6520252915e13bde377', 453s 'refs/dgit-fetch/test-dummy/dgit/sid' => 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61', 453s 'refs/dgit-fetch/test-dummy/tags/test-dummy/1.2' => '6b34536340e84e96e97d215c14ed9eee90156ac4', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2' => '9bfa0703537b50800b9e049930198105ec7eb910', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0' => '87245e19d59683956b1d78f881da3ec5a9ca4d9f', 453s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1' => 'db986af22779b497e88d14dd5c570d08aa97f433' 453s }; 453s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 453s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/tags/archive/test-dummy/1.1 453s currently refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 453s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/tags/archive/test-dummy/1.2 453s currently refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 453s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/tags/archive/test-dummy/2.0 453s currently refs/tags/archive/test-dummy/2.0=87245e19d59683956b1d78f881da3ec5a9ca4d9f 453s |> dc357e906c5f125afe65822cf25b1101b49af89e tag refs/tags/archive/test-dummy/2.1 453s currently refs/tags/archive/test-dummy/2.1=dc357e906c5f125afe65822cf25b1101b49af89e 453s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/tags/test-dummy/1.1 453s currently refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 453s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/tags/test-dummy/1.2 453s currently refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 453s |> d95d8f49875b488186dcd81552002794b461260a tag refs/tags/test-dummy/2.0 453s currently refs/tags/test-dummy/2.0=d95d8f49875b488186dcd81552002794b461260a 453s |> 170a9399e0aca5d6f4c112ed2533ed6324e20f0e tag refs/tags/test-dummy/2.1 453s currently refs/tags/test-dummy/2.1=170a9399e0aca5d6f4c112ed2533ed6324e20f0e 453s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 453s |> db986af22779b497e88d14dd5c570d08aa97f433 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 453s offered refs/tags/archive/test-dummy/1.1=db986af22779b497e88d14dd5c570d08aa97f433 453s |> 9bfa0703537b50800b9e049930198105ec7eb910 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 453s offered refs/tags/archive/test-dummy/1.2=9bfa0703537b50800b9e049930198105ec7eb910 453s |> 87245e19d59683956b1d78f881da3ec5a9ca4d9f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 453s offered refs/tags/archive/test-dummy/2.0=87245e19d59683956b1d78f881da3ec5a9ca4d9f 453s |> dc357e906c5f125afe65822cf25b1101b49af89e tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 453s offered refs/tags/archive/test-dummy/2.1=dc357e906c5f125afe65822cf25b1101b49af89e 453s |> e085e2c1b3da17376756d6520252915e13bde377 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 453s offered refs/tags/test-dummy/1.1=e085e2c1b3da17376756d6520252915e13bde377 453s |> 6b34536340e84e96e97d215c14ed9eee90156ac4 tag refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 453s offered refs/tags/test-dummy/1.2=6b34536340e84e96e97d215c14ed9eee90156ac4 453s |> d95d8f49875b488186dcd81552002794b461260a tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 453s offered refs/tags/test-dummy/2.0=d95d8f49875b488186dcd81552002794b461260a 453s |> 170a9399e0aca5d6f4c112ed2533ed6324e20f0e tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 453s offered refs/tags/test-dummy/2.1=170a9399e0aca5d6f4c112ed2533ed6324e20f0e 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 453s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.2.dsc... 453s get_archive_dsc: Version 2.2 453s last upload to archive: NO git hash 453s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 453s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 453s previous reference hash=d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 453s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 453s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 453s fetch_from_archive: lastfetch=da7fba676047c6a8e72a018a88c1ef8c1478aa47 453s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/unpack 453s considering reusing example_2.2.tar.gz: (No such file or directory) linked. 453s using existing example_2.2.tar.gz 453s considering saving example_2.2.tar.gz: (File exists) no need. 453s + dpkg-source --no-check -x -- example.dsc 453s dpkg-source: info: extracting example in example-2.2 453s dpkg-source: info: unpacking example_2.2.tar.gz 453s CD example-2.2 453s | find -name .git -prune -print0 453s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 454s + git add -Af . 454s | git write-tree 454s => `8ac575c6e3130344f4026dd12dec2c32922adfc2' 454s import clog search... 454s | dpkg-parsechangelog --format rfc822 --all 454s import clog 2.2 package changelog, entry no.1... 454s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 454s => `1530000000 +0000' 454s import main commit 454s | git hash-object -w -t commit ../commit.tmp 454s => `300feb37108f13148ad19d5656d9aef7a114e654' 454s synthesised git commit from .dsc 2.2 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob d5d72bd268117528fdb90dd8ee4f0f2fe5432b61:debian/changelog 454s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob da7fba676047c6a8e72a018a88c1ef8c1478aa47:debian/changelog 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgitclog; exec "$@"' x git cat-file blob 300feb37108f13148ad19d5656d9aef7a114e654:debian/changelog 454s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s fetch mergeinfos: 454s commit da7fba676047c6a8e72a018a88c1ef8c1478aa47 dgit client's archive history view 454s fetch hash=da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s | git merge-base d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 454s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 454s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 454s | git rev-parse 'd5d72bd268117528fdb90dd8ee4f0f2fe5432b61~0' 454s => `d5d72bd268117528fdb90dd8ee4f0f2fe5432b61' 454s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s | git log -n2 da7fba676047c6a8e72a018a88c1ef8c1478aa47 454s => `commit da7fba676047c6a8e72a018a88c1ef8c1478aa47'... 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 454s + git check-ref-format archive/test-dummy/2.3 454s | git symbolic-ref -q HEAD 454s => `refs/heads/dgit/sid' 454s | git rev-parse 'HEAD~0' 454s => `5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7' 454s ffq_prev_branchinfo branch current refs/heads/dgit/sid 454s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 454s => `' 454s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 454s => `' 454s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 454s warning: could not open directory 'debian/source/': No such file or directory 454s => `' 454s + git diff --quiet HEAD 454s | git merge-base da7fba676047c6a8e72a018a88c1ef8c1478aa47 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git rev-parse 'da7fba676047c6a8e72a018a88c1ef8c1478aa47~0' 454s => `da7fba676047c6a8e72a018a88c1ef8c1478aa47' 454s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.3' 454s => `' 454s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/unpack 454s checking that example_2.3.dsc corresponds to HEAD 454s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/../example_2.3.dsc 454s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/../example_2.3.dsc) 454s dpkg-source: info: extracting example in example-2.3 454s dpkg-source: info: unpacking example_2.3.tar.gz 454s CD example-2.3 454s | find -name .git -prune -print0 454s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 454s + git add -Af . 454s | git write-tree 454s => `87a6e85eba896ce0fe1e99518f9e66ff869db7a5' 454s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 454s + git diff --quiet 87a6e85eba896ce0fe1e99518f9e66ff869db7a5 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 454s files_compare_inputs example_2.3.dsc 454s files_compare_inputs example_2.3.dsc Checksums-Sha256 454s files_compare_inputs example_2.3.dsc Checksums-Sha256 example_2.3.tar.gz 454s files_compare_inputs example_2.3.dsc Checksums-Sha1 454s files_compare_inputs example_2.3.dsc Checksums-Sha1 example_2.3.tar.gz 454s files_compare_inputs example_2.3.dsc Files 454s files_compare_inputs example_2.3.dsc Files example_2.3.tar.gz 454s files_compare_inputs example_2.3_source.changes 454s files_compare_inputs example_2.3_source.changes Checksums-Sha256 454s files_compare_inputs example_2.3_source.changes Checksums-Sha256 example_2.3.dsc 454s files_compare_inputs example_2.3_source.changes Checksums-Sha256 example_2.3.tar.gz 454s files_compare_inputs example_2.3_source.changes Checksums-Sha1 454s files_compare_inputs example_2.3_source.changes Checksums-Sha1 example_2.3.dsc 454s files_compare_inputs example_2.3_source.changes Checksums-Sha1 example_2.3.tar.gz 454s files_compare_inputs example_2.3_source.changes Files 454s files_compare_inputs example_2.3_source.changes Files example_2.3.dsc 454s files_compare_inputs example_2.3_source.changes Files example_2.3.tar.gz 454s checking origs needed (2.3)... 454s checking origs needed placement 'devel extra'... 454s origs example_2.3.tar.gz | 7952d6120e93764a807b1021f9a85d28 1051 example_2.3.tar.gz 454s ../example_2.3_source.changes already has appropriate .orig(s) (if any) 454s push_tagwants: $VAR1 = [ 454s '2.3', 454s '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 454s undef, 454s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag' 454s ]; 454s $VAR2 = [ 454s { 454s 'Tfn' => sub { "DUMMY" }, 454s 'Tag' => 'archive/test-dummy/2.3', 454s 'Objid' => '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 454s 'TfSuffix' => '', 454s 'View' => 'dgit', 454s 'TagFn' => sub { "DUMMY" } 454s }, 454s { 454s 'Objid' => '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7', 454s 'Tag' => 'test-dummy/2.3', 454s 'Tfn' => sub { "DUMMY" }, 454s 'TfSuffix' => '-dgit', 454s 'View' => 'dgit', 454s 'TagFn' => sub { "DUMMY" } 454s } 454s ]; 454s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:01 +0000' 454s => `1530000001 +0000' 454s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag.tmp 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag.tmp.asc 454s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.tmp.asc 454s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag.signed.tmp 454s => `47bc4470260e5c7852fe40284a18d908bab305e9' 454s + git verify-tag 47bc4470260e5c7852fe40284a18d908bab305e9 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s gpg: Signature made Mon Mar 31 12:25:47 2025 UTC 454s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 454s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 454s gpg: WARNING: This key is not certified with a trusted signature! 454s gpg: There is no indication that the signature belongs to the owner. 454s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 454s + git update-ref refs/tags/archive/test-dummy/2.3 47bc4470260e5c7852fe40284a18d908bab305e9 454s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2/.git/dgit/tag-dgit.signed.tmp 454s => `0f1ae78b2f83568b7f18f99d16a9e0dee30144d0' 454s + git verify-tag 0f1ae78b2f83568b7f18f99d16a9e0dee30144d0 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s gpg: Signature made Mon Mar 31 12:25:48 2025 UTC 454s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 454s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 454s gpg: WARNING: This key is not certified with a trusted signature! 454s gpg: There is no indication that the signature belongs to the owner. 454s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 454s + git update-ref refs/tags/test-dummy/2.3 0f1ae78b2f83568b7f18f99d16a9e0dee30144d0 454s query: fetching http://127.0.0.1:45843/example.git/HEAD... 454s dgit-repos check_for_git => 1. 454s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7:refs/dgit/sid refs/tags/archive/test-dummy/2.3 refs/tags/test-dummy/2.3 454s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 454s d5d72bd..5ab2693 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 -> refs/dgit/sid 454s * [new tag] archive/test-dummy/2.3 -> archive/test-dummy/2.3 454s * [new tag] test-dummy/2.3 -> test-dummy/2.3 454s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 454s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.3_source.changes 454s signfile dsc ../example_2.3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s 454s fixup_changes dsc ../example_2.3.dsc ../example_2.3_source.changes 454s signfile changes ../example_2.3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 454s 454s Successfully signed dsc, changes files 454s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.3_source.changes 455s gpg: ../example_2.3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 455s gpg: ../example_2.3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 455s D: Setting host argument. 455s Checking signature on .changes 455s Checking signature on .dsc 455s Uploading to test-dummy (via local to localhost): 455s Successfully uploaded packages. 455s dgit ok: pushed and uploaded 2.3 455s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 455s del_lrfetchrefs... 455s del_lrfetchrefs: d5d72bd268117528fdb90dd8ee4f0f2fe5432b61 refs/dgit-fetch/test-dummy/dgit/sid 455s del_lrfetchrefs: db986af22779b497e88d14dd5c570d08aa97f433 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.1 455s del_lrfetchrefs: 9bfa0703537b50800b9e049930198105ec7eb910 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/1.2 455s del_lrfetchrefs: 87245e19d59683956b1d78f881da3ec5a9ca4d9f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0 455s del_lrfetchrefs: dc357e906c5f125afe65822cf25b1101b49af89e refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.1 455s del_lrfetchrefs: e085e2c1b3da17376756d6520252915e13bde377 refs/dgit-fetch/test-dummy/tags/test-dummy/1.1 455s del_lrfetchrefs: 6b34536340e84e96e97d215c14ed9eee90156ac4 refs/dgit-fetch/test-dummy/tags/test-dummy/1.2 455s del_lrfetchrefs: d95d8f49875b488186dcd81552002794b461260a refs/dgit-fetch/test-dummy/tags/test-dummy/2.0 455s del_lrfetchrefs: 170a9399e0aca5d6f4c112ed2533ed6324e20f0e refs/dgit-fetch/test-dummy/tags/test-dummy/2.1 455s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 455s ' 455s + t-refs-same-start 455s + unset t_ref_val 455s + t_ref_names=() 455s + t-pushed-good dgit/sid 455s + local branch=dgit/sid 455s + local suite=sid 455s + t-refs-same refs/heads/dgit/sid 455s + local g 455s + for g in $* 455s + t-ref-same refs/heads/dgit/sid 455s + local name=refs/heads/dgit/sid 455s + local val 455s ++ t-git-get-ref refs/heads/dgit/sid 455s ++ local ref=refs/heads/dgit/sid 455s ++ case "$ref" in 455s ++ git show-ref -d refs/heads/dgit/sid 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val refs/heads/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=refs/heads/dgit/sid 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s + t-pushed-good-core 455s + t-ref-dsc-dgit 455s + t-incoming-dsc 455s + local dsc=example_2.3.dsc 455s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc 455s + local val 455s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc Dgit 455s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc 455s ++ local field=Dgit 455s ++ perl -e ' 455s use Dpkg::Control::Hash; 455s my $h = new Dpkg::Control::Hash allow_pgp=>1; 455s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc"); 455s my $val = $h->{"Dgit"},"\n"; 455s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc Dgit" unless defined $val; 455s print $val,"\n"; 455s ' 455s + val='5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 test-dummy archive/test-dummy/2.3 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 455s ++ perl -e ' 455s $_=shift @ARGV; 455s die "Dgit $_ ?" unless m/^\w+\b/; 455s print $&,"\n" or die $!; 455s ' '5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 test-dummy archive/test-dummy/2.3 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.3.dsc 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s ++ t-v-tag 455s ++ echo refs/tags/archive/test-dummy/2.3 455s + t-refs-same refs/tags/archive/test-dummy/2.3 refs/remotes/dgit/dgit/sid 455s + local g 455s + for g in $* 455s + t-ref-same refs/tags/archive/test-dummy/2.3 455s + local name=refs/tags/archive/test-dummy/2.3 455s + local val 455s ++ t-git-get-ref refs/tags/archive/test-dummy/2.3 455s ++ local ref=refs/tags/archive/test-dummy/2.3 455s ++ case "$ref" in 455s ++ git show-ref -d refs/tags/archive/test-dummy/2.3 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.3\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val refs/tags/archive/test-dummy/2.3 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=refs/tags/archive/test-dummy/2.3 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s + for g in $* 455s + t-ref-same refs/remotes/dgit/dgit/sid 455s + local name=refs/remotes/dgit/dgit/sid 455s + local val 455s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 455s ++ local ref=refs/remotes/dgit/dgit/sid 455s ++ case "$ref" in 455s ++ git show-ref -d refs/remotes/dgit/dgit/sid 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val refs/remotes/dgit/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=refs/remotes/dgit/dgit/sid 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 455s + local val 455s + for g in $* 455s ++ t-git-get-ref refs/heads/dgit/unstable 455s ++ local ref=refs/heads/dgit/unstable 455s ++ case "$ref" in 455s ++ git show-ref -d refs/heads/dgit/unstable 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s ++ test 1 = 1 455s + val= 455s + '[' x '!=' x ']' 455s + for g in $* 455s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 455s ++ local ref=refs/remotes/dgit/dgit/unstable 455s ++ case "$ref" in 455s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s ++ test 1 = 1 455s + val= 455s + '[' x '!=' x ']' 455s + set -e 455s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 455s ++ t-v-tag 455s ++ echo refs/tags/archive/test-dummy/2.3 455s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/2.3 455s + local g 455s + for g in $* 455s + t-ref-same refs/dgit/sid 455s + local name=refs/dgit/sid 455s + local val 455s ++ t-git-get-ref refs/dgit/sid 455s ++ local ref=refs/dgit/sid 455s ++ case "$ref" in 455s ++ git show-ref -d refs/dgit/sid 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val refs/dgit/sid 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=refs/dgit/sid 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s + for g in $* 455s + t-ref-same refs/tags/archive/test-dummy/2.3 455s + local name=refs/tags/archive/test-dummy/2.3 455s + local val 455s ++ t-git-get-ref refs/tags/archive/test-dummy/2.3 455s ++ local ref=refs/tags/archive/test-dummy/2.3 455s ++ case "$ref" in 455s ++ git show-ref -d refs/tags/archive/test-dummy/2.3 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/2.3\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ' 455s + val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t-ref-same-val refs/tags/archive/test-dummy/2.3 5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + local name=refs/tags/archive/test-dummy/2.3 455s + local val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + case "${t_ref_val-unset}" in 455s + t_ref_val=5ab2693c33e2d3f6d248d8181375e2c6abf6c0b7 455s + t_ref_names+=("$name") 455s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 455s + t-refs-notexist refs/dgit/unstable 455s + local val 455s + for g in $* 455s ++ t-git-get-ref refs/dgit/unstable 455s ++ local ref=refs/dgit/unstable 455s ++ case "$ref" in 455s ++ perl -ne ' 455s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 455s END { print "$x\n" if length $x; } 455s ++ git show-ref -d refs/dgit/unstable 455s ' 455s ++ test 1 = 1 455s + val= 455s + '[' x '!=' x ']' 455s ++ t-v-tag 455s ++ echo refs/tags/archive/test-dummy/2.3 455s + git verify-tag refs/tags/archive/test-dummy/2.3 455s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 455s gpg: Signature made Mon Mar 31 12:25:47 2025 UTC 455s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 455s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 455s gpg: WARNING: This key is not certified with a trusted signature! 455s gpg: There is no indication that the signature belongs to the owner. 455s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 455s + t-ok 455s + : ======================================== 455s + t-check-only-bpd 455s + '[' .. = .. ']' 455s + return 455s + t-fscks 455s + shopt -s nullglob 455s + for d in $tmp/*/.git $tmp/git/*.git 455s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 455s + t-git-fsck 455s ++ git rev-parse --git-dir 455s + local fsckerrs=.git/dgit-test-fsck.errs 455s + set +e 455s + LC_MESSAGES=C 455s + tee .git/dgit-test-fsck.errs 455s + git fsck --no-dangling --strict 455s + ps='0 0' 455s + set -e 455s + local pats 455s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 455s + test '0 0' = '0 0' 455s + pats+=(-e 'notice: HEAD points to an unborn branch') 455s + pats+=(-e 'notice: No default references') 455s + set +e 455s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 455s + rc=1 455s + set -e 455s + case $rc in 455s + for d in $tmp/*/.git $tmp/git/*.git 455s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 455s + t-git-fsck 455s ++ git rev-parse --git-dir 455s + local fsckerrs=.git/dgit-test-fsck.errs 455s + set +e 455s + LC_MESSAGES=C 455s + git fsck --no-dangling --strict 455s + tee .git/dgit-test-fsck.errs 455s + ps='0 0' 455s + set -e 455s + local pats 455s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 455s + test '0 0' = '0 0' 455s + pats+=(-e 'notice: HEAD points to an unborn branch') 455s + pats+=(-e 'notice: No default references') 455s + set +e 455s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 455s + rc=1 455s + set -e 455s + case $rc in 455s + for d in $tmp/*/.git $tmp/git/*.git 455s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 455s + t-git-fsck 455s ++ git rev-parse --git-dir 455s + local fsckerrs=./dgit-test-fsck.errs 455s + set +e 455s + LC_MESSAGES=C 455s + git fsck --no-dangling --strict 455s + tee ./dgit-test-fsck.errs 455s notice: HEAD points to an unborn branch (master) 455s + ps='0 0' 455s + set -e 455s + local pats 455s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 455s + test '0 0' = '0 0' 455s + pats+=(-e 'notice: HEAD points to an unborn branch') 455s + pats+=(-e 'notice: No default references') 455s + set +e 455s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 455s + rc=1 455s + set -e 455s + case $rc in 455s + t-save-artifacts 455s + artifacts=/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts 455s + '[' x/tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts = x ']' 455s + '[' xtmp = x ']' 455s + GZIP=-1v 455s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/alternating-dgit-artifacts/alternating-dgit.tar.gz '--exclude=*.tar' . 455s gzip: warning: GZIP environment variable is deprecated; use an alias or script 455s 79.7% 455s + echo ok. 455s ok. 455s + rc=0 455s + set +x 455s + set +e 455s + pwd 455s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.2 455s + '[' x '!=' x ']' 455s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 455s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 455s + set -e 455s + test 0 = 0 455s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 6772 455s PID TTY STAT TIME COMMAND 455s 6772 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 455s autopkgtest [12:25:49]: test alternating-dgit: -----------------------] 455s alternating-dgit PASS 455s autopkgtest [12:25:49]: test alternating-dgit: - - - - - - - - - - results - - - - - - - - - - 455s autopkgtest [12:25:49]: test clone-gitnosuite: preparing testbed 456s Reading package lists... 456s Building dependency tree... 456s Reading state information... 456s Starting pkgProblemResolver with broken count: 0 456s Starting 2 pkgProblemResolver with broken count: 0 456s Done 457s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 457s autopkgtest [12:25:51]: test clone-gitnosuite: [----------------------- 457s ++ set -o pipefail 457s ++ . tests/lib-core 457s ++ . tests/lib-restricts 457s ++ trap ' 457s rc=$? 457s set +x 457s test $rc = 0 || echo " 457s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 457s 457s Most relevant logs are just before assignment rc=$rc 457s Will now do cleanup etc. 457s " 457s set -x 457s set +e 457s pwd 457s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 457s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 457s set -e 457s test $rc = 0 || t-report-failure 457s ' EXIT 457s ++ t-filter-out-git-hyphen-dir 457s ++ local pathent 457s +++ type -p git-rev-parse 457s +++ : 457s ++ pathent= 457s ++ case "$pathent" in 457s ++ return 457s ++ t-set-intree 457s ++ '[' x = x ']' 457s ++ return 457s ++ : -D 457s ++ export DGIT_TEST_DEBUG 457s ++ : x 457s ++ export DGIT_TEST_DEBPUSH_DEBUG 457s ++ : 457s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 457s ++ GIT_COMMITTER_DATE='1530000000 +0100' 457s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 457s ++ GIT_AUTHOR_DATE='1530000000 +0100' 457s ++ export LC_CTYPE=C.UTF-8 457s ++ LC_CTYPE=C.UTF-8 457s ++ unset CDPATH 457s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 457s ++ FILTER_BRANCH_SQUELCH_WARNING=1 457s +++ pwd 457s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 457s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ testname=clone-gitnosuite 457s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ bpd=.. 457s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 457s ++ '[' x '!=' x ']' 457s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s +++ pwd 457s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ t-set-using-tmp 457s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 457s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 457s ++ export 'DEBFULLNAME=dgit test git user' 457s ++ DEBFULLNAME='dgit test git user' 457s ++ git config --global user.email dgit-test@debian.example.net 457s ++ git config --global user.name 'dgit test git user' 457s ++ git config --global protocol.ext.allow always 457s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 457s ++ env -0 457s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 457s ++ export DEBCHANGE_VENDOR=dpkg 457s ++ DEBCHANGE_VENDOR=dpkg 457s ++ unset VISUAL 457s ++ unset GIT_EDITOR 457s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 457s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 457s ++ cat 457s ++ schroot=build 457s ++ : aq 457s ++ : archive/test-dummy 457s ++ : sid:unstable 457s ++ t-git-config dgit.default.old-dsc-distro test-dummy 457s ++ git config --global dgit.default.old-dsc-distro test-dummy 457s ++ for import in ${autoimport-gnupg} 457s ++ case "$0" in 457s ++ t-setup-import gnupg 457s ++ local setupname=gnupg 457s ++ local setupsrc 457s ++ local lock 457s ++ '[' x = x ']' 457s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 457s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 457s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 457s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 457s cd "$1"; shift 457s setupname="$1"; shift 457s simport="$1"; shift 457s if [ -e "$simport" ]; then exit 0; fi 457s env - "$@" \ 457s "tests/setup/$setupname" 457s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 457s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 457s + shift 457s + setupname=gnupg 457s + shift 457s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 457s + shift 457s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 457s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-stderr --stdout=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-gitnosuite -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-gitnosuite' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 457s ++ set -o pipefail 457s ++ . tests/lib-core 457s ++ . tests/lib-restricts 457s ++ trap ' 457s rc=$? 457s set +x 457s test $rc = 0 || echo " 457s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 457s 457s Most relevant logs are just before assignment rc=$rc 457s Will now do cleanup etc. 457s " 457s set -x 457s set +e 457s pwd 457s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 457s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 457s set -e 457s test $rc = 0 || t-report-failure 457s ' EXIT 457s ++ t-filter-out-git-hyphen-dir 457s ++ local pathent 457s +++ type -p git-rev-parse 457s +++ : 457s ++ pathent= 457s ++ case "$pathent" in 457s ++ return 457s ++ t-set-intree 457s ++ '[' x = x ']' 457s ++ return 457s ++ : -D 457s ++ export DGIT_TEST_DEBUG 457s ++ : x 457s ++ export DGIT_TEST_DEBPUSH_DEBUG 457s ++ : 457s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 457s ++ GIT_COMMITTER_DATE='1530000000 +0100' 457s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 457s ++ GIT_AUTHOR_DATE='1530000000 +0100' 457s ++ export LC_CTYPE=C.UTF-8 457s ++ LC_CTYPE=C.UTF-8 457s ++ unset CDPATH 457s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 457s ++ FILTER_BRANCH_SQUELCH_WARNING=1 457s +++ pwd 457s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 457s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ testname=gnupg 457s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 457s ++ bpd=.. 457s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 457s ++ '[' x '!=' x ']' 457s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s +++ pwd 457s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ t-set-using-tmp 457s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 457s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 457s ++ export 'DEBFULLNAME=dgit test git user' 457s ++ DEBFULLNAME='dgit test git user' 457s ++ git config --global user.email dgit-test@debian.example.net 457s ++ git config --global user.name 'dgit test git user' 457s ++ git config --global protocol.ext.allow always 457s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 457s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 457s ++ export DEBCHANGE_VENDOR=dpkg 457s ++ DEBCHANGE_VENDOR=dpkg 457s ++ unset VISUAL 457s ++ unset GIT_EDITOR 457s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 457s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 457s ++ cat 457s ++ schroot=build 457s ++ : aq 457s ++ : archive/test-dummy 457s ++ : sid:unstable 457s ++ t-git-config dgit.default.old-dsc-distro test-dummy 457s ++ git config --global dgit.default.old-dsc-distro test-dummy 457s ++ for import in ${autoimport-gnupg} 457s ++ case "$0" in 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 457s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 457s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 457s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 457s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 457s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 457s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 457s + setup=' 457s export GNUPGHOME=$tmp/gnupg 457s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 457s 457s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 457s ssb rsa2048 2013-11-17 [E] 457s 457s sec rsa2048 2014-01-26 [SC] 457s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 457s uid [ultimate] Populus Romanus (test key) 457s ssb rsa2048 2014-01-26 [E] 457s 457s sec rsa2048 2014-01-26 [SC] 457s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 457s uid [ unknown] Hannibal (test key) 457s ssb rsa2048 2014-01-26 [E] 457s 457s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 457s export GNUPGHOME=$tmp/gnupg 457s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 457s 457s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 457s read <$tmp/must-clean/git-check.port git_check_port 457s 457s t-git-config --global dgit-distro.test-dummy.git-check url 457s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 457s t-git-config --global dgit-distro.test-dummy.git-check-url \ 457s http://127.0.0.1:$git_check_port 457s ' 457s + local savevars= 457s + local savedirs=--files-from=/dev/null 457s + local 'importeval= 457s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 457s read <$tmp/must-clean/git-check.port git_check_port 457s 457s t-git-config --global dgit-distro.test-dummy.git-check url 457s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 457s t-git-config --global dgit-distro.test-dummy.git-check-url \ 457s http://127.0.0.1:$git_check_port 457s ' 457s + local import=IMPORT.http-git-check 457s + exec 457s + local vn 457s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 457s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 457s print STDERR "saving-exporting $vn\n"; 457s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 457s or die $!; 457s } 457s ' 457s saving-exporting DGIT_TEST_REAL_GPG 457s saving-exporting DGIT_TEST_REAL_GPG_AGENT 457s + set -e 457s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 457s + printf '\n%s\n' ' 457s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 457s read <$tmp/must-clean/git-check.port git_check_port 457s 457s t-git-config --global dgit-distro.test-dummy.git-check url 457s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 457s t-git-config --global dgit-distro.test-dummy.git-check-url \ 457s http://127.0.0.1:$git_check_port 457s ' 457s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 457s + rc=0 457s + set +x 457s + set +e 457s + pwd 457s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s + '[' x '!=' x ']' 457s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 457s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 457s + set -e 457s + test 0 = 0 457s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 457s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 457s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 457s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 457s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 457s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 457s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 457s ++ read git_check_port 457s ++ t-git-config --global dgit-distro.test-dummy.git-check url 457s ++ git config --global --global dgit-distro.test-dummy.git-check url 457s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 457s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 457s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:39397 457s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:39397 457s + t-archive pari-extra 3-1 457s + t-archive-none pari-extra 457s + t-select-package pari-extra 457s + p=pari-extra 457s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 457s + t-archive-none-aq 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 457s + : 457s + local 'jsondelim=[' 457s + local suitespec 457s + for suitespec in $suitespecs 457s + local suite=sid 457s + local sname=unstable 457s + t-aq-archive-updated sid pari-extra 457s + local suite=sid 457s + local p=pari-extra 457s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 457s + perl -wne ' 457s use JSON; 457s use strict; 457s our @v; 457s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 457s push @v, { 457s "version" => "$1", 457s "sha256sum" => "$2", 457s "component" => "$3", 457s "filename" => "$4", 457s }; 457s END { 457s my $json = JSON->new->canonical(); 457s print $json->encode(\@v) or die $!; 457s } 457s ' 457s + t-aq-archive-updated new pari-extra 457s + local suite=new 457s + local p=pari-extra 457s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 457s + perl -wne ' 457s use JSON; 457s use strict; 457s our @v; 457s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 457s push @v, { 457s "version" => "$1", 457s "sha256sum" => "$2", 457s "component" => "$3", 457s "filename" => "$4", 457s }; 457s END { 457s my $json = JSON->new->canonical(); 457s print $json->encode(\@v) or die $!; 457s } 457s ' 457s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 457s + cat 457s + jsondelim=' },' 457s + cat 457s + v=3-1 457s + local dscf=pari-extra_3-1.dsc 457s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 457s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 457s + t-archive-query 457s + local suite=sid 457s + local dscf=main/pari-extra_3-1.dsc 457s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 457s + local suite=sid 457s + local p=pari-extra 457s + local v=3-1 457s + local dscf=main/pari-extra_3-1.dsc 457s + local sha 457s ++ sha256sum 457s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 457s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 457s + t-aq-archive-updated sid pari-extra 457s + local suite=sid 457s + local p=pari-extra 457s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 457s + perl -wne ' 457s use JSON; 457s use strict; 457s our @v; 457s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 457s push @v, { 457s "version" => "$1", 457s "sha256sum" => "$2", 457s "component" => "$3", 457s "filename" => "$4", 457s }; 457s END { 457s my $json = JSON->new->canonical(); 457s print $json->encode(\@v) or die $!; 457s } 457s ' 457s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 457s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 457s + set -e 457s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 457s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 457s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 457s dpkg-source: info: extracting pari-extra in pari-extra-3 457s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 457s dpkg-source: info: applying pari-extra_3-1.diff.gz 457s + t-git-none 457s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 457s + set -e 457s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 457s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 457s + cp -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_template /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 457s + t-dgit clone pari-extra 457s + local dgit=dgit 457s + pwd 457s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 457s + : ' 457s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 457s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 458s | git config -z --get-regexp --global '.*' 458s | git config -z --get-regexp --system '.*' 458s clone main body 458s CD pari-extra 458s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 458s canonical suite name for unstable is sid 458s query: fetching http://127.0.0.1:39397/pari-extra.git/HEAD... 458s dgit-repos check_for_git => 1. 458s + git init -q 458s | git config -z --get-regexp --local '.*' 458s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 458s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 458s + git config user.name 'dgit test git user' 458s is_gitattrs_setup: found nothing 458s fetching existing git history 458s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 458s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 458s git_lrfetch_sane iteration 0 458s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 458s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* 458s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' 458s | git for-each-ref refs/dgit-fetch/test-dummy 458s git_lrfetch_sane: tidying any old suite lrfetchrefs 458s | git for-each-ref refs/dgit-fetch/sid 458s git_lrfetch_sane: git fetch --no-insane emulation complete 458s $VAR1 = {}; 458s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 458s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 458s + git config remote.dgit.skipdefaultupdate true 458s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 458s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 458s get_archive_dsc: Version 3-1 458s last upload to archive: NO git hash 458s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 458s => `' 458s previous reference hash= 458s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 458s => `' 458s fetch_from_archive: lastfetch= 458s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 458s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 458s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 458s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 458s % Total % Received % Xferd Average Speed Time Time Time Current 458s Dload Upload Total Spent Left Speed 458s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 2188k 0 --:--:-- --:--:-- --:--:-- 2188k 458s considering saving pari-extra_3.orig.tar.gz: linked. 458s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 458s ./pari-extra_3-1.diff.gz does not exist, need to fetch 458s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 458s % Total % Received % Xferd Average Speed Time Time Time Current 458s Dload Upload Total Spent Left Speed 458s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 42.4M 0 --:--:-- --:--:-- --:--:-- 42.4M 458s considering saving pari-extra_3-1.diff.gz: linked. 458s import considering pari-extra_3.orig.tar.gz Y .gz orig 458s + chmod -R '+rwX' _unpack-tar 458s CD _unpack-tar 458s | find -name .git -prune -print0 458s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 458s + git add -Af . 458s | git write-tree 458s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 458s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 458s => `' 458s multiple subtrees 458s CD .. 458s import considering pari-extra_3-1.diff.gz not tar 458s + dpkg-source --no-check -x -- pari-extra.dsc 458s dpkg-source: info: extracting pari-extra in pari-extra-3 458s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 458s dpkg-source: info: applying pari-extra_3-1.diff.gz 458s CD pari-extra-3 458s | find -name .git -prune -print0 458s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 458s + git add -Af . 458s | git write-tree 458s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 458s import clog search... 458s | dpkg-parsechangelog --format rfc822 --all 458s import clog 3-1 package changelog, entry no.1... 458s import clog 3-1 vs 3... 458s import clog 3-1 becomes r1 458s import clog 2.1-1 package changelog, entry no.2... 458s import clog 2.1-1 vs 3... 458s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 458s => `1312546022 +0000' 458s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 458s => `1312546022 +0000' 458s import tartrees authline Bill Allombert 1312546022 +0000 458s import tartrees r1authline Bill Allombert 1312546022 +0000 458s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 458s | git hash-object -w -t commit --stdin 458s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 458s import main commit 458s | git hash-object -w -t commit ../commit.tmp 458s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 458s synthesised git commit from .dsc 3-1 458s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 458s fetch mergeinfos: 458s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 458s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 458s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 458s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 458s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 458s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 458s => `' 458s + git reset --hard refs/remotes/dgit/dgit/sid 458s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 458s + bash -ec ' set -o pipefail 458s git ls-tree -r --name-only -z HEAD | '\\' 458s xargs -0r touch -h -r . -- 458s ' 458s dgit ok: ready for work in pari-extra 458s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 458s del_lrfetchrefs... 458s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 458s ' 458s + t-ok 458s + : ======================================== 458s + t-check-only-bpd 458s + '[' .. = .. ']' 458s + return 458s + t-fscks 458s + shopt -s nullglob 458s + for d in $tmp/*/.git $tmp/git/*.git 458s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 458s + t-git-fsck 458s ++ git rev-parse --git-dir 458s + local fsckerrs=.git/dgit-test-fsck.errs 458s + set +e 458s + LC_MESSAGES=C 458s + git fsck --no-dangling --strict 458s + tee .git/dgit-test-fsck.errs 458s + ps='0 0' 458s + set -e 458s + local pats 458s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 458s + test '0 0' = '0 0' 458s + pats+=(-e 'notice: HEAD points to an unborn branch') 458s + pats+=(-e 'notice: No default references') 458s + set +e 458s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 458s + rc=1 458s + set -e 458s + case $rc in 458s + for d in $tmp/*/.git $tmp/git/*.git 458s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 458s + t-git-fsck 458s ++ git rev-parse --git-dir 458s + local fsckerrs=./dgit-test-fsck.errs 458s + set +e 458s + LC_MESSAGES=C 458s + git fsck --no-dangling --strict 458s + tee ./dgit-test-fsck.errs 458s notice: HEAD points to an unborn branch (master) 458s notice: No default references 458s + ps='0 0' 458s + set -e 458s + local pats 458s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 458s + test '0 0' = '0 0' 458s + pats+=(-e 'notice: HEAD points to an unborn branch') 458s + pats+=(-e 'notice: No default references') 458s + set +e 458s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 458s + rc=1 458s + set -e 458s + case $rc in 458s + t-save-artifacts 458s + artifacts=/tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts 458s + '[' x/tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts = x ']' 458s + '[' xtmp = x ']' 458s + GZIP=-1v 458s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/clone-gitnosuite-artifacts/clone-gitnosuite.tar.gz '--exclude=*.tar' . 458s gzip: warning: GZIP environment variable is deprecated; use an alias or script 458s 76.4% 458s + echo ok. 458s ok. 458s + rc=0 458s + set +x 458s + set +e 458s + pwd 458s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 458s + '[' x '!=' x ']' 458s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 458s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 458s + set -e 458s + test 0 = 0 458s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 8359 458s PID TTY STAT TIME COMMAND 458s 8359 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 458s autopkgtest [12:25:52]: test clone-gitnosuite: -----------------------] 459s autopkgtest [12:25:53]: test clone-gitnosuite: - - - - - - - - - - results - - - - - - - - - - 459s clone-gitnosuite PASS 459s autopkgtest [12:25:53]: test clone-nogit: preparing testbed 459s Reading package lists... 459s Building dependency tree... 459s Reading state information... 459s Starting pkgProblemResolver with broken count: 0 459s Starting 2 pkgProblemResolver with broken count: 0 459s Done 460s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 460s autopkgtest [12:25:54]: test clone-nogit: [----------------------- 460s ++ set -o pipefail 460s ++ . tests/lib-core 460s ++ . tests/lib-restricts 460s ++ trap ' 460s rc=$? 460s set +x 460s test $rc = 0 || echo " 460s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 460s 460s Most relevant logs are just before assignment rc=$rc 460s Will now do cleanup etc. 460s " 460s set -x 460s set +e 460s pwd 460s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 460s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 460s set -e 460s test $rc = 0 || t-report-failure 460s ' EXIT 460s ++ t-filter-out-git-hyphen-dir 460s ++ local pathent 460s +++ type -p git-rev-parse 460s +++ : 460s ++ pathent= 460s ++ case "$pathent" in 460s ++ return 460s ++ t-set-intree 460s ++ '[' x = x ']' 460s ++ return 460s ++ : -D 460s ++ export DGIT_TEST_DEBUG 460s ++ : x 460s ++ export DGIT_TEST_DEBPUSH_DEBUG 460s ++ : 460s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 460s ++ GIT_COMMITTER_DATE='1530000000 +0100' 460s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 460s ++ GIT_AUTHOR_DATE='1530000000 +0100' 460s ++ export LC_CTYPE=C.UTF-8 460s ++ LC_CTYPE=C.UTF-8 460s ++ unset CDPATH 460s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 460s ++ FILTER_BRANCH_SQUELCH_WARNING=1 460s +++ pwd 460s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 460s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ testname=clone-nogit 460s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ bpd=.. 460s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 460s ++ '[' x '!=' x ']' 460s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s +++ pwd 460s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ t-set-using-tmp 460s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 460s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 460s ++ export 'DEBFULLNAME=dgit test git user' 460s ++ DEBFULLNAME='dgit test git user' 460s ++ git config --global user.email dgit-test@debian.example.net 460s ++ git config --global user.name 'dgit test git user' 460s ++ git config --global protocol.ext.allow always 460s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 460s ++ env -0 460s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 460s ++ export DEBCHANGE_VENDOR=dpkg 460s ++ DEBCHANGE_VENDOR=dpkg 460s ++ unset VISUAL 460s ++ unset GIT_EDITOR 460s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 460s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 460s ++ cat 460s ++ schroot=build 460s ++ : aq 460s ++ : archive/test-dummy 460s ++ : sid:unstable 460s ++ t-git-config dgit.default.old-dsc-distro test-dummy 460s ++ git config --global dgit.default.old-dsc-distro test-dummy 460s ++ for import in ${autoimport-gnupg} 460s ++ case "$0" in 460s ++ t-setup-import gnupg 460s ++ local setupname=gnupg 460s ++ local setupsrc 460s ++ local lock 460s ++ '[' x = x ']' 460s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 460s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 460s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 460s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 460s cd "$1"; shift 460s setupname="$1"; shift 460s simport="$1"; shift 460s if [ -e "$simport" ]; then exit 0; fi 460s env - "$@" \ 460s "tests/setup/$setupname" 460s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 460s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 460s + shift 460s + setupname=gnupg 460s + shift 460s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 460s + shift 460s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 460s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/clone-nogit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/clone-nogit-stderr --stdout=/tmp/autopkgtest.ztMUxl/clone-nogit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-nogit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-nogit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-nogit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 460s ++ set -o pipefail 460s ++ . tests/lib-core 460s ++ . tests/lib-restricts 460s ++ trap ' 460s rc=$? 460s set +x 460s test $rc = 0 || echo " 460s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 460s 460s Most relevant logs are just before assignment rc=$rc 460s Will now do cleanup etc. 460s " 460s set -x 460s set +e 460s pwd 460s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 460s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 460s set -e 460s test $rc = 0 || t-report-failure 460s ' EXIT 460s ++ t-filter-out-git-hyphen-dir 460s ++ local pathent 460s +++ type -p git-rev-parse 460s +++ : 460s ++ pathent= 460s ++ case "$pathent" in 460s ++ return 460s ++ t-set-intree 460s ++ '[' x = x ']' 460s ++ return 460s ++ : -D 460s ++ export DGIT_TEST_DEBUG 460s ++ : x 460s ++ export DGIT_TEST_DEBPUSH_DEBUG 460s ++ : 460s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 460s ++ GIT_COMMITTER_DATE='1530000000 +0100' 460s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 460s ++ GIT_AUTHOR_DATE='1530000000 +0100' 460s ++ export LC_CTYPE=C.UTF-8 460s ++ LC_CTYPE=C.UTF-8 460s ++ unset CDPATH 460s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 460s ++ FILTER_BRANCH_SQUELCH_WARNING=1 460s +++ pwd 460s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 460s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ testname=gnupg 460s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 460s ++ bpd=.. 460s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 460s ++ '[' x '!=' x ']' 460s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s +++ pwd 460s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ t-set-using-tmp 460s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 460s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 460s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 460s ++ export 'DEBFULLNAME=dgit test git user' 460s ++ DEBFULLNAME='dgit test git user' 460s ++ git config --global user.email dgit-test@debian.example.net 460s ++ git config --global user.name 'dgit test git user' 460s ++ git config --global protocol.ext.allow always 460s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 460s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 460s ++ export DEBCHANGE_VENDOR=dpkg 460s ++ DEBCHANGE_VENDOR=dpkg 460s ++ unset VISUAL 460s ++ unset GIT_EDITOR 460s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 460s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 460s ++ cat 460s ++ schroot=build 460s ++ : aq 460s ++ : archive/test-dummy 460s ++ : sid:unstable 460s ++ t-git-config dgit.default.old-dsc-distro test-dummy 460s ++ git config --global dgit.default.old-dsc-distro test-dummy 460s ++ for import in ${autoimport-gnupg} 460s ++ case "$0" in 460s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 460s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 460s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 460s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 460s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 460s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 460s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 460s + setup=' 460s export GNUPGHOME=$tmp/gnupg 460s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 460s 460s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 460s ssb rsa2048 2013-11-17 [E] 460s 460s sec rsa2048 2014-01-26 [SC] 460s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 460s uid [ultimate] Populus Romanus (test key) 460s ssb rsa2048 2014-01-26 [E] 460s 460s sec rsa2048 2014-01-26 [SC] 460s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 460s uid [ unknown] Hannibal (test key) 460s ssb rsa2048 2014-01-26 [E] 460s 460s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 460s export GNUPGHOME=$tmp/gnupg 460s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 460s 460s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 460s read <$tmp/must-clean/git-check.port git_check_port 460s 460s t-git-config --global dgit-distro.test-dummy.git-check url 460s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 460s t-git-config --global dgit-distro.test-dummy.git-check-url \ 460s http://127.0.0.1:$git_check_port 460s ' 460s + local savevars= 460s + local savedirs=--files-from=/dev/null 460s + local 'importeval= 460s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 460s read <$tmp/must-clean/git-check.port git_check_port 460s 460s t-git-config --global dgit-distro.test-dummy.git-check url 460s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 460s t-git-config --global dgit-distro.test-dummy.git-check-url \ 460s http://127.0.0.1:$git_check_port 460s ' 460s + local import=IMPORT.http-git-check 460s + exec 460s + local vn 460s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 460s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 460s print STDERR "saving-exporting $vn\n"; 460s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 460s or die $!; 460s } 460s ' 461s saving-exporting DGIT_TEST_REAL_GPG 461s saving-exporting DGIT_TEST_REAL_GPG_AGENT 461s + set -e 461s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 461s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 461s + printf '\n%s\n' ' 461s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 461s read <$tmp/must-clean/git-check.port git_check_port 461s 461s t-git-config --global dgit-distro.test-dummy.git-check url 461s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 461s t-git-config --global dgit-distro.test-dummy.git-check-url \ 461s http://127.0.0.1:$git_check_port 461s ' 461s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 461s + rc=0 461s + set +x 461s + set +e 461s + pwd 461s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 461s + '[' x '!=' x ']' 461s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 461s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 461s + set -e 461s + test 0 = 0 461s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 461s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 461s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 461s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 461s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 461s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 461s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 461s ++ read git_check_port 461s ++ t-git-config --global dgit-distro.test-dummy.git-check url 461s ++ git config --global --global dgit-distro.test-dummy.git-check url 461s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 461s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 461s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:45707 461s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:45707 461s + t-archive pari-extra 3-1 461s + t-archive-none pari-extra 461s + t-select-package pari-extra 461s + p=pari-extra 461s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 461s + t-archive-none-aq 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 461s + : 461s + local 'jsondelim=[' 461s + local suitespec 461s + for suitespec in $suitespecs 461s + local suite=sid 461s + local sname=unstable 461s + t-aq-archive-updated sid pari-extra 461s + local suite=sid 461s + local p=pari-extra 461s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 461s + perl -wne ' 461s use JSON; 461s use strict; 461s our @v; 461s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 461s push @v, { 461s "version" => "$1", 461s "sha256sum" => "$2", 461s "component" => "$3", 461s "filename" => "$4", 461s }; 461s END { 461s my $json = JSON->new->canonical(); 461s print $json->encode(\@v) or die $!; 461s } 461s ' 461s + t-aq-archive-updated new pari-extra 461s + local suite=new 461s + local p=pari-extra 461s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 461s + perl -wne ' 461s use JSON; 461s use strict; 461s our @v; 461s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 461s push @v, { 461s "version" => "$1", 461s "sha256sum" => "$2", 461s "component" => "$3", 461s "filename" => "$4", 461s }; 461s END { 461s my $json = JSON->new->canonical(); 461s print $json->encode(\@v) or die $!; 461s } 461s ' 461s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 461s + cat 461s + jsondelim=' },' 461s + cat 461s + v=3-1 461s + local dscf=pari-extra_3-1.dsc 461s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 461s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 461s + t-archive-query 461s + local suite=sid 461s + local dscf=main/pari-extra_3-1.dsc 461s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 461s + local suite=sid 461s + local p=pari-extra 461s + local v=3-1 461s + local dscf=main/pari-extra_3-1.dsc 461s + local sha 461s ++ sha256sum 461s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 461s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 461s + t-aq-archive-updated sid pari-extra 461s + local suite=sid 461s + local p=pari-extra 461s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 461s + perl -wne ' 461s use JSON; 461s use strict; 461s our @v; 461s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 461s push @v, { 461s "version" => "$1", 461s "sha256sum" => "$2", 461s "component" => "$3", 461s "filename" => "$4", 461s }; 461s END { 461s my $json = JSON->new->canonical(); 461s print $json->encode(\@v) or die $!; 461s } 461s ' 461s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 461s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 461s + set -e 461s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 461s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 461s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 461s dpkg-source: info: extracting pari-extra in pari-extra-3 461s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 461s dpkg-source: info: applying pari-extra_3-1.diff.gz 461s + t-git-none 461s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 461s + set -e 461s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 461s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 461s + t-dgit clone pari-extra 461s + local dgit=dgit 461s + pwd 461s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 461s + : ' 461s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 461s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 461s | git config -z --get-regexp --global '.*' 461s | git config -z --get-regexp --system '.*' 461s clone main body 461s CD pari-extra 461s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 461s canonical suite name for unstable is sid 461s query: fetching http://127.0.0.1:45707/pari-extra.git/HEAD... 461s dgit-repos check_for_git => . 461s + git init -q 461s | git config -z --get-regexp --local '.*' 461s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 461s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 461s + git config user.name 'dgit test git user' 461s is_gitattrs_setup: found nothing 461s starting new git history 461s + git config remote.dgit.skipdefaultupdate true 461s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 461s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 461s get_archive_dsc: Version 3-1 461s last upload to archive: NO git hash 461s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 461s => `' 461s previous reference hash= 461s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 461s => `' 461s fetch_from_archive: lastfetch= 461s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 461s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 461s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 461s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 461s % Total % Received % Xferd Average Speed Time Time Time Current 461s Dload Upload Total Spent Left Speed 461s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1554k 0 --:--:-- --:--:-- --:--:-- 1554k 461s considering saving pari-extra_3.orig.tar.gz: linked. 461s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 461s ./pari-extra_3-1.diff.gz does not exist, need to fetch 461s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 461s % Total % Received % Xferd Average Speed Time Time Time Current 461s Dload Upload Total Spent Left Speed 461s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 40.8M 0 --:--:-- --:--:-- --:--:-- 40.8M 461s considering saving pari-extra_3-1.diff.gz: linked. 461s import considering pari-extra_3.orig.tar.gz Y .gz orig 461s + chmod -R '+rwX' _unpack-tar 461s CD _unpack-tar 461s | find -name .git -prune -print0 461s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 461s + git add -Af . 461s | git write-tree 461s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 461s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 461s => `' 461s multiple subtrees 461s CD .. 461s import considering pari-extra_3-1.diff.gz not tar 461s + dpkg-source --no-check -x -- pari-extra.dsc 461s dpkg-source: info: extracting pari-extra in pari-extra-3 461s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 461s dpkg-source: info: applying pari-extra_3-1.diff.gz 461s CD pari-extra-3 461s | find -name .git -prune -print0 461s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 461s + git add -Af . 461s | git write-tree 461s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 461s import clog search... 461s | dpkg-parsechangelog --format rfc822 --all 461s import clog 3-1 package changelog, entry no.1... 461s import clog 3-1 vs 3... 461s import clog 3-1 becomes r1 461s import clog 2.1-1 package changelog, entry no.2... 461s import clog 2.1-1 vs 3... 461s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 461s => `1312546022 +0000' 461s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 461s => `1312546022 +0000' 461s import tartrees authline Bill Allombert 1312546022 +0000 461s import tartrees r1authline Bill Allombert 1312546022 +0000 461s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 461s | git hash-object -w -t commit --stdin 461s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 461s import main commit 461s | git hash-object -w -t commit ../commit.tmp 461s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 461s synthesised git commit from .dsc 3-1 461s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 461s fetch mergeinfos: 461s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 461s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 461s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s => `' 461s + git reset --hard refs/remotes/dgit/dgit/sid 461s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 461s + bash -ec ' set -o pipefail 461s git ls-tree -r --name-only -z HEAD | '\\' 461s xargs -0r touch -h -r . -- 461s ' 461s dgit ok: ready for work in pari-extra 461s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 461s del_lrfetchrefs... 461s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 461s ' 461s + cd pari-extra 461s + t-cloned-fetched-good 461s + t-diff-nogit ../extract/pari-extra-3 . 461s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 461s + t-clean-on-branch dgit/sid 461s + t-output '## dgit/sid' git status -b --porcelain 461s + printf '%s\n' '## dgit/sid' 461s + shift 461s + git status -b --porcelain 461s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 461s + t-refs-same-start 461s + unset t_ref_val 461s + t_ref_names=() 461s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 461s + local g 461s + for g in $* 461s + t-ref-same refs/heads/dgit/sid 461s + local name=refs/heads/dgit/sid 461s + local val 461s ++ t-git-get-ref refs/heads/dgit/sid 461s ++ local ref=refs/heads/dgit/sid 461s ++ case "$ref" in 461s ++ git show-ref -d refs/heads/dgit/sid 461s ++ perl -ne ' 461s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 461s END { print "$x\n" if length $x; } 461s ' 461s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + local name=refs/heads/dgit/sid 461s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + case "${t_ref_val-unset}" in 461s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + t_ref_names+=("$name") 461s + for g in $* 461s + t-ref-same refs/remotes/dgit/dgit/sid 461s + local name=refs/remotes/dgit/dgit/sid 461s + local val 461s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 461s ++ local ref=refs/remotes/dgit/dgit/sid 461s ++ case "$ref" in 461s ++ git show-ref -d refs/remotes/dgit/dgit/sid 461s ++ perl -ne ' 461s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 461s END { print "$x\n" if length $x; } 461s ' 461s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + local name=refs/remotes/dgit/dgit/sid 461s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + case "${t_ref_val-unset}" in 461s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 461s + t_ref_names+=("$name") 461s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 461s + local val 461s + for g in $* 461s ++ t-git-get-ref refs/dgit/unstable 461s ++ local ref=refs/dgit/unstable 461s ++ case "$ref" in 461s ++ git show-ref -d refs/dgit/unstable 461s ++ perl -ne ' 461s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 461s END { print "$x\n" if length $x; } 461s ' 461s ++ test 1 = 1 461s + val= 461s + '[' x '!=' x ']' 461s + for g in $* 461s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 461s ++ local ref=refs/remotes/dgit/dgit/unstable 461s ++ case "$ref" in 461s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 461s ++ perl -ne ' 461s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 461s END { print "$x\n" if length $x; } 461s ' 461s ++ test 1 = 1 461s + val= 461s + '[' x '!=' x ']' 461s + v=3-2~dummy1 461s + t-apply-diff 3-1 3-2~dummy1 461s + local v1=3-1 461s + local v2=3-2~dummy1 461s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs 461s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 461s + patch -p1 -u 461s + test 1 = 1 461s patching file debian/changelog 461s patching file debian/control 461s + debcommit -a 461s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 461s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 461s 2 files changed, 8 insertions(+), 1 deletion(-) 461s + t-refs-same-start 461s + unset t_ref_val 461s + t_ref_names=() 461s + t-ref-head 461s + local val 461s ++ git rev-parse HEAD 461s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 461s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 461s + local name=HEAD 461s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 461s + case "${t_ref_val-unset}" in 461s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 461s + t_ref_names+=("$name") 461s + t-dgit --dpkg-buildpackage:-d build 461s + local dgit=dgit 461s + pwd 461s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 461s + : ' 461s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 461s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 461s | git rev-parse --show-toplevel 461s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 461s | git config -z --get-regexp --local '.*' 461s | git config -z --get-regexp --local '.*' 461s | git config -z --get-regexp --global '.*' 461s | git config -z --get-regexp --system '.*' 462s format , quilt mode linear 462s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 462s warning: could not open directory 'debian/source/': No such file or directory 462s => `' 462s + git diff --quiet HEAD 462s massage split -F. 462s massage done 3 -b. 462s format , quilt mode linear 462s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 462s warning: could not open directory 'debian/source/': No such file or directory 462s => `' 462s + git diff --quiet HEAD 462s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 462s dpkg-buildpackage: info: source package pari-extra 462s dpkg-buildpackage: info: source version 3-2~dummy1 462s dpkg-buildpackage: info: source distribution unstable 462s dpkg-buildpackage: info: source changed by Senatus Romanus 462s fakeroot debian/rules clean 462s dh_testdir 462s dh_testroot 462s rm -f build-stamp 462s dh_clean 462s | git clean -dn 462s => `' 462s | git rev-parse 'HEAD~0' 462s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 462s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 462s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 462s CD work 462s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 462s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 462s CD .. 462s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 462s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 462s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 462s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 462s dpkg-source: info: using source format '1.0' 462s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 462s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 462s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 462s CD work 462s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 462s changelog will contain changes since 3-1 462s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 462s dpkg-genchanges: info: not including original source code in upload 462s CD .. 462s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.. 462s renaming (Files) pari-extra_3.orig.tar.gz 462s renaming (Files) pari-extra_3-2~dummy1.diff.gz 462s renaming (dsc) pari-extra_3-2~dummy1.dsc 462s renaming (changes) pari-extra_3-2~dummy1_source.changes 462s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 462s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 462s dpkg-buildpackage: info: source package pari-extra 462s dpkg-buildpackage: info: source version 3-2~dummy1 462s dpkg-buildpackage: info: source distribution unstable 462s dpkg-buildpackage: info: source changed by Senatus Romanus 462s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 462s dpkg-buildpackage: info: host architecture amd64 462s debian/rules build 462s dh_testdir 462s touch build-stamp 462s fakeroot debian/rules binary 462s dh_testdir 462s dh_testroot 462s dh_prep 462s dh_installdirs 462s dh_testdir 462s dh_testroot 462s dh_installdocs 462s dh_installexamples 463s dh_installchangelogs 463s dh_link 463s dh_strip 463s dh_compress 463s dh_fixperms 463s dh_installdeb 463s dh_gencontrol 463s dh_md5sums 463s dh_builddeb 463s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 463s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_amd64.buildinfo 463s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_amd64.changes 463s dpkg-genchanges: info: binary-only upload (no source code included) 463s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 463s dpkg-buildpackage: info: binary-only upload (no source included) 463s CD .. 463s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_amd64.changes' 464s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 464s 464s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 464s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 464s ' 464s + t-dgit push 464s + local dgit=dgit 464s + pwd 464s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 464s + : ' 464s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 464s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 464s | git rev-parse --show-toplevel 464s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 464s | git config -z --get-regexp --local '.*' 464s | git config -z --get-regexp --local '.*' 464s | git config -z --get-regexp --global '.*' 464s | git config -z --get-regexp --system '.*' 464s format , quilt mode linear 464s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 464s warning: could not open directory 'debian/source/': No such file or directory 464s => `' 464s + git diff --quiet HEAD 464s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 464s canonical suite name for unstable is sid 464s actually entering push 464s query: fetching http://127.0.0.1:45707/pari-extra.git/HEAD... 464s dgit-repos check_for_git => . 464s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 464s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 464s get_archive_dsc: Version 3-1 464s last upload to archive: NO git hash 464s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 464s => `' 464s previous reference hash= 464s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 464s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 464s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 464s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 464s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 464s using existing pari-extra_3.orig.tar.gz 464s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 464s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 464s using existing pari-extra_3-1.diff.gz 464s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 464s import considering pari-extra_3.orig.tar.gz Y .gz orig 464s + chmod -R '+rwX' _unpack-tar 464s CD _unpack-tar 464s | find -name .git -prune -print0 464s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 464s + git add -Af . 464s | git write-tree 464s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 464s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 464s => `' 464s multiple subtrees 464s CD .. 464s import considering pari-extra_3-1.diff.gz not tar 464s + dpkg-source --no-check -x -- pari-extra.dsc 464s dpkg-source: info: extracting pari-extra in pari-extra-3 464s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 464s dpkg-source: info: applying pari-extra_3-1.diff.gz 464s CD pari-extra-3 464s | find -name .git -prune -print0 464s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 464s + git add -Af . 464s | git write-tree 464s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 464s import clog search... 464s | dpkg-parsechangelog --format rfc822 --all 464s import clog 3-1 package changelog, entry no.1... 464s import clog 3-1 vs 3... 464s import clog 3-1 becomes r1 464s import clog 2.1-1 package changelog, entry no.2... 464s import clog 2.1-1 vs 3... 464s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 464s => `1312546022 +0000' 464s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 464s => `1312546022 +0000' 464s import tartrees authline Bill Allombert 1312546022 +0000 464s import tartrees r1authline Bill Allombert 1312546022 +0000 464s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 464s | git hash-object -w -t commit --stdin 464s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 464s import main commit 464s | git hash-object -w -t commit ../commit.tmp 464s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 464s synthesised git commit from .dsc 3-1 464s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 464s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 465s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s fetch mergeinfos: 465s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 465s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 465s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 465s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 465s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 465s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 465s + git check-ref-format archive/test-dummy/3-2_dummy1 465s | git symbolic-ref -q HEAD 465s => `refs/heads/dgit/sid' 465s | git rev-parse 'HEAD~0' 465s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 465s ffq_prev_branchinfo branch current refs/heads/dgit/sid 465s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 465s => `' 465s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 465s => `' 465s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 465s warning: could not open directory 'debian/source/': No such file or directory 465s => `' 465s + git diff --quiet HEAD 465s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 465s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 465s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 465s => `' 465s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 465s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 465s + dpkg-source -x -- '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 465s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 465s dpkg-source: info: extracting pari-extra in pari-extra-3 465s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 465s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 465s CD pari-extra-3 465s | find -name .git -prune -print0 465s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 465s + git add -Af . 465s | git write-tree 465s => `59d0825204e6551ec6bcd704839aae32586014f4' 465s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 465s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 465s files_compare_inputs pari-extra_3-2~dummy1.dsc 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 465s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_amd64.buildinfo 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_amd64.buildinfo 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 465s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_amd64.buildinfo 465s checking origs needed (3)... 465s checking origs needed placement 'math optional'... 465s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 465s origs pari-extra_3.orig.tar.gz is_orig 465s -| sh -ec 'cd "$1"; shift 465s 465s find -name "$1" -print0 | 465s xargs -0r sha256sum 465s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 465s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 465s origs pari-extra_3.orig.tar.gz $#$have=0 465s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 465s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 465s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 465s push_tagwants: $VAR1 = [ 465s '3-2~dummy1', 465s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 465s undef, 465s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag' 465s ]; 465s $VAR2 = [ 465s { 465s 'Tfn' => sub { "DUMMY" }, 465s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 465s 'View' => 'dgit', 465s 'TagFn' => sub { "DUMMY" }, 465s 'Tag' => 'archive/test-dummy/3-2_dummy1', 465s 'TfSuffix' => '' 465s }, 465s { 465s 'TfSuffix' => '-dgit', 465s 'TagFn' => sub { "DUMMY" }, 465s 'Tag' => 'test-dummy/3-2_dummy1', 465s 'Tfn' => sub { "DUMMY" }, 465s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 465s 'View' => 'dgit' 465s } 465s ]; 465s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 465s => `1384698857 +0000' 465s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 465s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 465s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 465s => `a662243df5567ad0365d31acf4674949e7973a3b' 465s + git verify-tag a662243df5567ad0365d31acf4674949e7973a3b 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s gpg: Signature made Mon Mar 31 12:25:59 2025 UTC 465s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 465s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 465s gpg: WARNING: This key is not certified with a trusted signature! 465s gpg: There is no indication that the signature belongs to the owner. 465s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 465s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 a662243df5567ad0365d31acf4674949e7973a3b 465s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 465s => `573f9552cf9c4f8be0569058dbff14a2056290f2' 465s + git verify-tag 573f9552cf9c4f8be0569058dbff14a2056290f2 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s gpg: Signature made Mon Mar 31 12:25:59 2025 UTC 465s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 465s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 465s gpg: WARNING: This key is not certified with a trusted signature! 465s gpg: There is no indication that the signature belongs to the owner. 465s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 465s + git update-ref refs/tags/test-dummy/3-2_dummy1 573f9552cf9c4f8be0569058dbff14a2056290f2 465s query: fetching http://127.0.0.1:45707/pari-extra.git/HEAD... 465s dgit-repos check_for_git => . 465s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create pari-extra ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template pari-extra.git' 465s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 refs/tags/test-dummy/3-2_dummy1 465s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 465s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 465s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 465s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 465s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 465s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 465s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s 465s signfile buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s 465s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 465s fixup_changes buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo ../pari-extra_3-2~dummy1_multi.changes 465s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 465s 465s Successfully signed dsc, buildinfo, changes files 465s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 466s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 466s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 466s D: Setting host argument. 466s Checking signature on .changes 466s Checking signature on .dsc 466s Uploading to test-dummy (via local to localhost): 466s Successfully uploaded packages. 466s dgit ok: pushed and uploaded 3-2~dummy1 466s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 466s del_lrfetchrefs... 466s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 466s ' 466s + t-pushed-good dgit/sid 466s + local branch=dgit/sid 466s + local suite=sid 466s + t-refs-same refs/heads/dgit/sid 466s + local g 466s + for g in $* 466s + t-ref-same refs/heads/dgit/sid 466s + local name=refs/heads/dgit/sid 466s + local val 466s ++ t-git-get-ref refs/heads/dgit/sid 466s ++ local ref=refs/heads/dgit/sid 466s ++ case "$ref" in 466s ++ git show-ref -d refs/heads/dgit/sid 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=refs/heads/dgit/sid 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s + t-pushed-good-core 466s + t-ref-dsc-dgit 466s + t-incoming-dsc 466s + local dsc=pari-extra_3-2~dummy1.dsc 466s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 466s + local val 466s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 466s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 466s ++ local field=Dgit 466s ++ perl -e ' 466s use Dpkg::Control::Hash; 466s my $h = new Dpkg::Control::Hash allow_pgp=>1; 466s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 466s my $val = $h->{"Dgit"},"\n"; 466s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 466s print $val,"\n"; 466s ' 466s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git' 466s ++ perl -e ' 466s $_=shift @ARGV; 466s die "Dgit $_ ?" unless m/^\w+\b/; 466s print $&,"\n" or die $!; 466s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s ++ t-v-tag 466s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 466s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 466s + local g 466s + for g in $* 466s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 466s + local name=refs/tags/archive/test-dummy/3-2_dummy1 466s + local val 466s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 466s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 466s ++ case "$ref" in 466s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=refs/tags/archive/test-dummy/3-2_dummy1 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s + for g in $* 466s + t-ref-same refs/remotes/dgit/dgit/sid 466s + local name=refs/remotes/dgit/dgit/sid 466s + local val 466s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 466s ++ local ref=refs/remotes/dgit/dgit/sid 466s ++ case "$ref" in 466s ++ git show-ref -d refs/remotes/dgit/dgit/sid 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=refs/remotes/dgit/dgit/sid 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 466s + local val 466s + for g in $* 466s ++ t-git-get-ref refs/heads/dgit/unstable 466s ++ local ref=refs/heads/dgit/unstable 466s ++ case "$ref" in 466s ++ git show-ref -d refs/heads/dgit/unstable 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s ++ test 1 = 1 466s + val= 466s + '[' x '!=' x ']' 466s + for g in $* 466s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 466s ++ local ref=refs/remotes/dgit/dgit/unstable 466s ++ case "$ref" in 466s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s ++ test 1 = 1 466s + val= 466s + '[' x '!=' x ']' 466s + set -e 466s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 466s ++ t-v-tag 466s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 466s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 466s + local g 466s + for g in $* 466s + t-ref-same refs/dgit/sid 466s + local name=refs/dgit/sid 466s + local val 466s ++ t-git-get-ref refs/dgit/sid 466s ++ local ref=refs/dgit/sid 466s ++ case "$ref" in 466s ++ git show-ref -d refs/dgit/sid 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=refs/dgit/sid 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s + for g in $* 466s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 466s + local name=refs/tags/archive/test-dummy/3-2_dummy1 466s + local val 466s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 466s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 466s ++ case "$ref" in 466s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + local name=refs/tags/archive/test-dummy/3-2_dummy1 466s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + case "${t_ref_val-unset}" in 466s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 466s + t_ref_names+=("$name") 466s + : NOT-DRS-NO-CHECK-PUSHED-MASTER 466s + t-refs-notexist refs/dgit/unstable 466s + local val 466s + for g in $* 466s ++ t-git-get-ref refs/dgit/unstable 466s ++ local ref=refs/dgit/unstable 466s ++ case "$ref" in 466s ++ git show-ref -d refs/dgit/unstable 466s ++ perl -ne ' 466s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 466s END { print "$x\n" if length $x; } 466s ' 466s ++ test 1 = 1 466s + val= 466s + '[' x '!=' x ']' 466s ++ t-v-tag 466s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 466s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 466s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 466s gpg: Signature made Mon Mar 31 12:25:59 2025 UTC 466s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 466s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 466s gpg: WARNING: This key is not certified with a trusted signature! 466s gpg: There is no indication that the signature belongs to the owner. 466s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 466s + t-ok 466s + : ======================================== 466s + t-check-only-bpd 466s + '[' .. = .. ']' 466s + return 466s + t-fscks 466s + shopt -s nullglob 466s + for d in $tmp/*/.git $tmp/git/*.git 466s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 466s + t-git-fsck 466s ++ git rev-parse --git-dir 466s + local fsckerrs=.git/dgit-test-fsck.errs 466s + set +e 466s + LC_MESSAGES=C 466s + git fsck --no-dangling --strict 466s + tee .git/dgit-test-fsck.errs 466s + ps='0 0' 466s + set -e 466s + local pats 466s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 466s + test '0 0' = '0 0' 466s + pats+=(-e 'notice: HEAD points to an unborn branch') 466s + pats+=(-e 'notice: No default references') 466s + set +e 466s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 466s + rc=1 466s + set -e 466s + case $rc in 466s + for d in $tmp/*/.git $tmp/git/*.git 466s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 466s + t-git-fsck 466s ++ git rev-parse --git-dir 466s + local fsckerrs=./dgit-test-fsck.errs 466s + set +e 466s + LC_MESSAGES=C 466s + git fsck --no-dangling --strict 466s + tee ./dgit-test-fsck.errs 466s notice: HEAD points to an unborn branch (master) 466s + ps='0 0' 466s + set -e 466s + local pats 466s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 466s + test '0 0' = '0 0' 466s + pats+=(-e 'notice: HEAD points to an unborn branch') 466s + pats+=(-e 'notice: No default references') 466s + set +e 466s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 466s + rc=1 466s + set -e 466s + case $rc in 466s + t-save-artifacts 466s + artifacts=/tmp/autopkgtest.ztMUxl/clone-nogit-artifacts 466s + '[' x/tmp/autopkgtest.ztMUxl/clone-nogit-artifacts = x ']' 466s + '[' xtmp = x ']' 466s + GZIP=-1v 466s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 466s gzip: warning: GZIP environment variable is deprecated; use an alias or script 466s 75.2% 466s + echo ok. 466s ok. 466s + rc=0 466s + set +x 466s + set +e 466s + pwd 466s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 466s + '[' x '!=' x ']' 466s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 466s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 466s + set -e 466s + test 0 = 0 466s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 8829 466s PID TTY STAT TIME COMMAND 466s 8829 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 466s autopkgtest [12:26:00]: test clone-nogit: -----------------------] 466s autopkgtest [12:26:00]: test clone-nogit: - - - - - - - - - - results - - - - - - - - - - 466s clone-nogit PASS 466s autopkgtest [12:26:00]: test clone-skew: preparing testbed 466s Reading package lists... 467s Building dependency tree... 467s Reading state information... 467s Starting pkgProblemResolver with broken count: 0 467s Starting 2 pkgProblemResolver with broken count: 0 467s Done 467s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 468s autopkgtest [12:26:02]: test clone-skew: [----------------------- 468s ++ set -o pipefail 468s ++ . tests/lib-core 468s ++ . tests/lib-restricts 468s ++ trap ' 468s rc=$? 468s set +x 468s test $rc = 0 || echo " 468s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 468s 468s Most relevant logs are just before assignment rc=$rc 468s Will now do cleanup etc. 468s " 468s set -x 468s set +e 468s pwd 468s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 468s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 468s set -e 468s test $rc = 0 || t-report-failure 468s ' EXIT 468s ++ t-filter-out-git-hyphen-dir 468s ++ local pathent 468s +++ type -p git-rev-parse 468s +++ : 468s ++ pathent= 468s ++ case "$pathent" in 468s ++ return 468s ++ t-set-intree 468s ++ '[' x = x ']' 468s ++ return 468s ++ : -D 468s ++ export DGIT_TEST_DEBUG 468s ++ : x 468s ++ export DGIT_TEST_DEBPUSH_DEBUG 468s ++ : 468s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 468s ++ GIT_COMMITTER_DATE='1530000000 +0100' 468s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 468s ++ GIT_AUTHOR_DATE='1530000000 +0100' 468s ++ export LC_CTYPE=C.UTF-8 468s ++ LC_CTYPE=C.UTF-8 468s ++ unset CDPATH 468s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 468s ++ FILTER_BRANCH_SQUELCH_WARNING=1 468s +++ pwd 468s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 468s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ testname=clone-skew 468s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ bpd=.. 468s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 468s ++ '[' x '!=' x ']' 468s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s +++ pwd 468s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ t-set-using-tmp 468s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 468s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 468s ++ export 'DEBFULLNAME=dgit test git user' 468s ++ DEBFULLNAME='dgit test git user' 468s ++ git config --global user.email dgit-test@debian.example.net 468s ++ git config --global user.name 'dgit test git user' 468s ++ git config --global protocol.ext.allow always 468s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 468s ++ env -0 468s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 468s ++ export DEBCHANGE_VENDOR=dpkg 468s ++ DEBCHANGE_VENDOR=dpkg 468s ++ unset VISUAL 468s ++ unset GIT_EDITOR 468s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 468s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 468s ++ cat 468s ++ schroot=build 468s ++ : aq 468s ++ : archive/test-dummy 468s ++ : sid:unstable 468s ++ t-git-config dgit.default.old-dsc-distro test-dummy 468s ++ git config --global dgit.default.old-dsc-distro test-dummy 468s ++ for import in ${autoimport-gnupg} 468s ++ case "$0" in 468s ++ t-setup-import gnupg 468s ++ local setupname=gnupg 468s ++ local setupsrc 468s ++ local lock 468s ++ '[' x = x ']' 468s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 468s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 468s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 468s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 468s cd "$1"; shift 468s setupname="$1"; shift 468s simport="$1"; shift 468s if [ -e "$simport" ]; then exit 0; fi 468s env - "$@" \ 468s "tests/setup/$setupname" 468s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 468s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 468s + shift 468s + setupname=gnupg 468s + shift 468s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 468s + shift 468s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 468s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/clone-skew-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/clone-skew-stderr --stdout=/tmp/autopkgtest.ztMUxl/clone-skew-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-skew -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/clone-skew' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-skew-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/clone-skew-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 468s ++ set -o pipefail 468s ++ . tests/lib-core 468s ++ . tests/lib-restricts 468s ++ trap ' 468s rc=$? 468s set +x 468s test $rc = 0 || echo " 468s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 468s 468s Most relevant logs are just before assignment rc=$rc 468s Will now do cleanup etc. 468s " 468s set -x 468s set +e 468s pwd 468s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 468s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 468s set -e 468s test $rc = 0 || t-report-failure 468s ' EXIT 468s ++ t-filter-out-git-hyphen-dir 468s ++ local pathent 468s +++ type -p git-rev-parse 468s +++ : 468s ++ pathent= 468s ++ case "$pathent" in 468s ++ return 468s ++ t-set-intree 468s ++ '[' x = x ']' 468s ++ return 468s ++ : -D 468s ++ export DGIT_TEST_DEBUG 468s ++ : x 468s ++ export DGIT_TEST_DEBPUSH_DEBUG 468s ++ : 468s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 468s ++ GIT_COMMITTER_DATE='1530000000 +0100' 468s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 468s ++ GIT_AUTHOR_DATE='1530000000 +0100' 468s ++ export LC_CTYPE=C.UTF-8 468s ++ LC_CTYPE=C.UTF-8 468s ++ unset CDPATH 468s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 468s ++ FILTER_BRANCH_SQUELCH_WARNING=1 468s +++ pwd 468s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 468s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ testname=gnupg 468s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 468s ++ bpd=.. 468s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 468s ++ '[' x '!=' x ']' 468s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s +++ pwd 468s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ t-set-using-tmp 468s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 468s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 468s ++ export 'DEBFULLNAME=dgit test git user' 468s ++ DEBFULLNAME='dgit test git user' 468s ++ git config --global user.email dgit-test@debian.example.net 468s ++ git config --global user.name 'dgit test git user' 468s ++ git config --global protocol.ext.allow always 468s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 468s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 468s ++ export DEBCHANGE_VENDOR=dpkg 468s ++ DEBCHANGE_VENDOR=dpkg 468s ++ unset VISUAL 468s ++ unset GIT_EDITOR 468s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 468s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 468s ++ cat 468s ++ schroot=build 468s ++ : aq 468s ++ : archive/test-dummy 468s ++ : sid:unstable 468s ++ t-git-config dgit.default.old-dsc-distro test-dummy 468s ++ git config --global dgit.default.old-dsc-distro test-dummy 468s ++ for import in ${autoimport-gnupg} 468s ++ case "$0" in 468s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 468s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 468s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 468s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 468s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 468s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 468s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 468s + setup=' 468s export GNUPGHOME=$tmp/gnupg 468s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 468s 468s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 468s ssb rsa2048 2013-11-17 [E] 468s 468s sec rsa2048 2014-01-26 [SC] 468s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 468s uid [ultimate] Populus Romanus (test key) 468s ssb rsa2048 2014-01-26 [E] 468s 468s sec rsa2048 2014-01-26 [SC] 468s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 468s uid [ unknown] Hannibal (test key) 468s ssb rsa2048 2014-01-26 [E] 468s 468s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 468s export GNUPGHOME=$tmp/gnupg 468s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 468s 468s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 468s "sha256sum" => "$2", 468s "component" => "$3", 468s "filename" => "$4", 468s }; 468s END { 468s my $json = JSON->new->canonical(); 468s print $json->encode(\@v) or die $!; 468s } 468s ' 468s + t-aq-archive-updated new example 468s + local suite=new 468s + local p=example 468s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 468s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 468s + perl -wne ' 468s use JSON; 468s use strict; 468s our @v; 468s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 468s push @v, { 468s "version" => "$1", 468s "sha256sum" => "$2", 468s "component" => "$3", 468s "filename" => "$4", 468s }; 468s END { 468s my $json = JSON->new->canonical(); 468s print $json->encode(\@v) or die $!; 468s } 468s ' 468s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 468s + cat 468s + jsondelim=' },' 468s + cat 468s + v=1.0-1 468s + local dscf=example_1.0-1.dsc 468s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_*' 468s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+absurd.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.100.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 468s + t-archive-query 468s + local suite=sid 468s + local dscf=main/example_1.0-1.dsc 468s + t-archive-query-aq sid example 1.0-1 main/example_1.0-1.dsc 468s + local suite=sid 468s + local p=example 468s + local v=1.0-1 468s + local dscf=main/example_1.0-1.dsc 468s + local sha 468s ++ sha256sum 468s + sha='f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 -' 468s + echo '1.0-1 f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 main/example_1.0-1.dsc' 468s + t-aq-archive-updated sid example 468s + local suite=sid 468s + local p=example 468s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 468s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 468s + perl -wne ' 468s use JSON; 468s use strict; 468s our @v; 468s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 468s push @v, { 468s "version" => "$1", 468s "sha256sum" => "$2", 468s "component" => "$3", 468s "filename" => "$4", 468s }; 468s END { 468s my $json = JSON->new->canonical(); 468s print $json->encode(\@v) or die $!; 468s } 468s ' 468s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 468s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 468s + set -e 468s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 468s + dpkg-source -x ../mirror/pool/main/example_1.0-1.dsc 468s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/example_1.0-1.dsc) 468s dpkg-source: info: extracting example in example-1.0 468s dpkg-source: info: unpacking example_1.0.orig.tar.gz 468s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 468s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 468s dpkg-source: info: using patch list from debian/patches/series 468s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 468s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 468s dpkg-source: info: applying auto-gitignore 468s + t-git-none 468s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 468s + set -e 468s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 468s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 468s + perl -i -ne ' 468s print or die $!; 468s s/1.0-1/1.0-1+0.1/g; 468s s/ \w/ sprintf " %x", $& ^ 1 /e; 468s print or die $!; 468s ' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/package.sid.example 468s + t-aq-archive-updated sid example 468s + local suite=sid 468s + local p=example 468s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 468s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 468s + perl -wne ' 468s use JSON; 468s use strict; 468s our @v; 468s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 468s push @v, { 468s "version" => "$1", 468s "sha256sum" => "$2", 468s "component" => "$3", 468s "filename" => "$4", 468s }; 468s END { 468s my $json = JSON->new->canonical(); 468s print $json->encode(\@v) or die $!; 468s } 468s ' 468s + LC_MESSAGES=C 468s + t-dgit clone example 468s + tee got.message 468s + local dgit=dgit 468s + pwd 468s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 468s + : ' 468s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 468s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example 468s | git config -z --get-regexp --global '.*' 468s | git config -z --get-regexp --system '.*' 468s clone main body 468s CD example 468s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 468s canonical suite name for unstable is sid 468s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 468s => `0' 468s + git init -q 468s | git config -z --get-regexp --local '.*' 468s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 468s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 468s + git config user.name 'dgit test git user' 468s is_gitattrs_setup: found nothing 468s starting new git history 468s + git config remote.dgit.skipdefaultupdate true 468s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 468s query: fetching http://127.0.0.1:40427//pool/main/example_1.0-1+0.1.dsc... 468s query: fetching http://127.0.0.1:40427//pool/main/example_1.0-1.dsc... 468s get_archive_dsc: Version 1.0-1 468s last upload to archive: NO git hash 468s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 468s => `' 468s previous reference hash= 468s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 468s => `' 468s fetch_from_archive: lastfetch= 468s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 468s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 468s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 468s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- http://127.0.0.1:40427//pool/main/example_1.0.orig-docs.tar.gz 468s % Total % Received % Xferd Average Speed Time Time Time Current 468s Dload Upload Total Spent Left Speed 468s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 30229 0 --:--:-- --:--:-- --:--:-- 33714 468s considering saving example_1.0.orig-docs.tar.gz: linked. 468s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 468s ./example_1.0.orig.tar.gz does not exist, need to fetch 468s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- http://127.0.0.1:40427//pool/main/example_1.0.orig.tar.gz 468s % Total % Received % Xferd Average Speed Time Time Time Current 468s Dload Upload Total Spent Left Speed 468s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 44351 0 --:--:-- --:--:-- --:--:-- 41444 468s considering saving example_1.0.orig.tar.gz: linked. 468s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 468s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 468s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- http://127.0.0.1:40427//pool/main/example_1.0-1.debian.tar.xz 468s % Total % Received % Xferd Average Speed Time Time Time Current 468s Dload Upload Total Spent Left Speed 468s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 183k 0 --:--:-- --:--:-- --:--:-- 211k 468s considering saving example_1.0-1.debian.tar.xz: linked. 468s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 468s + chmod -R '+rwX' _unpack-tar 468s CD _unpack-tar 468s | find -name .git -prune -print0 468s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 468s + git add -Af . 468s | git write-tree 468s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 468s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 468s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 468s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 468s CD .. 468s import considering example_1.0.orig.tar.gz Y .gz orig 468s + chmod -R '+rwX' _unpack-tar 468s CD _unpack-tar 468s | find -name .git -prune -print0 468s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 469s + git add -Af . 469s | git write-tree 469s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 469s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 469s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 469s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 469s CD .. 469s import considering example_1.0-1.debian.tar.xz Y .xz (none) 469s + chmod -R '+rwX' _unpack-tar 469s CD _unpack-tar 469s | find -name .git -prune -print0 469s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 469s + git add -Af . 469s | git write-tree 469s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 469s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 469s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 469s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 469s CD .. 469s + dpkg-source --no-check --skip-patches -x -- example.dsc 469s dpkg-source: info: extracting example in example-1.0 469s dpkg-source: info: unpacking example_1.0.orig.tar.gz 469s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 469s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 469s CD example-1.0 469s | find -name .git -prune -print0 469s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 469s + git add -Af . 469s | git write-tree 469s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 469s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 469s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 469s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 469s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 469s + git add -Af . 469s | git write-tree 469s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 469s import clog search... 469s | dpkg-parsechangelog --format rfc822 --all 469s import clog 1.0-1 package changelog, entry no.1... 469s import clog 1.0-1 vs 1.0... 469s import clog 1.0-1 becomes r1 469s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 469s => `1431548802 +0000' 469s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 469s => `1431548802 +0000' 469s import tartrees authline Ian Jackson 1431548802 +0000 469s import tartrees r1authline Ian Jackson 1431548802 +0000 469s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 469s | git hash-object -w -t commit --stdin 469s => 94c010931d011cbd6c1861bb9d453aa12d826298 469s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 469s | git hash-object -w -t commit --stdin 469s => a5bb1f49c872a76a5d703570fd5352e424719bda 469s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 469s | git hash-object -w -t commit --stdin 469s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 469s import main commit 469s | git hash-object -w -t commit ../commit.tmp 469s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 469s import apply patches... 469s | git hash-object -w -t commit --stdin 469s => 8a6a176760396ad6e2e096974469aa6cf7671956 469s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 469s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 469s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 469s => `1431548802 +0000' 469s + git checkout -q unpa 469s + git update-ref -d refs/heads/patch-queue/unpa 469s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 469s | git rev-parse 'HEAD~0' 469s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 469s | git rev-parse HEAD: 469s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 469s synthesised git commit from .dsc 1.0-1 469s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 469s fetch mergeinfos: 469s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 469s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 469s SKEW CHECK WANT 1.0-1+0.1 469s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6:debian/changelog 469s SKEW CHECK GOT 1.0-1 469s 469s Warning: archive skew detected. Using the available version: 469s Archive allegedly contains 1.0-1+0.1 469s We were able to obtain only 1.0-1 469s 469s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s => `' 469s + git reset --hard refs/remotes/dgit/dgit/sid 469s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 469s + bash -ec ' set -o pipefail 469s git ls-tree -r --name-only -z HEAD | '\\' 469s xargs -0r touch -h -r . -- 469s ' 469s dgit ok: ready for work in example 469s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 469s del_lrfetchrefs... 469s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 469s ' 469s + grep 'Warning: archive skew detected.' got.message 469s Warning: archive skew detected. Using the available version: 469s + egrep 'We were able to obtain only *1.0-1$' got.message 469s We were able to obtain only 1.0-1 469s + cd example 469s + t-cloned-fetched-good 469s + t-diff-nogit ../extract/example-1.0 . 469s + diff --exclude=.git --exclude=.pc -ruN ../extract/example-1.0 . 469s + t-clean-on-branch dgit/sid 469s + t-output '## dgit/sid' git status -b --porcelain 469s + printf '%s\n' '## dgit/sid' 469s + shift 469s + git status -b --porcelain 469s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 469s + t-refs-same-start 469s + unset t_ref_val 469s + t_ref_names=() 469s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 469s + local g 469s + for g in $* 469s + t-ref-same refs/heads/dgit/sid 469s + local name=refs/heads/dgit/sid 469s + local val 469s ++ t-git-get-ref refs/heads/dgit/sid 469s ++ local ref=refs/heads/dgit/sid 469s ++ case "$ref" in 469s ++ git show-ref -d refs/heads/dgit/sid 469s ++ perl -ne ' 469s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 469s END { print "$x\n" if length $x; } 469s ' 469s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + t-ref-same-val refs/heads/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + local name=refs/heads/dgit/sid 469s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + case "${t_ref_val-unset}" in 469s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + t_ref_names+=("$name") 469s + for g in $* 469s + t-ref-same refs/remotes/dgit/dgit/sid 469s + local name=refs/remotes/dgit/dgit/sid 469s + local val 469s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 469s ++ local ref=refs/remotes/dgit/dgit/sid 469s ++ case "$ref" in 469s ++ git show-ref -d refs/remotes/dgit/dgit/sid 469s ++ perl -ne ' 469s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 469s END { print "$x\n" if length $x; } 469s ' 469s + val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + t-ref-same-val refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + local name=refs/remotes/dgit/dgit/sid 469s + local val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + case "${t_ref_val-unset}" in 469s + t_ref_val=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 469s + t_ref_names+=("$name") 469s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 469s + local val 469s + for g in $* 469s ++ t-git-get-ref refs/dgit/unstable 469s ++ local ref=refs/dgit/unstable 469s ++ case "$ref" in 469s ++ git show-ref -d refs/dgit/unstable 469s ++ perl -ne ' 469s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 469s END { print "$x\n" if length $x; } 469s ' 469s ++ test 1 = 1 469s + val= 469s + '[' x '!=' x ']' 469s + for g in $* 469s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 469s ++ local ref=refs/remotes/dgit/dgit/unstable 469s ++ case "$ref" in 469s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 469s ++ perl -ne ' 469s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 469s END { print "$x\n" if length $x; } 469s ' 469s ++ test 1 = 1 469s + val= 469s + '[' x '!=' x ']' 469s + t-ok 469s + : ======================================== 469s + t-check-only-bpd 469s + '[' .. = .. ']' 469s + return 469s + t-fscks 469s + shopt -s nullglob 469s + for d in $tmp/*/.git $tmp/git/*.git 469s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 469s + t-git-fsck 469s ++ git rev-parse --git-dir 469s + local fsckerrs=.git/dgit-test-fsck.errs 469s + set +e 469s + LC_MESSAGES=C 469s + git fsck --no-dangling --strict 469s + tee .git/dgit-test-fsck.errs 469s + ps='0 0' 469s + set -e 469s + local pats 469s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 469s + test '0 0' = '0 0' 469s + pats+=(-e 'notice: HEAD points to an unborn branch') 469s + pats+=(-e 'notice: No default references') 469s + set +e 469s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 469s + rc=1 469s + set -e 469s + case $rc in 469s + t-save-artifacts 469s + artifacts=/tmp/autopkgtest.ztMUxl/clone-skew-artifacts 469s + '[' x/tmp/autopkgtest.ztMUxl/clone-skew-artifacts = x ']' 469s + '[' xtmp = x ']' 469s + GZIP=-1v 469s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/clone-skew-artifacts/clone-skew.tar.gz '--exclude=*.tar' . 469s gzip: warning: GZIP environment variable is deprecated; use an alias or script 469s 76.5% 469s + echo ok. 469s ok. 469s + rc=0 469s + set +x 469s + set +e 469s + pwd 469s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 469s + '[' x '!=' x ']' 469s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 469s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 469s + set -e 469s + test 0 = 0 469s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 10535 469s PID TTY STAT TIME COMMAND 469s 10535 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror 469s autopkgtest [12:26:03]: test clone-skew: -----------------------] 470s clone-skew PASS 470s autopkgtest [12:26:04]: test clone-skew: - - - - - - - - - - results - - - - - - - - - - 470s autopkgtest [12:26:04]: test drs-clone-nogit: preparing testbed 470s Reading package lists... 470s Building dependency tree... 470s Reading state information... 470s Starting pkgProblemResolver with broken count: 0 470s Starting 2 pkgProblemResolver with broken count: 0 471s Done 471s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 471s autopkgtest [12:26:05]: test drs-clone-nogit: [----------------------- 471s ++ set -o pipefail 471s ++ . tests/lib-core 471s ++ . tests/lib-restricts 471s ++ trap ' 471s rc=$? 471s set +x 471s test $rc = 0 || echo " 471s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 471s 471s Most relevant logs are just before assignment rc=$rc 471s Will now do cleanup etc. 471s " 471s set -x 471s set +e 471s pwd 471s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 471s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 471s set -e 471s test $rc = 0 || t-report-failure 471s ' EXIT 471s ++ t-filter-out-git-hyphen-dir 471s ++ local pathent 471s +++ type -p git-rev-parse 471s +++ : 471s ++ pathent= 471s ++ case "$pathent" in 471s ++ return 471s ++ t-set-intree 471s ++ '[' x = x ']' 471s ++ return 471s ++ : -D 471s ++ export DGIT_TEST_DEBUG 471s ++ : x 471s ++ export DGIT_TEST_DEBPUSH_DEBUG 471s ++ : 471s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 471s ++ GIT_COMMITTER_DATE='1530000000 +0100' 471s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 471s ++ GIT_AUTHOR_DATE='1530000000 +0100' 471s ++ export LC_CTYPE=C.UTF-8 471s ++ LC_CTYPE=C.UTF-8 471s ++ unset CDPATH 471s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 471s ++ FILTER_BRANCH_SQUELCH_WARNING=1 471s +++ pwd 471s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 471s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ testname=drs-clone-nogit 471s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ bpd=.. 471s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 471s ++ '[' x '!=' x ']' 471s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s +++ pwd 471s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ t-set-using-tmp 471s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 471s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 471s ++ export 'DEBFULLNAME=dgit test git user' 471s ++ DEBFULLNAME='dgit test git user' 471s ++ git config --global user.email dgit-test@debian.example.net 471s ++ git config --global user.name 'dgit test git user' 471s ++ git config --global protocol.ext.allow always 471s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 471s ++ env -0 471s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 471s ++ export DEBCHANGE_VENDOR=dpkg 471s ++ DEBCHANGE_VENDOR=dpkg 471s ++ unset VISUAL 471s ++ unset GIT_EDITOR 471s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 471s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 471s ++ cat 471s ++ schroot=build 471s ++ : aq 471s ++ : archive/test-dummy 471s ++ : sid:unstable 471s ++ t-git-config dgit.default.old-dsc-distro test-dummy 471s ++ git config --global dgit.default.old-dsc-distro test-dummy 471s ++ for import in ${autoimport-gnupg} 471s ++ case "$0" in 471s ++ t-setup-import gnupg 471s ++ local setupname=gnupg 471s ++ local setupsrc 471s ++ local lock 471s ++ '[' x = x ']' 471s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 471s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 471s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 471s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 471s cd "$1"; shift 471s setupname="$1"; shift 471s simport="$1"; shift 471s if [ -e "$simport" ]; then exit 0; fi 471s env - "$@" \ 471s "tests/setup/$setupname" 471s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 471s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 471s + shift 471s + setupname=gnupg 471s + shift 471s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 471s + shift 471s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 471s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-stderr --stdout=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/drs-clone-nogit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/drs-clone-nogit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 471s ++ set -o pipefail 471s ++ . tests/lib-core 471s ++ . tests/lib-restricts 471s ++ trap ' 471s rc=$? 471s set +x 471s test $rc = 0 || echo " 471s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 471s 471s Most relevant logs are just before assignment rc=$rc 471s Will now do cleanup etc. 471s " 471s set -x 471s set +e 471s pwd 471s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 471s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 471s set -e 471s test $rc = 0 || t-report-failure 471s ' EXIT 471s ++ t-filter-out-git-hyphen-dir 471s ++ local pathent 471s +++ type -p git-rev-parse 471s +++ : 471s ++ pathent= 471s ++ case "$pathent" in 471s ++ return 471s ++ t-set-intree 471s ++ '[' x = x ']' 471s ++ return 471s ++ : -D 471s ++ export DGIT_TEST_DEBUG 471s ++ : x 471s ++ export DGIT_TEST_DEBPUSH_DEBUG 471s ++ : 471s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 471s ++ GIT_COMMITTER_DATE='1530000000 +0100' 471s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 471s ++ GIT_AUTHOR_DATE='1530000000 +0100' 471s ++ export LC_CTYPE=C.UTF-8 471s ++ LC_CTYPE=C.UTF-8 471s ++ unset CDPATH 471s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 471s ++ FILTER_BRANCH_SQUELCH_WARNING=1 471s +++ pwd 471s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 471s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ testname=gnupg 471s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 471s ++ bpd=.. 471s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 471s ++ '[' x '!=' x ']' 471s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s +++ pwd 471s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ t-set-using-tmp 471s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 471s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 471s ++ export 'DEBFULLNAME=dgit test git user' 471s ++ DEBFULLNAME='dgit test git user' 471s ++ git config --global user.email dgit-test@debian.example.net 471s ++ git config --global user.name 'dgit test git user' 471s ++ git config --global protocol.ext.allow always 471s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 471s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 471s ++ export DEBCHANGE_VENDOR=dpkg 471s ++ DEBCHANGE_VENDOR=dpkg 471s ++ unset VISUAL 471s ++ unset GIT_EDITOR 471s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 471s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 471s ++ cat 471s ++ schroot=build 471s ++ : aq 471s ++ : archive/test-dummy 471s ++ : sid:unstable 471s ++ t-git-config dgit.default.old-dsc-distro test-dummy 471s ++ git config --global dgit.default.old-dsc-distro test-dummy 471s ++ for import in ${autoimport-gnupg} 471s ++ case "$0" in 471s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 471s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 471s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 471s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 471s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 471s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 471s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 471s + setup=' 471s export GNUPGHOME=$tmp/gnupg 471s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 471s 471s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 471s ssb rsa2048 2013-11-17 [E] 471s 471s sec rsa2048 2014-01-26 [SC] 471s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 471s uid [ultimate] Populus Romanus (test key) 471s ssb rsa2048 2014-01-26 [E] 471s 471s sec rsa2048 2014-01-26 [SC] 471s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 471s uid [ unknown] Hannibal (test key) 471s ssb rsa2048 2014-01-26 [E] 471s 471s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 471s export GNUPGHOME=$tmp/gnupg 471s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 471s 471s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 471s read <$tmp/must-clean/git-check.port git_check_port 471s 471s t-git-config --global dgit-distro.test-dummy.git-check url 471s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 471s t-git-config --global dgit-distro.test-dummy.git-check-url \ 471s http://127.0.0.1:$git_check_port 471s ' 471s + local savevars= 471s + local savedirs=--files-from=/dev/null 471s + local 'importeval= 471s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 471s read <$tmp/must-clean/git-check.port git_check_port 471s 471s t-git-config --global dgit-distro.test-dummy.git-check url 471s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 471s t-git-config --global dgit-distro.test-dummy.git-check-url \ 471s http://127.0.0.1:$git_check_port 471s ' 471s + local import=IMPORT.http-git-check 471s + exec 471s + local vn 471s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 471s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 471s print STDERR "saving-exporting $vn\n"; 471s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 471s or die $!; 471s } 471s ' 471s saving-exporting DGIT_TEST_REAL_GPG 471s saving-exporting DGIT_TEST_REAL_GPG_AGENT 471s + set -e 471s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 471s + printf '\n%s\n' ' 471s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 471s read <$tmp/must-clean/git-check.port git_check_port 471s 471s t-git-config --global dgit-distro.test-dummy.git-check url 471s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 471s t-git-config --global dgit-distro.test-dummy.git-check-url \ 471s http://127.0.0.1:$git_check_port 471s ' 471s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 471s + rc=0 471s + set +x 471s + set +e 471s + pwd 471s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 471s + '[' x '!=' x ']' 471s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 471s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 471s + set -e 471s + test 0 = 0 471s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 471s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 471s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 471s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 471s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 471s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 471s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 471s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 472s ++ read git_check_port 472s ++ t-git-config --global dgit-distro.test-dummy.git-check url 472s ++ git config --global --global dgit-distro.test-dummy.git-check url 472s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 472s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 472s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:33885 472s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:33885 472s + t-archive pari-extra 3-1 472s + t-archive-none pari-extra 472s + t-select-package pari-extra 472s + p=pari-extra 472s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 472s + t-archive-none-aq 472s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 472s + : 472s + local 'jsondelim=[' 472s + local suitespec 472s + for suitespec in $suitespecs 472s + local suite=sid 472s + local sname=unstable 472s + t-aq-archive-updated sid pari-extra 472s + local suite=sid 472s + local p=pari-extra 472s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 472s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 472s + perl -wne ' 472s use JSON; 472s use strict; 472s our @v; 472s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 472s push @v, { 472s "version" => "$1", 472s "sha256sum" => "$2", 472s "component" => "$3", 472s "filename" => "$4", 472s }; 472s END { 472s my $json = JSON->new->canonical(); 472s print $json->encode(\@v) or die $!; 472s } 472s ' 472s + t-aq-archive-updated new pari-extra 472s + local suite=new 472s + local p=pari-extra 472s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 472s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 472s + perl -wne ' 472s use JSON; 472s use strict; 472s our @v; 472s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 472s push @v, { 472s "version" => "$1", 472s "sha256sum" => "$2", 472s "component" => "$3", 472s "filename" => "$4", 472s }; 472s END { 472s my $json = JSON->new->canonical(); 472s print $json->encode(\@v) or die $!; 472s } 472s ' 472s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 472s + cat 472s + jsondelim=' },' 472s + cat 472s + v=3-1 472s + local dscf=pari-extra_3-1.dsc 472s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 472s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 472s + t-archive-query 472s + local suite=sid 472s + local dscf=main/pari-extra_3-1.dsc 472s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 472s + local suite=sid 472s + local p=pari-extra 472s + local v=3-1 472s + local dscf=main/pari-extra_3-1.dsc 472s + local sha 472s ++ sha256sum 472s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 472s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 472s + t-aq-archive-updated sid pari-extra 472s + local suite=sid 472s + local p=pari-extra 472s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 472s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 472s + perl -wne ' 472s use JSON; 472s use strict; 472s our @v; 472s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 472s push @v, { 472s "version" => "$1", 472s "sha256sum" => "$2", 472s "component" => "$3", 472s "filename" => "$4", 472s }; 472s END { 472s my $json = JSON->new->canonical(); 472s print $json->encode(\@v) or die $!; 472s } 472s ' 472s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 472s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 472s + set -e 472s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 472s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 472s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 472s dpkg-source: info: extracting pari-extra in pari-extra-3 472s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 472s dpkg-source: info: applying pari-extra_3-1.diff.gz 472s + t-git-none 472s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 472s + set -e 472s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 472s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 472s + t-dgit clone pari-extra 472s + local dgit=dgit 472s + pwd 472s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 472s + : ' 472s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 472s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 472s | git config -z --get-regexp --global '.*' 472s | git config -z --get-regexp --system '.*' 472s clone main body 472s CD pari-extra 472s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 472s canonical suite name for unstable is sid 472s query: fetching http://127.0.0.1:33885/pari-extra.git/HEAD... 472s dgit-repos check_for_git => . 472s + git init -q 472s | git config -z --get-regexp --local '.*' 472s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 472s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 472s + git config user.name 'dgit test git user' 472s is_gitattrs_setup: found nothing 472s starting new git history 472s + git config remote.dgit.skipdefaultupdate true 472s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 472s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 472s get_archive_dsc: Version 3-1 472s last upload to archive: NO git hash 472s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 472s => `' 472s previous reference hash= 472s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 472s => `' 472s fetch_from_archive: lastfetch= 472s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 472s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 472s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 472s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 472s % Total % Received % Xferd Average Speed Time Time Time Current 472s Dload Upload Total Spent Left Speed 472s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 1875k 0 --:--:-- --:--:-- --:--:-- 1875k 472s considering saving pari-extra_3.orig.tar.gz: linked. 472s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 472s ./pari-extra_3-1.diff.gz does not exist, need to fetch 472s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 472s % Total % Received % Xferd Average Speed Time Time Time Current 472s Dload Upload Total Spent Left Speed 472s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 40.1M 0 --:--:-- --:--:-- --:--:-- 40.1M 472s considering saving pari-extra_3-1.diff.gz: linked. 472s import considering pari-extra_3.orig.tar.gz Y .gz orig 472s + chmod -R '+rwX' _unpack-tar 472s CD _unpack-tar 472s | find -name .git -prune -print0 472s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 472s + git add -Af . 472s | git write-tree 472s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 472s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 472s => `' 472s multiple subtrees 472s CD .. 472s import considering pari-extra_3-1.diff.gz not tar 472s + dpkg-source --no-check -x -- pari-extra.dsc 472s dpkg-source: info: extracting pari-extra in pari-extra-3 472s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 472s dpkg-source: info: applying pari-extra_3-1.diff.gz 472s CD pari-extra-3 472s | find -name .git -prune -print0 472s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 472s + git add -Af . 472s | git write-tree 472s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 472s import clog search... 472s | dpkg-parsechangelog --format rfc822 --all 472s import clog 3-1 package changelog, entry no.1... 472s import clog 3-1 vs 3... 472s import clog 3-1 becomes r1 472s import clog 2.1-1 package changelog, entry no.2... 472s import clog 2.1-1 vs 3... 472s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 472s => `1312546022 +0000' 472s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 472s => `1312546022 +0000' 472s import tartrees authline Bill Allombert 1312546022 +0000 472s import tartrees r1authline Bill Allombert 1312546022 +0000 472s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 472s | git hash-object -w -t commit --stdin 472s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 472s import main commit 472s | git hash-object -w -t commit ../commit.tmp 472s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 472s synthesised git commit from .dsc 3-1 472s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 472s fetch mergeinfos: 472s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 472s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 472s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s => `' 472s + git reset --hard refs/remotes/dgit/dgit/sid 472s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 472s + bash -ec ' set -o pipefail 472s git ls-tree -r --name-only -z HEAD | '\\' 472s xargs -0r touch -h -r . -- 472s ' 472s dgit ok: ready for work in pari-extra 472s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 472s del_lrfetchrefs... 472s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 472s ' 472s + cd pari-extra 472s + t-cloned-fetched-good 472s + t-diff-nogit ../extract/pari-extra-3 . 472s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 472s + t-clean-on-branch dgit/sid 472s + t-output '## dgit/sid' git status -b --porcelain 472s + printf '%s\n' '## dgit/sid' 472s + shift 472s + git status -b --porcelain 472s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 472s + t-refs-same-start 472s + unset t_ref_val 472s + t_ref_names=() 472s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 472s + local g 472s + for g in $* 472s + t-ref-same refs/heads/dgit/sid 472s + local name=refs/heads/dgit/sid 472s + local val 472s ++ t-git-get-ref refs/heads/dgit/sid 472s ++ local ref=refs/heads/dgit/sid 472s ++ case "$ref" in 472s ++ git show-ref -d refs/heads/dgit/sid 472s ++ perl -ne ' 472s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 472s END { print "$x\n" if length $x; } 472s ' 472s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + local name=refs/heads/dgit/sid 472s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + case "${t_ref_val-unset}" in 472s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + t_ref_names+=("$name") 472s + for g in $* 472s + t-ref-same refs/remotes/dgit/dgit/sid 472s + local name=refs/remotes/dgit/dgit/sid 472s + local val 472s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 472s ++ local ref=refs/remotes/dgit/dgit/sid 472s ++ case "$ref" in 472s ++ git show-ref -d refs/remotes/dgit/dgit/sid 472s ++ perl -ne ' 472s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 472s END { print "$x\n" if length $x; } 472s ' 472s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + local name=refs/remotes/dgit/dgit/sid 472s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + case "${t_ref_val-unset}" in 472s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 472s + t_ref_names+=("$name") 472s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 472s + local val 472s + for g in $* 472s ++ t-git-get-ref refs/dgit/unstable 472s ++ local ref=refs/dgit/unstable 472s ++ case "$ref" in 472s ++ git show-ref -d refs/dgit/unstable 472s ++ perl -ne ' 472s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 472s END { print "$x\n" if length $x; } 472s ' 472s ++ test 1 = 1 472s + val= 472s + '[' x '!=' x ']' 472s + for g in $* 472s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 472s ++ local ref=refs/remotes/dgit/dgit/unstable 472s ++ case "$ref" in 472s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 472s ++ perl -ne ' 472s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 472s END { print "$x\n" if length $x; } 472s ' 472s ++ test 1 = 1 472s + val= 472s + '[' x '!=' x ']' 472s + v=3-2~dummy1 472s + t-apply-diff 3-1 3-2~dummy1 472s + local v1=3-1 472s + local v2=3-2~dummy1 472s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs 472s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 472s + patch -p1 -u 472s + test 1 = 1 472s patching file debian/changelog 472s patching file debian/control 472s + debcommit -a 472s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 472s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 472s 2 files changed, 8 insertions(+), 1 deletion(-) 472s + t-refs-same-start 472s + unset t_ref_val 472s + t_ref_names=() 472s + t-ref-head 472s + local val 472s ++ git rev-parse HEAD 472s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 472s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 472s + local name=HEAD 472s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 472s + case "${t_ref_val-unset}" in 472s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 472s + t_ref_names+=("$name") 472s + t-dgit --dpkg-buildpackage:-d build 472s + local dgit=dgit 472s + pwd 472s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 472s + : ' 472s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 472s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 472s | git rev-parse --show-toplevel 472s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 472s | git config -z --get-regexp --local '.*' 472s | git config -z --get-regexp --local '.*' 472s | git config -z --get-regexp --global '.*' 472s | git config -z --get-regexp --system '.*' 472s format , quilt mode linear 472s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 472s warning: could not open directory 'debian/source/': No such file or directory 472s => `' 472s + git diff --quiet HEAD 472s massage split -F. 472s massage done 3 -b. 472s format , quilt mode linear 472s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 472s warning: could not open directory 'debian/source/': No such file or directory 472s => `' 472s + git diff --quiet HEAD 472s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 473s dpkg-buildpackage: info: source package pari-extra 473s dpkg-buildpackage: info: source version 3-2~dummy1 473s dpkg-buildpackage: info: source distribution unstable 473s dpkg-buildpackage: info: source changed by Senatus Romanus 473s fakeroot debian/rules clean 473s dh_testdir 473s dh_testroot 473s rm -f build-stamp 473s dh_clean 473s | git clean -dn 473s => `' 473s | git rev-parse 'HEAD~0' 473s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 473s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 473s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 473s CD work 473s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 473s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 473s CD .. 473s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 473s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 473s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 473s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 473s dpkg-source: info: using source format '1.0' 473s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 473s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 473s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 473s CD work 473s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 473s changelog will contain changes since 3-1 473s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 473s dpkg-genchanges: info: not including original source code in upload 473s CD .. 473s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.. 473s renaming (Files) pari-extra_3.orig.tar.gz 473s renaming (Files) pari-extra_3-2~dummy1.diff.gz 473s renaming (dsc) pari-extra_3-2~dummy1.dsc 473s renaming (changes) pari-extra_3-2~dummy1_source.changes 473s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 473s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 473s dpkg-buildpackage: info: source package pari-extra 473s dpkg-buildpackage: info: source version 3-2~dummy1 473s dpkg-buildpackage: info: source distribution unstable 473s dpkg-buildpackage: info: source changed by Senatus Romanus 473s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 473s dpkg-buildpackage: info: host architecture amd64 473s debian/rules build 473s dh_testdir 473s touch build-stamp 473s fakeroot debian/rules binary 473s dh_testdir 473s dh_testroot 473s dh_prep 473s dh_installdirs 473s dh_testdir 473s dh_testroot 473s dh_installdocs 473s dh_installexamples 473s dh_installchangelogs 473s dh_link 473s dh_strip 473s dh_compress 473s dh_fixperms 473s dh_installdeb 474s dh_gencontrol 474s dh_md5sums 474s dh_builddeb 474s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 474s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_amd64.buildinfo 474s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_amd64.changes 474s dpkg-genchanges: info: binary-only upload (no source code included) 474s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 474s dpkg-buildpackage: info: binary-only upload (no source included) 474s CD .. 474s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_amd64.changes' 474s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 474s 474s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 474s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 474s ' 474s + t-dgit push 474s + local dgit=dgit 474s + pwd 474s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 474s + : ' 474s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 474s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 475s | git rev-parse --show-toplevel 475s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 475s | git config -z --get-regexp --local '.*' 475s | git config -z --get-regexp --local '.*' 475s | git config -z --get-regexp --global '.*' 475s | git config -z --get-regexp --system '.*' 475s format , quilt mode linear 475s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 475s warning: could not open directory 'debian/source/': No such file or directory 475s => `' 475s + git diff --quiet HEAD 475s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 475s canonical suite name for unstable is sid 475s actually entering push 475s query: fetching http://127.0.0.1:33885/pari-extra.git/HEAD... 475s dgit-repos check_for_git => . 475s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 475s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 475s get_archive_dsc: Version 3-1 475s last upload to archive: NO git hash 475s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 475s => `' 475s previous reference hash= 475s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 475s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 475s using existing pari-extra_3.orig.tar.gz 475s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 475s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 475s using existing pari-extra_3-1.diff.gz 475s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 475s import considering pari-extra_3.orig.tar.gz Y .gz orig 475s + chmod -R '+rwX' _unpack-tar 475s CD _unpack-tar 475s | find -name .git -prune -print0 475s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 475s + git add -Af . 475s | git write-tree 475s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 475s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 475s => `' 475s multiple subtrees 475s CD .. 475s import considering pari-extra_3-1.diff.gz not tar 475s + dpkg-source --no-check -x -- pari-extra.dsc 475s dpkg-source: info: extracting pari-extra in pari-extra-3 475s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 475s dpkg-source: info: applying pari-extra_3-1.diff.gz 475s CD pari-extra-3 475s | find -name .git -prune -print0 475s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 475s + git add -Af . 475s | git write-tree 475s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 475s import clog search... 475s | dpkg-parsechangelog --format rfc822 --all 475s import clog 3-1 package changelog, entry no.1... 475s import clog 3-1 vs 3... 475s import clog 3-1 becomes r1 475s import clog 2.1-1 package changelog, entry no.2... 475s import clog 2.1-1 vs 3... 475s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 475s => `1312546022 +0000' 475s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 475s => `1312546022 +0000' 475s import tartrees authline Bill Allombert 1312546022 +0000 475s import tartrees r1authline Bill Allombert 1312546022 +0000 475s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 475s | git hash-object -w -t commit --stdin 475s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 475s import main commit 475s | git hash-object -w -t commit ../commit.tmp 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s synthesised git commit from .dsc 3-1 475s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 475s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 475s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s fetch mergeinfos: 475s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 475s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 475s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 475s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 475s + git check-ref-format archive/test-dummy/3-2_dummy1 475s | git symbolic-ref -q HEAD 475s => `refs/heads/dgit/sid' 475s | git rev-parse 'HEAD~0' 475s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 475s ffq_prev_branchinfo branch current refs/heads/dgit/sid 475s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 475s => `' 475s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 475s => `' 475s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 475s warning: could not open directory 'debian/source/': No such file or directory 475s => `' 475s + git diff --quiet HEAD 475s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 475s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 475s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 475s => `' 475s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 475s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 475s + dpkg-source -x -- '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 475s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 475s dpkg-source: info: extracting pari-extra in pari-extra-3 475s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 475s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 475s CD pari-extra-3 475s | find -name .git -prune -print0 475s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 475s + git add -Af . 475s | git write-tree 475s => `59d0825204e6551ec6bcd704839aae32586014f4' 475s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 475s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 475s files_compare_inputs pari-extra_3-2~dummy1.dsc 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 475s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_amd64.buildinfo 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_amd64.buildinfo 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 475s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_amd64.buildinfo 475s checking origs needed (3)... 475s checking origs needed placement 'math optional'... 475s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 475s origs pari-extra_3.orig.tar.gz is_orig 475s -| sh -ec 'cd "$1"; shift 475s 475s find -name "$1" -print0 | 475s xargs -0r sha256sum 475s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 475s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 475s origs pari-extra_3.orig.tar.gz $#$have=0 475s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 475s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 475s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 475s push_tagwants: $VAR1 = [ 475s '3-2~dummy1', 475s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 475s undef, 475s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag' 475s ]; 475s $VAR2 = [ 475s { 475s 'TfSuffix' => '', 475s 'TagFn' => sub { "DUMMY" }, 475s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 475s 'Tag' => 'archive/test-dummy/3-2_dummy1', 475s 'Tfn' => sub { "DUMMY" }, 475s 'View' => 'dgit' 475s }, 475s { 475s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 475s 'Tag' => 'test-dummy/3-2_dummy1', 475s 'Tfn' => sub { "DUMMY" }, 475s 'TfSuffix' => '-dgit', 475s 'TagFn' => sub { "DUMMY" }, 475s 'View' => 'dgit' 475s } 475s ]; 475s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 475s => `1384698857 +0000' 475s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 475s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 475s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 475s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 475s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 475s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 475s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 475s => `14743938477063532804f9c16b4116f82057834d' 475s + git verify-tag 14743938477063532804f9c16b4116f82057834d 475s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 475s gpg: Signature made Mon Mar 31 12:26:09 2025 UTC 475s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 475s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 475s gpg: WARNING: This key is not certified with a trusted signature! 475s gpg: There is no indication that the signature belongs to the owner. 475s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 475s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 14743938477063532804f9c16b4116f82057834d 475s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 475s => `c63abf9e19fa12ecfbf0fdd13ab1a5131366e917' 475s + git verify-tag c63abf9e19fa12ecfbf0fdd13ab1a5131366e917 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s gpg: Signature made Mon Mar 31 12:26:09 2025 UTC 476s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 476s gpg: WARNING: This key is not certified with a trusted signature! 476s gpg: There is no indication that the signature belongs to the owner. 476s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 476s + git update-ref refs/tags/test-dummy/3-2_dummy1 c63abf9e19fa12ecfbf0fdd13ab1a5131366e917 476s query: fetching http://127.0.0.1:33885/pari-extra.git/HEAD... 476s dgit-repos check_for_git => . 476s + git -c push.followTags=false push 'ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/drs-git-ext %S /pari-extra.git' 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 refs/tags/test-dummy/3-2_dummy1 476s (((((((((((((((((((((((((((((((((((((((( 476s + export SSH_ORIGINAL_COMMAND=git-receive-pack /pari-extra.git 476s + dgit-repos-server test-dummy /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dd.gpg,a:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dm.gpg,m/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dm.txt --repos=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git --suites=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/suites --ssh 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git.lock 1 476s +M /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy check-package pari-extra 476s hook => 0 476s fixmissing git_receive_pack 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective.lock 1 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_template.lock 1 476s copy template /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_template -> /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective 476s running main git_receive_pack 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126.lock 1 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git.lock 1 476s + git clone -l -q --mirror /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126 476s warning: You appear to have cloned an empty repository. 476s stunt hook set up /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126/hooks/pre-receive 476s + git receive-pack /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126 476s remote: =in stunthook --pre-receive-hook pari-extra 476s remote: =DGIT_DRS_DEBUG=1 476s remote: =DGIT_DRS_DEST=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective 476s remote: =DGIT_DRS_DGITLIVE=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/dgit-live 476s remote: =DGIT_DRS_DGITREPOS=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 476s remote: =DGIT_DRS_DISTRO=test-dummy 476s remote: =DGIT_DRS_DISTRODIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy 476s remote: =DGIT_DRS_KEYRINGS=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dd.gpg,a:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dm.gpg,m/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dm.txt 476s remote: =DGIT_DRS_MIRRORHOOK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/mirror-hook 476s remote: =DGIT_DRS_POLICYHOOK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/policy-hook 476s remote: =DGIT_DRS_SUITESFILE=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/suites 476s remote: =DGIT_DRS_SUITESFORMASTERFILE=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/suites-master 476s remote: =DGIT_DRS_WORK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126 476s remote: =DGIT_STUNT_AGENT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/gpg-agent 476s remote: =DGIT_TEST_DEBPUSH_DEBUG=x 476s remote: =DGIT_TEST_DEBUG=-D 476s remote: =DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 476s remote: =DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 476s remote: =DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 476s remote: =DGIT_TEST_REAL_GPG=/usr/bin/gpg 476s remote: =DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 476s remote: =DGIT_TEST_TESTNAME=drs-clone-nogit 476s remote: =DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 476s remote: =DGIT_TEST_TMPBASE= 476s remote: =DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 476s remote: =stunthook in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126 476s remote: = updates ... 476s remote: = upd.| 0000000000000000000000000000000000000000 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/dgit/sid 476s remote: = upd.| 0000000000000000000000000000000000000000 14743938477063532804f9c16b4116f82057834d refs/tags/archive/test-dummy/3-2_dummy1 476s remote: = upd.| 0000000000000000000000000000000000000000 c63abf9e19fa12ecfbf0fdd13ab1a5131366e917 refs/tags/test-dummy/3-2_dummy1 476s remote: = updates ok. 476s remote: = readtag... 476s remote: = parsetag... 476s remote: = parsetag ignoring unrecognised `no-split' 476s remote: = parsetag ok. 476s remote: =verifytag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dd.gpg,a... 476s remote: = checksig keyring /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dd.gpg... 476s remote: =| gpgv --status-fd=1 --keyring /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dd.gpg dgit-tmp/plaintext.asc dgit-tmp/plaintext 476s remote: =gpgv: Signature made Mon Mar 31 12:26:09 2025 UTC 476s remote: gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s remote: checksig| NEWSIG 476s remote: = checksig| KEY_CONSIDERED BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 0 476s remote: = checksig| SIG_ID 7SoZaYk5PV+WyLEytZcUBbPvxJM 2025-03-31 1743423969 476s remote: gpgv: Good signature from "Senatus Romanus (test key) " 476s remote: = checksig| KEY_CONSIDERED BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 0 476s remote: = checksig| GOODSIG A3DBCBC039B13D8A Senatus Romanus (test key) 476s remote: = checksig| VALIDSIG BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 2025-03-31 1743423969 0 4 0 1 10 00 BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s remote: = checksig ok=1 476s remote: =verifytag a ok 476s remote: =checks 476s remote: =expected tag archive/test-dummy/3-2_dummy1 test-dummy/3-2_dummy1 476s remote: =| git for-each-ref '--format=%(objectname)' '[r]efs/tags/test-dummy/3-2_dummy1' 476s remote: ==> `' 476s remote: =locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git.lock 1 476s remote: =+M /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy push pari-extra '3-2~dummy1' sid archive/test-dummy/3-2_dummy1 '' 476s remote: =hook => 0 476s remote: =checksuite (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/suites) 476s remote: =suite_is_in (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/suites) 476s remote: =oldcommit 0000000000000000000000000000000000000000 476s remote: = ~NOCOMMITCHECK git log -z --pretty=tformat:%H%n%at%n%ct%n 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s remote: =+ git send-pack /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective --receive-pack=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126/./objects/incoming-qt8fC1/dgit-recv-wrapper 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/dgit/sid 14743938477063532804f9c16b4116f82057834d:refs/tags/archive/test-dummy/3-2_dummy1 c63abf9e19fa12ecfbf0fdd13ab1a5131366e917:refs/tags/test-dummy/3-2_dummy1 476s remote: To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective 476s remote: * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 476s remote: * [new tag] 14743938477063532804f9c16b4116f82057834d -> archive/test-dummy/3-2_dummy1 476s remote: * [new tag] c63abf9e19fa12ecfbf0fdd13ab1a5131366e917 -> test-dummy/3-2_dummy1 476s remote: =suite_is_in (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/suites-master) 476s remote: =+ git send-pack /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective --receive-pack=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_incoming12126/./objects/incoming-qt8fC1/dgit-recv-wrapper 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/heads/master 476s remote: To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective 476s remote: * [new branch] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> master 476s remote: =+M /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/policy-hook test-dummy /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/dgit-live /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy push-confirm pari-extra '3-2~dummy1' sid archive/test-dummy/3-2_dummy1 '' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective 476s remote: =hook => 0 476s remote: =stunthook done. 476s show-ref (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective) ... 476s show-refs| 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/dgit/sid 476s show-refs| 6cfbeb52ce126ee40067fe8fa263446a79082de7 refs/heads/master 476s show-refs| 14743938477063532804f9c16b4116f82057834d refs/tags/archive/test-dummy/3-2_dummy1 476s show-refs| c63abf9e19fa12ecfbf0fdd13ab1a5131366e917 refs/tags/test-dummy/3-2_dummy1 476s installprospective ? 476s locking /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git.lock 1 476s install /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/_tmp/pari-extra_prospective => /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 476s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/mirror-hook /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy updated-hook pari-extra 476s locking pari-extra_incoming12126.lock 0 476s locking pari-extra_prospective.lock 0 476s + : )))))))))))))))))))))))))))))))))))))))) 476s To ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/drs-git-ext %S /pari-extra.git 476s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 476s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 476s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 476s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 476s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s 476s signfile buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s 476s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 476s fixup_changes buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo ../pari-extra_3-2~dummy1_multi.changes 476s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s 476s Successfully signed dsc, buildinfo, changes files 476s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 476s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 476s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 476s D: Setting host argument. 476s Checking signature on .changes 476s Checking signature on .dsc 476s Uploading to test-dummy (via local to localhost): 476s Successfully uploaded packages. 476s dgit ok: pushed and uploaded 3-2~dummy1 476s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 476s del_lrfetchrefs... 476s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 476s ' 476s + t-pushed-good dgit/sid 476s + local branch=dgit/sid 476s + local suite=sid 476s + t-refs-same refs/heads/dgit/sid 476s + local g 476s + for g in $* 476s + t-ref-same refs/heads/dgit/sid 476s + local name=refs/heads/dgit/sid 476s + local val 476s ++ t-git-get-ref refs/heads/dgit/sid 476s ++ local ref=refs/heads/dgit/sid 476s ++ case "$ref" in 476s ++ git show-ref -d refs/heads/dgit/sid 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=refs/heads/dgit/sid 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s + t-pushed-good-core 476s + t-ref-dsc-dgit 476s + t-incoming-dsc 476s + local dsc=pari-extra_3-2~dummy1.dsc 476s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 476s + local val 476s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 476s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 476s ++ local field=Dgit 476s ++ perl -e ' 476s use Dpkg::Control::Hash; 476s my $h = new Dpkg::Control::Hash allow_pgp=>1; 476s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 476s my $val = $h->{"Dgit"},"\n"; 476s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 476s print $val,"\n"; 476s ' 476s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/drs-git-ext %S /pari-extra.git' 476s ++ perl -e ' 476s $_=shift @ARGV; 476s die "Dgit $_ ?" unless m/^\w+\b/; 476s print $&,"\n" or die $!; 476s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/drs-git-ext %S /pari-extra.git' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s ++ t-v-tag 476s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 476s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 476s + local g 476s + for g in $* 476s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 476s + local name=refs/tags/archive/test-dummy/3-2_dummy1 476s + local val 476s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 476s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 476s ++ case "$ref" in 476s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=refs/tags/archive/test-dummy/3-2_dummy1 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s + for g in $* 476s + t-ref-same refs/remotes/dgit/dgit/sid 476s + local name=refs/remotes/dgit/dgit/sid 476s + local val 476s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 476s ++ local ref=refs/remotes/dgit/dgit/sid 476s ++ case "$ref" in 476s ++ git show-ref -d refs/remotes/dgit/dgit/sid 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=refs/remotes/dgit/dgit/sid 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 476s + local val 476s + for g in $* 476s ++ t-git-get-ref refs/heads/dgit/unstable 476s ++ local ref=refs/heads/dgit/unstable 476s ++ case "$ref" in 476s ++ git show-ref -d refs/heads/dgit/unstable 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s ++ test 1 = 1 476s + val= 476s + '[' x '!=' x ']' 476s + for g in $* 476s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 476s ++ local ref=refs/remotes/dgit/dgit/unstable 476s ++ case "$ref" in 476s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s ++ test 1 = 1 476s + val= 476s + '[' x '!=' x ']' 476s + set -e 476s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 476s ++ t-v-tag 476s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 476s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 476s + local g 476s + for g in $* 476s + t-ref-same refs/dgit/sid 476s + local name=refs/dgit/sid 476s + local val 476s ++ t-git-get-ref refs/dgit/sid 476s ++ local ref=refs/dgit/sid 476s ++ case "$ref" in 476s ++ git show-ref -d refs/dgit/sid 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=refs/dgit/sid 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s + for g in $* 476s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 476s + local name=refs/tags/archive/test-dummy/3-2_dummy1 476s + local val 476s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 476s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 476s ++ case "$ref" in 476s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + local name=refs/tags/archive/test-dummy/3-2_dummy1 476s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + case "${t_ref_val-unset}" in 476s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + t_ref_names+=("$name") 476s + t-check-pushed-master 476s + local master 476s ++ t-git-get-ref refs/heads/master 476s ++ local ref=refs/heads/master 476s ++ case "$ref" in 476s ++ git show-ref -d refs/heads/master 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s + master=6cfbeb52ce126ee40067fe8fa263446a79082de7 476s + '[' x6cfbeb52ce126ee40067fe8fa263446a79082de7 = x6cfbeb52ce126ee40067fe8fa263446a79082de7 ']' 476s + return 476s + t-refs-notexist refs/dgit/unstable 476s + local val 476s + for g in $* 476s ++ t-git-get-ref refs/dgit/unstable 476s ++ local ref=refs/dgit/unstable 476s ++ case "$ref" in 476s ++ git show-ref -d refs/dgit/unstable 476s ++ perl -ne ' 476s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 476s END { print "$x\n" if length $x; } 476s ' 476s ++ test 1 = 1 476s + val= 476s + '[' x '!=' x ']' 476s ++ t-v-tag 476s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 476s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 476s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 476s gpg: Signature made Mon Mar 31 12:26:09 2025 UTC 476s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 476s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 476s gpg: WARNING: This key is not certified with a trusted signature! 476s gpg: There is no indication that the signature belongs to the owner. 476s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 476s + t-ok 476s + : ======================================== 476s + t-check-only-bpd 476s + '[' .. = .. ']' 476s + return 476s + t-fscks 476s + shopt -s nullglob 476s + for d in $tmp/*/.git $tmp/git/*.git 476s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 476s + t-git-fsck 476s ++ git rev-parse --git-dir 476s + local fsckerrs=.git/dgit-test-fsck.errs 476s + set +e 476s + LC_MESSAGES=C 476s + git fsck --no-dangling --strict 476s + tee .git/dgit-test-fsck.errs 476s + ps='0 0' 476s + set -e 476s + local pats 476s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 476s + test '0 0' = '0 0' 476s + pats+=(-e 'notice: HEAD points to an unborn branch') 476s + pats+=(-e 'notice: No default references') 476s + set +e 476s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 476s + rc=1 476s + set -e 476s + case $rc in 476s + for d in $tmp/*/.git $tmp/git/*.git 476s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 476s + t-git-fsck 476s ++ git rev-parse --git-dir 476s + local fsckerrs=./dgit-test-fsck.errs 476s + set +e 476s + LC_MESSAGES=C 476s + git fsck --no-dangling --strict 476s + tee ./dgit-test-fsck.errs 476s + ps='0 0' 476s + set -e 476s + local pats 476s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 476s + test '0 0' = '0 0' 476s + pats+=(-e 'notice: HEAD points to an unborn branch') 476s + pats+=(-e 'notice: No default references') 476s + set +e 476s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 476s + rc=1 476s + set -e 476s + case $rc in 476s + t-save-artifacts 476s + artifacts=/tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts 476s + '[' x/tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts = x ']' 476s + '[' xtmp = x ']' 476s + GZIP=-1v 476s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/drs-clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 476s gzip: warning: GZIP environment variable is deprecated; use an alias or script 476s 75.0% 476s + echo ok. 476s ok. 476s + rc=0 476s + set +x 476s + set +e 476s + pwd 476s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 476s + '[' x '!=' x ']' 476s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 476s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 476s + set -e 476s + test 0 = 0 476s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 11210 476s PID TTY STAT TIME COMMAND 476s 11210 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 477s autopkgtest [12:26:11]: test drs-clone-nogit: -----------------------] 477s drs-clone-nogit PASS 477s autopkgtest [12:26:11]: test drs-clone-nogit: - - - - - - - - - - results - - - - - - - - - - 477s autopkgtest [12:26:11]: test dsd-clone-nogit: preparing testbed 477s Reading package lists... 478s Building dependency tree... 478s Reading state information... 478s Starting pkgProblemResolver with broken count: 0 478s Starting 2 pkgProblemResolver with broken count: 0 478s Done 478s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 478s autopkgtest [12:26:12]: test dsd-clone-nogit: [----------------------- 478s ++ set -o pipefail 478s ++ . tests/lib-core 478s ++ . tests/lib-restricts 478s ++ trap ' 478s rc=$? 478s set +x 478s test $rc = 0 || echo " 478s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 478s 478s Most relevant logs are just before assignment rc=$rc 478s Will now do cleanup etc. 478s " 478s set -x 478s set +e 478s pwd 478s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 478s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 478s set -e 478s test $rc = 0 || t-report-failure 478s ' EXIT 478s ++ t-filter-out-git-hyphen-dir 478s ++ local pathent 478s +++ type -p git-rev-parse 478s +++ : 478s ++ pathent= 478s ++ case "$pathent" in 478s ++ return 478s ++ t-set-intree 478s ++ '[' x = x ']' 478s ++ return 478s ++ : -D 478s ++ export DGIT_TEST_DEBUG 478s ++ : x 478s ++ export DGIT_TEST_DEBPUSH_DEBUG 478s ++ : 478s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 478s ++ GIT_COMMITTER_DATE='1530000000 +0100' 478s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 478s ++ GIT_AUTHOR_DATE='1530000000 +0100' 478s ++ export LC_CTYPE=C.UTF-8 478s ++ LC_CTYPE=C.UTF-8 478s ++ unset CDPATH 478s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 478s ++ FILTER_BRANCH_SQUELCH_WARNING=1 478s +++ pwd 478s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 478s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 478s ++ testname=dsd-clone-nogit 478s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 478s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 478s ++ bpd=.. 478s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 478s ++ '[' x '!=' x ']' 478s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s +++ pwd 478s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ t-set-using-tmp 478s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 478s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 478s ++ export 'DEBFULLNAME=dgit test git user' 478s ++ DEBFULLNAME='dgit test git user' 478s ++ git config --global user.email dgit-test@debian.example.net 478s ++ git config --global user.name 'dgit test git user' 478s ++ git config --global protocol.ext.allow always 478s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 478s ++ env -0 478s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 478s ++ export DEBCHANGE_VENDOR=dpkg 478s ++ DEBCHANGE_VENDOR=dpkg 478s ++ unset VISUAL 478s ++ unset GIT_EDITOR 478s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 478s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 478s ++ cat 478s ++ schroot=build 478s ++ : aq 478s ++ : archive/test-dummy 478s ++ : sid:unstable 478s ++ t-git-config dgit.default.old-dsc-distro test-dummy 478s ++ git config --global dgit.default.old-dsc-distro test-dummy 478s ++ for import in ${autoimport-gnupg} 478s ++ case "$0" in 478s ++ t-setup-import gnupg 478s ++ local setupname=gnupg 478s ++ local setupsrc 478s ++ local lock 478s ++ '[' x = x ']' 478s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 478s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 478s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 478s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 478s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 478s cd "$1"; shift 478s setupname="$1"; shift 478s simport="$1"; shift 478s if [ -e "$simport" ]; then exit 0; fi 478s env - "$@" \ 478s "tests/setup/$setupname" 478s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 478s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 478s + shift 478s + setupname=gnupg 478s + shift 478s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 478s + shift 478s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 478s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-stderr --stdout=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/dsd-clone-nogit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/dsd-clone-nogit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 478s ++ set -o pipefail 478s ++ . tests/lib-core 478s ++ . tests/lib-restricts 478s ++ trap ' 478s rc=$? 478s set +x 478s test $rc = 0 || echo " 478s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 478s 478s Most relevant logs are just before assignment rc=$rc 478s Will now do cleanup etc. 478s " 478s set -x 478s set +e 478s pwd 478s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 478s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 478s set -e 478s test $rc = 0 || t-report-failure 478s ' EXIT 478s ++ t-filter-out-git-hyphen-dir 478s ++ local pathent 478s +++ type -p git-rev-parse 478s +++ : 479s ++ pathent= 479s ++ case "$pathent" in 479s ++ return 479s ++ t-set-intree 479s ++ '[' x = x ']' 479s ++ return 479s ++ : -D 479s ++ export DGIT_TEST_DEBUG 479s ++ : x 479s ++ export DGIT_TEST_DEBPUSH_DEBUG 479s ++ : 479s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 479s ++ GIT_COMMITTER_DATE='1530000000 +0100' 479s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 479s ++ GIT_AUTHOR_DATE='1530000000 +0100' 479s ++ export LC_CTYPE=C.UTF-8 479s ++ LC_CTYPE=C.UTF-8 479s ++ unset CDPATH 479s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 479s ++ FILTER_BRANCH_SQUELCH_WARNING=1 479s +++ pwd 479s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 479s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 479s ++ testname=gnupg 479s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 479s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 479s ++ bpd=.. 479s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 479s ++ '[' x '!=' x ']' 479s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s +++ pwd 479s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ t-set-using-tmp 479s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 479s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 479s ++ export 'DEBFULLNAME=dgit test git user' 479s ++ DEBFULLNAME='dgit test git user' 479s ++ git config --global user.email dgit-test@debian.example.net 479s ++ git config --global user.name 'dgit test git user' 479s ++ git config --global protocol.ext.allow always 479s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 479s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 479s ++ export DEBCHANGE_VENDOR=dpkg 479s ++ DEBCHANGE_VENDOR=dpkg 479s ++ unset VISUAL 479s ++ unset GIT_EDITOR 479s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 479s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 479s ++ cat 479s ++ schroot=build 479s ++ : aq 479s ++ : archive/test-dummy 479s ++ : sid:unstable 479s ++ t-git-config dgit.default.old-dsc-distro test-dummy 479s ++ git config --global dgit.default.old-dsc-distro test-dummy 479s ++ for import in ${autoimport-gnupg} 479s ++ case "$0" in 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 479s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 479s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 479s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 479s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 479s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 479s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 479s + setup=' 479s export GNUPGHOME=$tmp/gnupg 479s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 479s 479s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 479s ssb rsa2048 2013-11-17 [E] 479s 479s sec rsa2048 2014-01-26 [SC] 479s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 479s uid [ultimate] Populus Romanus (test key) 479s ssb rsa2048 2014-01-26 [E] 479s 479s sec rsa2048 2014-01-26 [SC] 479s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 479s uid [ unknown] Hannibal (test key) 479s ssb rsa2048 2014-01-26 [E] 479s 479s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 479s export GNUPGHOME=$tmp/gnupg 479s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 479s 479s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/must-clean/git-check.port $tmp/git 479s read <$tmp/must-clean/git-check.port git_check_port 479s 479s t-git-config --global dgit-distro.test-dummy.git-check url 479s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 479s t-git-config --global dgit-distro.test-dummy.git-check-url \ 479s http://127.0.0.1:$git_check_port 479s ' 479s + local savevars= 479s + local savedirs=--files-from=/dev/null 479s + local 'importeval= 479s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 479s read <$tmp/must-clean/git-check.port git_check_port 479s 479s t-git-config --global dgit-distro.test-dummy.git-check url 479s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 479s t-git-config --global dgit-distro.test-dummy.git-check-url \ 479s http://127.0.0.1:$git_check_port 479s ' 479s + local import=IMPORT.http-git-check 479s + exec 479s + local vn 479s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 479s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 479s print STDERR "saving-exporting $vn\n"; 479s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 479s or die $!; 479s } 479s ' 479s saving-exporting DGIT_TEST_REAL_GPG_AGENT 479s saving-exporting DGIT_TEST_REAL_GPG 479s + set -e 479s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 479s + printf '\n%s\n' ' 479s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 479s read <$tmp/must-clean/git-check.port git_check_port 479s 479s t-git-config --global dgit-distro.test-dummy.git-check url 479s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 479s t-git-config --global dgit-distro.test-dummy.git-check-url \ 479s http://127.0.0.1:$git_check_port 479s ' 479s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 479s + rc=0 479s + set +x 479s + set +e 479s + pwd 479s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s + '[' x '!=' x ']' 479s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 479s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 479s + set -e 479s + test 0 = 0 479s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 479s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 479s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 479s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 479s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 479s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 479s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 479s ++ read git_check_port 479s ++ t-git-config --global dgit-distro.test-dummy.git-check url 479s ++ git config --global --global dgit-distro.test-dummy.git-check url 479s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 479s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 479s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:37737 479s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:37737 479s + t-archive pari-extra 3-1 479s + t-archive-none pari-extra 479s + t-select-package pari-extra 479s + p=pari-extra 479s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 479s + t-archive-none-aq 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 479s + : 479s + local 'jsondelim=[' 479s + local suitespec 479s + for suitespec in $suitespecs 479s + local suite=sid 479s + local sname=unstable 479s + t-aq-archive-updated sid pari-extra 479s + local suite=sid 479s + local p=pari-extra 479s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 479s + perl -wne ' 479s use JSON; 479s use strict; 479s our @v; 479s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 479s push @v, { 479s "version" => "$1", 479s "sha256sum" => "$2", 479s "component" => "$3", 479s "filename" => "$4", 479s }; 479s END { 479s my $json = JSON->new->canonical(); 479s print $json->encode(\@v) or die $!; 479s } 479s ' 479s + t-aq-archive-updated new pari-extra 479s + local suite=new 479s + local p=pari-extra 479s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 479s + perl -wne ' 479s use JSON; 479s use strict; 479s our @v; 479s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 479s push @v, { 479s "version" => "$1", 479s "sha256sum" => "$2", 479s "component" => "$3", 479s "filename" => "$4", 479s }; 479s END { 479s my $json = JSON->new->canonical(); 479s print $json->encode(\@v) or die $!; 479s } 479s ' 479s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 479s + cat 479s + jsondelim=' },' 479s + cat 479s + v=3-1 479s + local dscf=pari-extra_3-1.dsc 479s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/pari-extra_*' 479s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/pari-extra_3.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 479s + t-archive-query 479s + local suite=sid 479s + local dscf=main/pari-extra_3-1.dsc 479s + t-archive-query-aq sid pari-extra 3-1 main/pari-extra_3-1.dsc 479s + local suite=sid 479s + local p=pari-extra 479s + local v=3-1 479s + local dscf=main/pari-extra_3-1.dsc 479s + local sha 479s ++ sha256sum 479s + sha='c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 -' 479s + echo '3-1 c6c77977099ba4b1f98414ef1d554013642c6664852573d7a290b9db444f98b6 main/pari-extra_3-1.dsc' 479s + t-aq-archive-updated sid pari-extra 479s + local suite=sid 479s + local p=pari-extra 479s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 479s + perl -wne ' 479s use JSON; 479s use strict; 479s our @v; 479s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 479s push @v, { 479s "version" => "$1", 479s "sha256sum" => "$2", 479s "component" => "$3", 479s "filename" => "$4", 479s }; 479s END { 479s my $json = JSON->new->canonical(); 479s print $json->encode(\@v) or die $!; 479s } 479s ' 479s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 479s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 479s + set -e 479s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 479s + dpkg-source -x ../mirror/pool/main/pari-extra_3-1.dsc 479s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/pari-extra_3-1.dsc) 479s dpkg-source: info: extracting pari-extra in pari-extra-3 479s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 479s dpkg-source: info: applying pari-extra_3-1.diff.gz 479s + t-git-none 479s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 479s + set -e 479s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 479s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 479s + t-dgit clone pari-extra 479s + local dgit=dgit 479s + pwd 479s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 479s + : ' 479s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 479s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone pari-extra 479s | git config -z --get-regexp --global '.*' 479s | git config -z --get-regexp --system '.*' 479s clone main body 479s CD pari-extra 479s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 479s canonical suite name for unstable is sid 479s query: fetching http://127.0.0.1:37737/pari-extra.git/HEAD... 479s dgit-repos check_for_git => . 479s + git init -q 479s | git config -z --get-regexp --local '.*' 479s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 479s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 479s + git config user.name 'dgit test git user' 479s is_gitattrs_setup: found nothing 479s starting new git history 479s + git config remote.dgit.skipdefaultupdate true 479s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 479s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 479s get_archive_dsc: Version 3-1 479s last upload to archive: NO git hash 479s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 479s => `' 479s previous reference hash= 479s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 479s => `' 479s fetch_from_archive: lastfetch= 479s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 479s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 479s ./pari-extra_3.orig.tar.gz does not exist, need to fetch 479s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3.orig.tar.gz 479s % Total % Received % Xferd Average Speed Time Time Time Current 479s Dload Upload Total Spent Left Speed 479s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 121 100 121 0 0 3282k 0 --:--:-- --:--:-- --:--:-- 3282k 479s considering saving pari-extra_3.orig.tar.gz: linked. 479s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) (No such file or directory) absent. 479s ./pari-extra_3-1.diff.gz does not exist, need to fetch 479s + curl --proto-redir '-all,http,https' -L -f -o ./pari-extra_3-1.diff.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.diff.gz 479s % Total % Received % Xferd Average Speed Time Time Time Current 479s Dload Upload Total Spent Left Speed 479s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 2357 100 2357 0 0 64.2M 0 --:--:-- --:--:-- --:--:-- 64.2M 479s considering saving pari-extra_3-1.diff.gz: linked. 479s import considering pari-extra_3.orig.tar.gz Y .gz orig 479s + chmod -R '+rwX' _unpack-tar 479s CD _unpack-tar 479s | find -name .git -prune -print0 479s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 479s + git add -Af . 479s | git write-tree 479s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 479s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 479s => `' 479s multiple subtrees 479s CD .. 479s import considering pari-extra_3-1.diff.gz not tar 479s + dpkg-source --no-check -x -- pari-extra.dsc 479s dpkg-source: info: extracting pari-extra in pari-extra-3 479s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 479s dpkg-source: info: applying pari-extra_3-1.diff.gz 479s CD pari-extra-3 479s | find -name .git -prune -print0 479s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 480s + git add -Af . 480s | git write-tree 480s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 480s import clog search... 480s | dpkg-parsechangelog --format rfc822 --all 480s import clog 3-1 package changelog, entry no.1... 480s import clog 3-1 vs 3... 480s import clog 3-1 becomes r1 480s import clog 2.1-1 package changelog, entry no.2... 480s import clog 2.1-1 vs 3... 480s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 480s => `1312546022 +0000' 480s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 480s => `1312546022 +0000' 480s import tartrees authline Bill Allombert 1312546022 +0000 480s import tartrees r1authline Bill Allombert 1312546022 +0000 480s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 480s | git hash-object -w -t commit --stdin 480s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 480s import main commit 480s | git hash-object -w -t commit ../commit.tmp 480s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 480s synthesised git commit from .dsc 3-1 480s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 480s fetch mergeinfos: 480s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 Import of source package 480s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 480s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s => `' 480s + git reset --hard refs/remotes/dgit/dgit/sid 480s HEAD is now at 3d33f8b pari-extra (3-1) unstable; urgency=low 480s + bash -ec ' set -o pipefail 480s git ls-tree -r --name-only -z HEAD | '\\' 480s xargs -0r touch -h -r . -- 480s ' 480s dgit ok: ready for work in pari-extra 480s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 480s del_lrfetchrefs... 480s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 480s ' 480s + cd pari-extra 480s + t-cloned-fetched-good 480s + t-diff-nogit ../extract/pari-extra-3 . 480s + diff --exclude=.git --exclude=.pc -ruN ../extract/pari-extra-3 . 480s + t-clean-on-branch dgit/sid 480s + t-output '## dgit/sid' git status -b --porcelain 480s + printf '%s\n' '## dgit/sid' 480s + shift 480s + git status -b --porcelain 480s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 480s + t-refs-same-start 480s + unset t_ref_val 480s + t_ref_names=() 480s + t-refs-same refs/heads/dgit/sid refs/remotes/dgit/dgit/sid 480s + local g 480s + for g in $* 480s + t-ref-same refs/heads/dgit/sid 480s + local name=refs/heads/dgit/sid 480s + local val 480s ++ t-git-get-ref refs/heads/dgit/sid 480s ++ local ref=refs/heads/dgit/sid 480s ++ case "$ref" in 480s ++ git show-ref -d refs/heads/dgit/sid 480s ++ perl -ne ' 480s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 480s END { print "$x\n" if length $x; } 480s ' 480s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + t-ref-same-val refs/heads/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + local name=refs/heads/dgit/sid 480s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + case "${t_ref_val-unset}" in 480s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + t_ref_names+=("$name") 480s + for g in $* 480s + t-ref-same refs/remotes/dgit/dgit/sid 480s + local name=refs/remotes/dgit/dgit/sid 480s + local val 480s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 480s ++ local ref=refs/remotes/dgit/dgit/sid 480s ++ case "$ref" in 480s ++ git show-ref -d refs/remotes/dgit/dgit/sid 480s ++ perl -ne ' 480s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 480s END { print "$x\n" if length $x; } 480s ' 480s + val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + t-ref-same-val refs/remotes/dgit/dgit/sid 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + local name=refs/remotes/dgit/dgit/sid 480s + local val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + case "${t_ref_val-unset}" in 480s + t_ref_val=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 480s + t_ref_names+=("$name") 480s + t-refs-notexist refs/dgit/unstable refs/remotes/dgit/dgit/unstable 480s + local val 480s + for g in $* 480s ++ t-git-get-ref refs/dgit/unstable 480s ++ local ref=refs/dgit/unstable 480s ++ case "$ref" in 480s ++ git show-ref -d refs/dgit/unstable 480s ++ perl -ne ' 480s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 480s END { print "$x\n" if length $x; } 480s ' 480s ++ test 1 = 1 480s + val= 480s + '[' x '!=' x ']' 480s + for g in $* 480s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 480s ++ local ref=refs/remotes/dgit/dgit/unstable 480s ++ case "$ref" in 480s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 480s ++ perl -ne ' 480s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 480s END { print "$x\n" if length $x; } 480s ' 480s ++ test 1 = 1 480s + val= 480s + '[' x '!=' x ']' 480s + v=3-2~dummy1 480s + t-apply-diff 3-1 3-2~dummy1 480s + local v1=3-1 480s + local v2=3-2~dummy1 480s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs 480s + patch -p1 -u 480s + debdiff pari-extra_3-1.dsc pari-extra_3-2~dummy1.dsc 480s + test 1 = 1 480s patching file debian/changelog 480s patching file debian/control 480s + debcommit -a 480s git commit -m 'Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow.' -a 480s [dgit/sid 6cfbeb5] Dummy change for dgit testing. Add nonexistend build-dependency to break builds in case this package escapes somehow. 480s 2 files changed, 8 insertions(+), 1 deletion(-) 480s + t-refs-same-start 480s + unset t_ref_val 480s + t_ref_names=() 480s + t-ref-head 480s + local val 480s ++ git rev-parse HEAD 480s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 480s + t-ref-same-val HEAD 6cfbeb52ce126ee40067fe8fa263446a79082de7 480s + local name=HEAD 480s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 480s + case "${t_ref_val-unset}" in 480s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 480s + t_ref_names+=("$name") 480s + t-dgit --dpkg-buildpackage:-d build 480s + local dgit=dgit 480s + pwd 480s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 480s + : ' 480s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 480s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --dpkg-buildpackage:-d build 480s | git rev-parse --show-toplevel 480s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 480s | git config -z --get-regexp --local '.*' 480s | git config -z --get-regexp --local '.*' 480s | git config -z --get-regexp --global '.*' 480s | git config -z --get-regexp --system '.*' 480s format , quilt mode linear 480s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 480s warning: could not open directory 'debian/source/': No such file or directory 480s => `' 480s + git diff --quiet HEAD 480s massage split -F. 480s massage done 3 -b. 480s format , quilt mode linear 480s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 480s warning: could not open directory 'debian/source/': No such file or directory 480s => `' 480s + git diff --quiet HEAD 480s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -T clean 480s dpkg-buildpackage: info: source package pari-extra 480s dpkg-buildpackage: info: source version 3-2~dummy1 480s dpkg-buildpackage: info: source distribution unstable 480s dpkg-buildpackage: info: source changed by Senatus Romanus 480s fakeroot debian/rules clean 480s dh_testdir 480s dh_testroot 480s rm -f build-stamp 480s dh_clean 480s | git clean -dn 480s => `' 480s | git rev-parse 'HEAD~0' 480s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 480s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 480s QF linkorigs pari-extra_3.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3.orig.tar.gz Y 480s CD work 480s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 480s + git reset -q --hard 6cfbeb52ce126ee40067fe8fa263446a79082de7 480s CD .. 480s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 480s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 480s dpkg-source: warning: source directory 'work' is not - 'pari-extra-3' 480s dpkg-source: warning: .orig directory name work.orig is not - (wanted pari-extra-3.orig) 480s dpkg-source: info: using source format '1.0' 480s dpkg-source: info: building pari-extra using existing pari-extra_3.orig.tar.gz 480s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.diff.gz 480s dpkg-source: info: building pari-extra in pari-extra_3-2~dummy1.dsc 480s CD work 480s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 480s changelog will contain changes since 3-1 480s + sh -ec 'exec >../$1; shift; exec "$@"' x 'pari-extra_3-2~dummy1_source.changes' dpkg-genchanges -S -v3-1 480s dpkg-genchanges: info: not including original source code in upload 480s CD .. 480s moving pari-extra_3-2~dummy1.dsc, pari-extra_3-2~dummy1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.. 480s renaming (Files) pari-extra_3.orig.tar.gz 480s renaming (Files) pari-extra_3-2~dummy1.diff.gz 480s renaming (dsc) pari-extra_3-2~dummy1.dsc 480s renaming (changes) pari-extra_3-2~dummy1_source.changes 480s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 480s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -d -us -uc -nc -b -v3-1 481s dpkg-buildpackage: info: source package pari-extra 481s dpkg-buildpackage: info: source version 3-2~dummy1 481s dpkg-buildpackage: info: source distribution unstable 481s dpkg-buildpackage: info: source changed by Senatus Romanus 481s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --before-build . 481s dpkg-buildpackage: info: host architecture amd64 481s debian/rules build 481s dh_testdir 481s touch build-stamp 481s fakeroot debian/rules binary 481s dh_testdir 481s dh_testroot 481s dh_prep 481s dh_installdirs 481s dh_testdir 481s dh_testroot 481s dh_installdocs 481s dh_installexamples 481s dh_installchangelogs 481s dh_link 481s dh_strip 481s dh_compress 481s dh_fixperms 481s dh_installdeb 481s dh_gencontrol 481s dh_md5sums 481s dh_builddeb 481s dpkg-deb: building package 'pari-extra' in '../pari-extra_3-2~dummy1_all.deb'. 481s dpkg-genbuildinfo --build=binary -O../pari-extra_3-2~dummy1_amd64.buildinfo 482s dpkg-genchanges --build=binary -v3-1 -O../pari-extra_3-2~dummy1_amd64.changes 482s dpkg-genchanges: info: binary-only upload (no source code included) 482s dpkg-source -i(?:^|/)\.git(?:/|$) -I.git --after-build . 482s dpkg-buildpackage: info: binary-only upload (no source included) 482s CD .. 482s + mergechanges -f 'pari-extra_3-2~dummy1_source.changes' 'pari-extra_3-2~dummy1_amd64.changes' 482s dgit ok: build successful, results in pari-extra_3-2~dummy1_multi.changes 482s 482s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 482s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 482s ' 482s + t-dgit push 482s + local dgit=dgit 482s + pwd 482s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 482s + : ' 482s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 482s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push 482s | git rev-parse --show-toplevel 482s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra' 482s | git config -z --get-regexp --local '.*' 482s | git config -z --get-regexp --local '.*' 482s | git config -z --get-regexp --global '.*' 482s | git config -z --get-regexp --system '.*' 482s format , quilt mode linear 482s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 482s warning: could not open directory 'debian/source/': No such file or directory 482s => `' 482s + git diff --quiet HEAD 482s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 482s canonical suite name for unstable is sid 482s actually entering push 482s query: fetching http://127.0.0.1:37737/pari-extra.git/HEAD... 482s dgit-repos check_for_git => . 482s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/pari-extra... 482s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/pari-extra_3-1.dsc... 482s get_archive_dsc: Version 3-1 482s last upload to archive: NO git hash 482s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 482s => `' 482s previous reference hash= 482s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 482s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 482s fetch_from_archive: lastfetch=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 482s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 482s considering reusing pari-extra_3.orig.tar.gz: (No such file or directory) linked. 482s using existing pari-extra_3.orig.tar.gz 482s considering saving pari-extra_3.orig.tar.gz: (File exists) no need. 482s considering reusing pari-extra_3-1.diff.gz: (No such file or directory) linked. 482s using existing pari-extra_3-1.diff.gz 482s considering saving pari-extra_3-1.diff.gz: (File exists) no need. 482s import considering pari-extra_3.orig.tar.gz Y .gz orig 482s + chmod -R '+rwX' _unpack-tar 482s CD _unpack-tar 482s | find -name .git -prune -print0 482s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 482s + git add -Af . 482s | git write-tree 482s => `4b825dc642cb6eb9a060e54bf8d69288fbee4904' 482s | git ls-tree -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 482s => `' 482s multiple subtrees 482s CD .. 482s import considering pari-extra_3-1.diff.gz not tar 482s + dpkg-source --no-check -x -- pari-extra.dsc 483s dpkg-source: info: extracting pari-extra in pari-extra-3 483s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 483s dpkg-source: info: applying pari-extra_3-1.diff.gz 483s CD pari-extra-3 483s | find -name .git -prune -print0 483s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 483s + git add -Af . 483s | git write-tree 483s => `3dd40eca2f3710d9a6c009f7c05fe437ac74bfa5' 483s import clog search... 483s | dpkg-parsechangelog --format rfc822 --all 483s import clog 3-1 package changelog, entry no.1... 483s import clog 3-1 vs 3... 483s import clog 3-1 becomes r1 483s import clog 2.1-1 package changelog, entry no.2... 483s import clog 2.1-1 vs 3... 483s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 483s => `1312546022 +0000' 483s | date '+%s %z' -d 'Fri, 05 Aug 2011 14:07:02 +0200' 483s => `1312546022 +0000' 483s import tartrees authline Bill Allombert 1312546022 +0000 483s import tartrees r1authline Bill Allombert 1312546022 +0000 483s import tartree pari-extra_3.orig.tar.gz 4b825dc642cb6eb9a060e54bf8d69288fbee4904 483s | git hash-object -w -t commit --stdin 483s => 104bdf7a61eb71f4f1c0eafdd4c7e9c5bf702929 483s import main commit 483s | git hash-object -w -t commit ../commit.tmp 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s synthesised git commit from .dsc 3-1 483s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 483s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgitclog; exec "$@"' x git cat-file blob 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0:debian/changelog 483s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s fetch mergeinfos: 483s commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 dgit client's archive history view 483s fetch hash=3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 483s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 483s | git log -n2 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 483s => `commit 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0'... 483s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 483s + git check-ref-format archive/test-dummy/3-2_dummy1 483s | git symbolic-ref -q HEAD 483s => `refs/heads/dgit/sid' 483s | git rev-parse 'HEAD~0' 483s => `6cfbeb52ce126ee40067fe8fa263446a79082de7' 483s ffq_prev_branchinfo branch current refs/heads/dgit/sid 483s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/dgit/sid' 483s => `' 483s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/dgit/sid' 483s => `' 483s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 483s warning: could not open directory 'debian/source/': No such file or directory 483s => `' 483s + git diff --quiet HEAD 483s | git merge-base 3d33f8ba7e9734a44de8e8a8dfc247c408e006c0 6cfbeb52ce126ee40067fe8fa263446a79082de7 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git rev-parse '3d33f8ba7e9734a44de8e8a8dfc247c408e006c0~0' 483s => `3d33f8ba7e9734a44de8e8a8dfc247c408e006c0' 483s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/3-2_dummy1' 483s => `' 483s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/unpack 483s checking that pari-extra_3-2~dummy1.dsc corresponds to HEAD 483s + dpkg-source -x -- '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc' 483s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/../pari-extra_3-2~dummy1.dsc) 483s dpkg-source: info: extracting pari-extra in pari-extra-3 483s dpkg-source: info: unpacking pari-extra_3.orig.tar.gz 483s dpkg-source: info: applying pari-extra_3-2~dummy1.diff.gz 483s CD pari-extra-3 483s | find -name .git -prune -print0 483s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 483s + git add -Af . 483s | git write-tree 483s => `59d0825204e6551ec6bcd704839aae32586014f4' 483s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 483s + git diff --quiet 59d0825204e6551ec6bcd704839aae32586014f4 6cfbeb52ce126ee40067fe8fa263446a79082de7 483s files_compare_inputs pari-extra_3-2~dummy1.dsc 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3.orig.tar.gz 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3.orig.tar.gz 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Files 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3.orig.tar.gz 483s files_compare_inputs pari-extra_3-2~dummy1.dsc Files pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.dsc 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_all.deb 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha256 pari-extra_3-2~dummy1_amd64.buildinfo 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.dsc 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_all.deb 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Checksums-Sha1 pari-extra_3-2~dummy1_amd64.buildinfo 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.dsc 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1.diff.gz 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_all.deb 483s files_compare_inputs pari-extra_3-2~dummy1_multi.changes Files pari-extra_3-2~dummy1_amd64.buildinfo 483s checking origs needed (3)... 483s checking origs needed placement 'math optional'... 483s origs pari-extra_3.orig.tar.gz | 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz 483s origs pari-extra_3.orig.tar.gz is_orig 483s -| sh -ec 'cd "$1"; shift 483s 483s find -name "$1" -print0 | 483s xargs -0r sha256sum 483s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ pari-extra_3.orig.tar.gz 483s | ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df ./pool/main/pari-extra_3.orig.tar.gz 483s origs pari-extra_3.orig.tar.gz $#$have=0 483s origs pari-extra_3.orig.tar.gz f.same=1 #f._differ=-1 483s origs pari-extra_3-2~dummy1.diff.gz | 53d67266a6a9646cb1d0d40722249214 2522 pari-extra_3-2~dummy1.diff.gz 483s ../pari-extra_3-2~dummy1_multi.changes already has appropriate .orig(s) (if any) 483s push_tagwants: $VAR1 = [ 483s '3-2~dummy1', 483s '6cfbeb52ce126ee40067fe8fa263446a79082de7', 483s undef, 483s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag' 483s ]; 483s $VAR2 = [ 483s { 483s 'Tfn' => sub { "DUMMY" }, 483s 'View' => 'dgit', 483s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 483s 'Tag' => 'archive/test-dummy/3-2_dummy1', 483s 'TfSuffix' => '', 483s 'TagFn' => sub { "DUMMY" } 483s }, 483s { 483s 'Tfn' => sub { "DUMMY" }, 483s 'Objid' => '6cfbeb52ce126ee40067fe8fa263446a79082de7', 483s 'View' => 'dgit', 483s 'Tag' => 'test-dummy/3-2_dummy1', 483s 'TagFn' => sub { "DUMMY" }, 483s 'TfSuffix' => '-dgit' 483s } 483s ]; 483s | date '+%s %z' -d 'Sun, 17 Nov 2013 14:34:17 +0000' 483s => `1384698857 +0000' 483s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp 483s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 483s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.tmp.asc 483s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp 483s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 483s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.tmp.asc 483s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag.signed.tmp 483s => `2227b5dcb94e080e596a140f78a23f1d84522d32' 483s + git verify-tag 2227b5dcb94e080e596a140f78a23f1d84522d32 483s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 483s gpg: Signature made Mon Mar 31 12:26:17 2025 UTC 483s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 483s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 483s gpg: WARNING: This key is not certified with a trusted signature! 483s gpg: There is no indication that the signature belongs to the owner. 483s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 483s + git update-ref refs/tags/archive/test-dummy/3-2_dummy1 2227b5dcb94e080e596a140f78a23f1d84522d32 483s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra/.git/dgit/tag-dgit.signed.tmp 483s => `93ef70671f230c96aa6084cc591420cfc7540c4b' 483s + git verify-tag 93ef70671f230c96aa6084cc591420cfc7540c4b 483s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 483s gpg: Signature made Mon Mar 31 12:26:17 2025 UTC 483s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 483s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 483s gpg: WARNING: This key is not certified with a trusted signature! 483s gpg: There is no indication that the signature belongs to the owner. 483s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 483s + git update-ref refs/tags/test-dummy/3-2_dummy1 93ef70671f230c96aa6084cc591420cfc7540c4b 483s query: fetching http://127.0.0.1:37737/pari-extra.git/HEAD... 483s dgit-repos check_for_git => . 483s + git -c push.followTags=false push 'ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git' 6cfbeb52ce126ee40067fe8fa263446a79082de7:refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 refs/tags/test-dummy/3-2_dummy1 483s (((((((((((((((((((((((((((((((((((((((( 483s + tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 483s + cd / 483s + userhost=X 483s + shift 483s + export SSH_ORIGINAL_COMMAND=git-receive-pack /dgit/test-dummy/repos/pari-extra.git 483s + unset PERLLIB 483s + dgit-ssh-dispatch -D /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 483s DISPATCH DIVERT ^no-such-package.*$ drs 483s DISPATCH DISTRO test-dummy PKG pari-extra 483s warning: You appear to have cloned an empty repository. 483s remote: gpgv: Signature made Mon Mar 31 12:26:17 2025 UTC 483s remote: gpgv: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 483s remote: gpgv: Good signature from "Senatus Romanus (test key) " 483s remote: To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/repos/_tmp/pari-extra_prospective 483s remote: * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 483s remote: * [new tag] 2227b5dcb94e080e596a140f78a23f1d84522d32 -> archive/test-dummy/3-2_dummy1 483s remote: * [new tag] 93ef70671f230c96aa6084cc591420cfc7540c4b -> test-dummy/3-2_dummy1 484s remote: To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/distro=test-dummy/repos/_tmp/pari-extra_prospective 484s remote: * [new branch] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> master 484s + : )))))))))))))))))))))))))))))))))))))))) 484s To ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git 484s * [new reference] 6cfbeb52ce126ee40067fe8fa263446a79082de7 -> refs/dgit/sid 484s * [new tag] archive/test-dummy/3-2_dummy1 -> archive/test-dummy/3-2_dummy1 484s * [new tag] test-dummy/3-2_dummy1 -> test-dummy/3-2_dummy1 484s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../pari-extra_3-2~dummy1_multi.changes' 484s signfile dsc ../pari-extra_3-2~dummy1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s 484s signfile buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s 484s fixup_changes dsc ../pari-extra_3-2~dummy1.dsc ../pari-extra_3-2~dummy1_multi.changes 484s fixup_changes buildinfo ../pari-extra_3-2~dummy1_amd64.buildinfo ../pari-extra_3-2~dummy1_multi.changes 484s signfile changes ../pari-extra_3-2~dummy1_multi.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s 484s Successfully signed dsc, buildinfo, changes files 484s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy '../pari-extra_3-2~dummy1_multi.changes' 484s gpg: ../pari-extra_3-2~dummy1_multi.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 484s gpg: ../pari-extra_3-2~dummy1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 484s D: Setting host argument. 484s Checking signature on .changes 484s Checking signature on .dsc 484s Uploading to test-dummy (via local to localhost): 484s Successfully uploaded packages. 484s dgit ok: pushed and uploaded 3-2~dummy1 484s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 484s del_lrfetchrefs... 484s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 484s ' 484s + t-pushed-good dgit/sid 484s + local branch=dgit/sid 484s + local suite=sid 484s + t-refs-same refs/heads/dgit/sid 484s + local g 484s + for g in $* 484s + t-ref-same refs/heads/dgit/sid 484s + local name=refs/heads/dgit/sid 484s + local val 484s ++ t-git-get-ref refs/heads/dgit/sid 484s ++ local ref=refs/heads/dgit/sid 484s ++ case "$ref" in 484s ++ git show-ref -d refs/heads/dgit/sid 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/sid\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val refs/heads/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=refs/heads/dgit/sid 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s + t-pushed-good-core 484s + t-ref-dsc-dgit 484s + t-incoming-dsc 484s + local dsc=pari-extra_3-2~dummy1.dsc 484s + incoming_dsc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 484s + local val 484s ++ t-822-field /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit 484s ++ local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 484s ++ local field=Dgit 484s ++ perl -e ' 484s use Dpkg::Control::Hash; 484s my $h = new Dpkg::Control::Hash allow_pgp=>1; 484s $h->parse(\*STDIN,"/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc"); 484s my $val = $h->{"Dgit"},"\n"; 484s die "/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc Dgit" unless defined $val; 484s print $val,"\n"; 484s ' 484s + val='6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git' 484s ++ perl -e ' 484s $_=shift @ARGV; 484s die "Dgit $_ ?" unless m/^\w+\b/; 484s print $&,"\n" or die $!; 484s ' '6cfbeb52ce126ee40067fe8fa263446a79082de7 test-dummy archive/test-dummy/3-2_dummy1 ext::/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/dsd-ssh X %S /dgit/test-dummy/repos/pari-extra.git' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/pari-extra_3-2~dummy1.dsc 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s ++ t-v-tag 484s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 484s + t-refs-same refs/tags/archive/test-dummy/3-2_dummy1 refs/remotes/dgit/dgit/sid 484s + local g 484s + for g in $* 484s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 484s + local name=refs/tags/archive/test-dummy/3-2_dummy1 484s + local val 484s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 484s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 484s ++ case "$ref" in 484s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=refs/tags/archive/test-dummy/3-2_dummy1 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s + for g in $* 484s + t-ref-same refs/remotes/dgit/dgit/sid 484s + local name=refs/remotes/dgit/dgit/sid 484s + local val 484s ++ t-git-get-ref refs/remotes/dgit/dgit/sid 484s ++ local ref=refs/remotes/dgit/dgit/sid 484s ++ case "$ref" in 484s ++ git show-ref -d refs/remotes/dgit/dgit/sid 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/sid\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val refs/remotes/dgit/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=refs/remotes/dgit/dgit/sid 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s + t-refs-notexist refs/heads/dgit/unstable refs/remotes/dgit/dgit/unstable 484s + local val 484s + for g in $* 484s ++ t-git-get-ref refs/heads/dgit/unstable 484s ++ local ref=refs/heads/dgit/unstable 484s ++ case "$ref" in 484s ++ git show-ref -d refs/heads/dgit/unstable 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/heads/dgit/unstable\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s ++ test 1 = 1 484s + val= 484s + '[' x '!=' x ']' 484s + for g in $* 484s ++ t-git-get-ref refs/remotes/dgit/dgit/unstable 484s ++ local ref=refs/remotes/dgit/dgit/unstable 484s ++ case "$ref" in 484s ++ git show-ref -d refs/remotes/dgit/dgit/unstable 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/remotes/dgit/dgit/unstable\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s ++ test 1 = 1 484s + val= 484s + '[' x '!=' x ']' 484s + set -e 484s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 484s ++ t-v-tag 484s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 484s + t-refs-same refs/dgit/sid refs/tags/archive/test-dummy/3-2_dummy1 484s + local g 484s + for g in $* 484s + t-ref-same refs/dgit/sid 484s + local name=refs/dgit/sid 484s + local val 484s ++ t-git-get-ref refs/dgit/sid 484s ++ local ref=refs/dgit/sid 484s ++ case "$ref" in 484s ++ git show-ref -d refs/dgit/sid 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/dgit/sid\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val refs/dgit/sid 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=refs/dgit/sid 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s + for g in $* 484s + t-ref-same refs/tags/archive/test-dummy/3-2_dummy1 484s + local name=refs/tags/archive/test-dummy/3-2_dummy1 484s + local val 484s ++ t-git-get-ref refs/tags/archive/test-dummy/3-2_dummy1 484s ++ local ref=refs/tags/archive/test-dummy/3-2_dummy1 484s ++ case "$ref" in 484s ++ git show-ref -d refs/tags/archive/test-dummy/3-2_dummy1 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/tags/archive/test-dummy/3-2_dummy1\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t-ref-same-val refs/tags/archive/test-dummy/3-2_dummy1 6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + local name=refs/tags/archive/test-dummy/3-2_dummy1 484s + local val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + case "${t_ref_val-unset}" in 484s + t_ref_val=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + t_ref_names+=("$name") 484s + t-check-pushed-master 484s + local master 484s ++ t-git-get-ref refs/heads/master 484s ++ local ref=refs/heads/master 484s ++ case "$ref" in 484s ++ git show-ref -d refs/heads/master 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/heads/master\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s + master=6cfbeb52ce126ee40067fe8fa263446a79082de7 484s + '[' x6cfbeb52ce126ee40067fe8fa263446a79082de7 = x6cfbeb52ce126ee40067fe8fa263446a79082de7 ']' 484s + return 484s + t-refs-notexist refs/dgit/unstable 484s + local val 484s + for g in $* 484s ++ t-git-get-ref refs/dgit/unstable 484s ++ local ref=refs/dgit/unstable 484s ++ case "$ref" in 484s ++ git show-ref -d refs/dgit/unstable 484s ++ perl -ne ' 484s $x = $1 if m#^(\w+) \Qrefs/dgit/unstable\E(?:\^\{\})?$#; 484s END { print "$x\n" if length $x; } 484s ' 484s ++ test 1 = 1 484s + val= 484s + '[' x '!=' x ']' 484s ++ t-v-tag 484s ++ echo refs/tags/archive/test-dummy/3-2_dummy1 484s + git verify-tag refs/tags/archive/test-dummy/3-2_dummy1 484s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 484s gpg: Signature made Mon Mar 31 12:26:17 2025 UTC 484s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 484s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 484s gpg: WARNING: This key is not certified with a trusted signature! 484s gpg: There is no indication that the signature belongs to the owner. 484s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 484s + t-ok 484s + : ======================================== 484s + t-check-only-bpd 484s + '[' .. = .. ']' 484s + return 484s + t-fscks 484s + shopt -s nullglob 484s + for d in $tmp/*/.git $tmp/git/*.git 484s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 484s + t-git-fsck 484s ++ git rev-parse --git-dir 484s + local fsckerrs=.git/dgit-test-fsck.errs 484s + set +e 484s + LC_MESSAGES=C 484s + git fsck --no-dangling --strict 484s + tee .git/dgit-test-fsck.errs 484s + ps='0 0' 484s + set -e 484s + local pats 484s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 484s + test '0 0' = '0 0' 484s + pats+=(-e 'notice: HEAD points to an unborn branch') 484s + pats+=(-e 'notice: No default references') 484s + set +e 484s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 484s + rc=1 484s + set -e 484s + case $rc in 484s + for d in $tmp/*/.git $tmp/git/*.git 484s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/pari-extra.git 484s + t-git-fsck 484s ++ git rev-parse --git-dir 484s + local fsckerrs=./dgit-test-fsck.errs 484s + set +e 484s + LC_MESSAGES=C 484s + git fsck --no-dangling --strict 484s + tee ./dgit-test-fsck.errs 484s + ps='0 0' 484s + set -e 484s + local pats 484s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 484s + test '0 0' = '0 0' 484s + pats+=(-e 'notice: HEAD points to an unborn branch') 484s + pats+=(-e 'notice: No default references') 484s + set +e 484s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 484s + rc=1 484s + set -e 484s + case $rc in 484s + t-save-artifacts 484s + artifacts=/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts 484s + '[' x/tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts = x ']' 484s + '[' xtmp = x ']' 484s + GZIP=-1v 484s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/dsd-clone-nogit-artifacts/clone-nogit.tar.gz '--exclude=*.tar' . 484s gzip: warning: GZIP environment variable is deprecated; use an alias or script 484s 74.9% 484s + echo ok. 484s ok. 484s + rc=0 484s + set +x 484s + set +e 484s + pwd 484s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/pari-extra 484s + '[' x '!=' x ']' 484s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 484s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 484s + set -e 484s + test 0 = 0 484s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 13024 484s PID TTY STAT TIME COMMAND 484s 13024 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 485s autopkgtest [12:26:19]: test dsd-clone-nogit: -----------------------] 485s dsd-clone-nogit PASS 485s autopkgtest [12:26:19]: test dsd-clone-nogit: - - - - - - - - - - results - - - - - - - - - - 485s autopkgtest [12:26:19]: test ftpmasterapi-http: preparing testbed 485s Reading package lists... 485s Building dependency tree... 485s Reading state information... 485s Starting pkgProblemResolver with broken count: 0 485s Starting 2 pkgProblemResolver with broken count: 0 486s Done 486s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 486s autopkgtest [12:26:20]: test ftpmasterapi-http: [----------------------- 486s ++ set -o pipefail 486s ++ . tests/lib-core 486s ++ . tests/lib-restricts 486s ++ trap ' 486s rc=$? 486s set +x 486s test $rc = 0 || echo " 486s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 486s 486s Most relevant logs are just before assignment rc=$rc 486s Will now do cleanup etc. 486s " 486s set -x 486s set +e 486s pwd 486s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 486s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 486s set -e 486s test $rc = 0 || t-report-failure 486s ' EXIT 486s ++ t-filter-out-git-hyphen-dir 486s ++ local pathent 486s +++ type -p git-rev-parse 486s +++ : 486s ++ pathent= 486s ++ case "$pathent" in 486s ++ return 486s ++ t-set-intree 486s ++ '[' x = x ']' 486s ++ return 486s ++ : -D 486s ++ export DGIT_TEST_DEBUG 486s ++ : x 486s ++ export DGIT_TEST_DEBPUSH_DEBUG 486s ++ : 486s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 486s ++ GIT_COMMITTER_DATE='1530000000 +0100' 486s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 486s ++ GIT_AUTHOR_DATE='1530000000 +0100' 486s ++ export LC_CTYPE=C.UTF-8 486s ++ LC_CTYPE=C.UTF-8 486s ++ unset CDPATH 486s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 486s ++ FILTER_BRANCH_SQUELCH_WARNING=1 486s +++ pwd 486s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 486s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ testname=ftpmasterapi-http 486s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ bpd=.. 486s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 486s ++ '[' x '!=' x ']' 486s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s +++ pwd 486s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ t-set-using-tmp 486s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 486s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 486s ++ export 'DEBFULLNAME=dgit test git user' 486s ++ DEBFULLNAME='dgit test git user' 486s ++ git config --global user.email dgit-test@debian.example.net 486s ++ git config --global user.name 'dgit test git user' 486s ++ git config --global protocol.ext.allow always 486s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 486s ++ env -0 486s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 486s ++ export DEBCHANGE_VENDOR=dpkg 486s ++ DEBCHANGE_VENDOR=dpkg 486s ++ unset VISUAL 486s ++ unset GIT_EDITOR 486s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 486s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 486s ++ cat 486s ++ schroot=build 486s ++ : aq 486s ++ : archive/test-dummy 486s ++ : sid:unstable 486s ++ t-git-config dgit.default.old-dsc-distro test-dummy 486s ++ git config --global dgit.default.old-dsc-distro test-dummy 486s ++ for import in ${autoimport-gnupg} 486s ++ case "$0" in 486s ++ t-setup-import gnupg 486s ++ local setupname=gnupg 486s ++ local setupsrc 486s ++ local lock 486s ++ '[' x = x ']' 486s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 486s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 486s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 486s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 486s cd "$1"; shift 486s setupname="$1"; shift 486s simport="$1"; shift 486s if [ -e "$simport" ]; then exit 0; fi 486s env - "$@" \ 486s "tests/setup/$setupname" 486s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 486s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 486s + shift 486s + setupname=gnupg 486s + shift 486s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 486s + shift 486s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 486s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-stderr --stdout=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/ftpmasterapi-http -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/ftpmasterapi-http' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 486s ++ set -o pipefail 486s ++ . tests/lib-core 486s ++ . tests/lib-restricts 486s ++ trap ' 486s rc=$? 486s set +x 486s test $rc = 0 || echo " 486s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 486s 486s Most relevant logs are just before assignment rc=$rc 486s Will now do cleanup etc. 486s " 486s set -x 486s set +e 486s pwd 486s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 486s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 486s set -e 486s test $rc = 0 || t-report-failure 486s ' EXIT 486s ++ t-filter-out-git-hyphen-dir 486s ++ local pathent 486s +++ type -p git-rev-parse 486s +++ : 486s ++ pathent= 486s ++ case "$pathent" in 486s ++ return 486s ++ t-set-intree 486s ++ '[' x = x ']' 486s ++ return 486s ++ : -D 486s ++ export DGIT_TEST_DEBUG 486s ++ : x 486s ++ export DGIT_TEST_DEBPUSH_DEBUG 486s ++ : 486s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 486s ++ GIT_COMMITTER_DATE='1530000000 +0100' 486s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 486s ++ GIT_AUTHOR_DATE='1530000000 +0100' 486s ++ export LC_CTYPE=C.UTF-8 486s ++ LC_CTYPE=C.UTF-8 486s ++ unset CDPATH 486s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 486s ++ FILTER_BRANCH_SQUELCH_WARNING=1 486s +++ pwd 486s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 486s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ testname=gnupg 486s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 486s ++ bpd=.. 486s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 486s ++ '[' x '!=' x ']' 486s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s +++ pwd 486s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ t-set-using-tmp 486s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 486s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 486s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 486s ++ export 'DEBFULLNAME=dgit test git user' 486s ++ DEBFULLNAME='dgit test git user' 486s ++ git config --global user.email dgit-test@debian.example.net 486s ++ git config --global user.name 'dgit test git user' 486s ++ git config --global protocol.ext.allow always 486s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 486s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 486s ++ export DEBCHANGE_VENDOR=dpkg 486s ++ DEBCHANGE_VENDOR=dpkg 486s ++ unset VISUAL 486s ++ unset GIT_EDITOR 486s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 486s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 486s ++ cat 486s ++ schroot=build 486s ++ : aq 486s ++ : archive/test-dummy 486s ++ : sid:unstable 486s ++ t-git-config dgit.default.old-dsc-distro test-dummy 486s ++ git config --global dgit.default.old-dsc-distro test-dummy 486s ++ for import in ${autoimport-gnupg} 486s ++ case "$0" in 486s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 486s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 486s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 486s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 486s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 486s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 486s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 486s + setup=' 486s export GNUPGHOME=$tmp/gnupg 486s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 486s 486s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 486s ssb rsa2048 2013-11-17 [E] 486s 486s sec rsa2048 2014-01-26 [SC] 486s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 486s uid [ultimate] Populus Romanus (test key) 486s ssb rsa2048 2014-01-26 [E] 486s 486s sec rsa2048 2014-01-26 [SC] 486s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 486s uid [ unknown] Hannibal (test key) 486s ssb rsa2048 2014-01-26 [E] 486s 486s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 486s export GNUPGHOME=$tmp/gnupg 486s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 486s 486s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 486s "sha256sum" => "$2", 486s "component" => "$3", 486s "filename" => "$4", 486s }; 486s END { 486s my $json = JSON->new->canonical(); 486s print $json->encode(\@v) or die $!; 486s } 486s ' 486s + t-aq-archive-updated new example 486s + local suite=new 486s + local p=example 486s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 486s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 486s + perl -wne ' 486s use JSON; 486s use strict; 486s our @v; 486s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 486s push @v, { 486s "version" => "$1", 486s "sha256sum" => "$2", 486s "component" => "$3", 486s "filename" => "$4", 486s }; 486s END { 486s my $json = JSON->new->canonical(); 486s print $json->encode(\@v) or die $!; 486s } 486s ' 486s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 486s + cat 486s + jsondelim=' },' 486s + cat 486s + t-dependencies libhttp-server-simple-static-perl 486s + : 'Hopefully installed: libhttp-server-simple-static-perl' 486s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq 487s + read api_port 487s + t-git-config --global dgit-distro.test-dummy.archive-query ftpmasterapi: 487s + git config --global --global dgit-distro.test-dummy.archive-query ftpmasterapi: 487s + t-git-config --global dgit-distro.test-dummy.archive-query-url http://127.0.0.1:34627/ 487s + git config --global --global dgit-distro.test-dummy.archive-query-url http://127.0.0.1:34627/ 487s + t-dgit archive-api-query suites 487s + local dgit=dgit 487s + pwd 487s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 487s + : ' 487s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 487s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A archive-api-query suites 487s | git config -z --get-regexp --global '.*' 487s | git config -z --get-regexp --system '.*' 487s query: fetching http://127.0.0.1:34627/suites... 487s [ 487s { 487s "archive" : "ftp-master", 487s "codename" : "sid", 487s "components" : [ 487s "main", 487s "contrib", 487s "non-free" 487s ], 487s "name" : "unstable", 487s "dakname" : "unstable" 487s } 487s ] 487s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 487s ' 487s + t-ok 487s + : ======================================== 487s + t-check-only-bpd 487s + '[' .. = .. ']' 487s + return 487s + t-fscks 487s + shopt -s nullglob 487s + t-save-artifacts 487s + artifacts=/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts 487s + '[' x/tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts = x ']' 487s + '[' xtmp = x ']' 487s + GZIP=-1v 487s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/ftpmasterapi-http-artifacts/ftpmasterapi-http.tar.gz '--exclude=*.tar' . 487s gzip: warning: GZIP environment variable is deprecated; use an alias or script 487s 72.3% 487s + echo ok. 487s ok. 487s + rc=0 487s + set +x 487s + set +e 487s + pwd 487s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 487s + '[' x '!=' x ']' 487s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 487s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 487s + set -e 487s + test 0 = 0 487s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 14781 487s PID TTY STAT TIME COMMAND 487s 14781 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq 487s autopkgtest [12:26:21]: test ftpmasterapi-http: -----------------------] 487s autopkgtest [12:26:21]: test ftpmasterapi-http: - - - - - - - - - - results - - - - - - - - - - 487s ftpmasterapi-http PASS 487s autopkgtest [12:26:21]: test gdr-import-dgit: preparing testbed 487s Reading package lists... 488s Building dependency tree... 488s Reading state information... 488s Starting pkgProblemResolver with broken count: 0 488s Starting 2 pkgProblemResolver with broken count: 0 488s Done 488s The following NEW packages will be installed: 488s git-debrebase libfile-fnmatch-perl 489s 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. 489s Need to get 78.0 kB of archives. 489s After this operation, 282 kB of additional disk space will be used. 489s Get:1 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-fnmatch-perl amd64 0.02-2build8 [10.5 kB] 489s Get:2 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-debrebase all 9.15 [67.5 kB] 489s Fetched 78.0 kB in 0s (2287 kB/s) 489s Selecting previously unselected package libfile-fnmatch-perl. 489s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 75241 files and directories currently installed.) 489s Preparing to unpack .../libfile-fnmatch-perl_0.02-2build8_amd64.deb ... 489s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 489s Selecting previously unselected package git-debrebase. 489s Preparing to unpack .../git-debrebase_9.15_all.deb ... 489s Unpacking git-debrebase (9.15) ... 489s Setting up libfile-fnmatch-perl (0.02-2build8) ... 489s Setting up git-debrebase (9.15) ... 489s Processing triggers for man-db (2.10.2-1) ... 489s autopkgtest [12:26:23]: test gdr-import-dgit: [----------------------- 489s ++ set -o pipefail 489s ++ . tests/lib-core 489s ++ . tests/lib-restricts 489s ++ trap ' 489s rc=$? 489s set +x 489s test $rc = 0 || echo " 489s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 489s 489s Most relevant logs are just before assignment rc=$rc 489s Will now do cleanup etc. 489s " 489s set -x 489s set +e 489s pwd 489s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 489s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 489s set -e 489s test $rc = 0 || t-report-failure 489s ' EXIT 489s ++ t-filter-out-git-hyphen-dir 489s ++ local pathent 489s +++ type -p git-rev-parse 489s +++ : 489s ++ pathent= 489s ++ case "$pathent" in 489s ++ return 489s ++ t-set-intree 489s ++ '[' x = x ']' 489s ++ return 489s ++ : -D 489s ++ export DGIT_TEST_DEBUG 489s ++ : x 489s ++ export DGIT_TEST_DEBPUSH_DEBUG 489s ++ : 489s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 489s ++ GIT_COMMITTER_DATE='1530000000 +0100' 489s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 489s ++ GIT_AUTHOR_DATE='1530000000 +0100' 489s ++ export LC_CTYPE=C.UTF-8 489s ++ LC_CTYPE=C.UTF-8 489s ++ unset CDPATH 489s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 489s ++ FILTER_BRANCH_SQUELCH_WARNING=1 489s +++ pwd 489s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 489s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ testname=gdr-import-dgit 489s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ bpd=.. 489s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 489s ++ '[' x '!=' x ']' 489s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s +++ pwd 489s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ t-set-using-tmp 489s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 489s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 489s ++ export 'DEBFULLNAME=dgit test git user' 489s ++ DEBFULLNAME='dgit test git user' 489s ++ git config --global user.email dgit-test@debian.example.net 489s ++ git config --global user.name 'dgit test git user' 489s ++ git config --global protocol.ext.allow always 489s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 489s ++ env -0 489s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 489s ++ export DEBCHANGE_VENDOR=dpkg 489s ++ DEBCHANGE_VENDOR=dpkg 489s ++ unset VISUAL 489s ++ unset GIT_EDITOR 489s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 489s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 489s ++ cat 489s ++ schroot=build 489s ++ : aq 489s ++ : archive/test-dummy 489s ++ : sid:unstable 489s ++ t-git-config dgit.default.old-dsc-distro test-dummy 489s ++ git config --global dgit.default.old-dsc-distro test-dummy 489s ++ for import in ${autoimport-gnupg} 489s ++ case "$0" in 489s ++ t-setup-import gnupg 489s ++ local setupname=gnupg 489s ++ local setupsrc 489s ++ local lock 489s ++ '[' x = x ']' 489s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 489s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 489s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 489s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 489s cd "$1"; shift 489s setupname="$1"; shift 489s simport="$1"; shift 489s if [ -e "$simport" ]; then exit 0; fi 489s env - "$@" \ 489s "tests/setup/$setupname" 489s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 489s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 489s + shift 489s + setupname=gnupg 489s + shift 489s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 489s + shift 489s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 489s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 489s ++ set -o pipefail 489s ++ . tests/lib-core 489s ++ . tests/lib-restricts 489s ++ trap ' 489s rc=$? 489s set +x 489s test $rc = 0 || echo " 489s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 489s 489s Most relevant logs are just before assignment rc=$rc 489s Will now do cleanup etc. 489s " 489s set -x 489s set +e 489s pwd 489s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 489s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 489s set -e 489s test $rc = 0 || t-report-failure 489s ' EXIT 489s ++ t-filter-out-git-hyphen-dir 489s ++ local pathent 489s +++ type -p git-rev-parse 489s +++ : 489s ++ pathent= 489s ++ case "$pathent" in 489s ++ return 489s ++ t-set-intree 489s ++ '[' x = x ']' 489s ++ return 489s ++ : -D 489s ++ export DGIT_TEST_DEBUG 489s ++ : x 489s ++ export DGIT_TEST_DEBPUSH_DEBUG 489s ++ : 489s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 489s ++ GIT_COMMITTER_DATE='1530000000 +0100' 489s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 489s ++ GIT_AUTHOR_DATE='1530000000 +0100' 489s ++ export LC_CTYPE=C.UTF-8 489s ++ LC_CTYPE=C.UTF-8 489s ++ unset CDPATH 489s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 489s ++ FILTER_BRANCH_SQUELCH_WARNING=1 489s +++ pwd 489s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 489s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ testname=gnupg 489s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 489s ++ bpd=.. 489s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 489s ++ '[' x '!=' x ']' 489s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s +++ pwd 489s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ t-set-using-tmp 489s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 489s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 489s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 489s ++ export 'DEBFULLNAME=dgit test git user' 489s ++ DEBFULLNAME='dgit test git user' 489s ++ git config --global user.email dgit-test@debian.example.net 489s ++ git config --global user.name 'dgit test git user' 489s ++ git config --global protocol.ext.allow always 489s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 489s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 489s ++ export DEBCHANGE_VENDOR=dpkg 489s ++ DEBCHANGE_VENDOR=dpkg 489s ++ unset VISUAL 489s ++ unset GIT_EDITOR 489s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 489s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 489s ++ cat 489s ++ schroot=build 489s ++ : aq 489s ++ : archive/test-dummy 489s ++ : sid:unstable 489s ++ t-git-config dgit.default.old-dsc-distro test-dummy 489s ++ git config --global dgit.default.old-dsc-distro test-dummy 489s ++ for import in ${autoimport-gnupg} 489s ++ case "$0" in 489s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 489s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 489s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 489s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 489s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 489s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 489s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 489s + setup=' 489s export GNUPGHOME=$tmp/gnupg 489s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 489s 489s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 489s ssb rsa2048 2013-11-17 [E] 489s 490s sec rsa2048 2014-01-26 [SC] 490s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 490s uid [ultimate] Populus Romanus (test key) 490s ssb rsa2048 2014-01-26 [E] 490s 490s sec rsa2048 2014-01-26 [SC] 490s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 490s uid [ unknown] Hannibal (test key) 490s ssb rsa2048 2014-01-26 [E] 490s 490s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 490s export GNUPGHOME=$tmp/gnupg 490s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 490s 490s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 490s delete mode 100644 debian/source/format 490s + git tag v1.0 490s + : 'fake up that our quilt-tip was descended from upstream' 490s + git checkout quilt-tip 490s Switched to branch 'quilt-tip' 490s + git merge --no-edit -s ours upstream 490s Merge made by the 'ours' strategy. 490s + : 'fake up that our quilt-tip had the patch queue in it' 490s + git checkout patch-queue/quilt-tip 490s Switched to branch 'patch-queue/quilt-tip' 490s + gbp pq export 490s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 490s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 490s + git add debian/patches 490s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 490s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 490s 4 files changed, 50 insertions(+) 490s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 490s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 490s create mode 100644 debian/patches/series 490s create mode 100644 debian/patches/subdir/addnewups 490s + : 'make branch names more conventional' 490s + git branch -D master 490s Deleted branch master (was 17d67db). 490s + git branch -m quilt-tip master 490s + not-gdr-processable origin 490s + git branch gdr-unprocessable/origin 490s + t-git-debrebase analyse 490s + local gdr=git-debrebase 490s + : ' 490s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 490s + git-debrebase --dgit=dgit -D analyse 490s + grep 'Unknown Unprocessable' 490s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 490s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 490s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 490s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4}],"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 490s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 490s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 490s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 490s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Contributor" => $VAR1->{"Parents"}[0]} 490s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 490s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 490s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n"} 490s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 490s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 490s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Type" => "Mixed","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n"} 490s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 490s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 490s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 490s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 490s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 490s git-debrebase = Packaging {"Msg" => "WIP\n","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 490s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 490s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 490s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"Msg" => "WIP\n"} 490s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 490s git-debrebase ** Unknown 490s git-debrebase *** WALK BOMB unrecognised 490s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 490s ' 490s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 490s + : 'fake up an upstream 2.0' 490s + git branch make-upstream upstream 490s + t-make-new-upstream-tarball 2.0 490s + local uv=2.0 490s + git checkout make-upstream 490s Switched to branch 'make-upstream' 490s + echo 'upstream 2.0' 490s + git commit -a -m 'upstream 2.0 tarball' 490s [make-upstream 4db56a8] upstream 2.0 tarball 490s 1 file changed, 1 insertion(+) 490s + t-make-orig example 2.0 make-upstream 490s + local p=example 490s + local v=2.0 490s + local tag=make-upstream 490s + ust=example_2.0.orig.tar.gz 490s + GZIP=-1 490s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 490s gzip: warning: GZIP environment variable is deprecated; use an alias or script 490s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 490s + git branch -D quilt-tip-2 490s Deleted branch quilt-tip-2 (was 99fcab4). 490s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 490s + git branch -D gitish-only 490s Deleted branch gitish-only (was 2b2ddc8). 490s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 490s + git branch -D quilt-tip-1.1 490s Deleted branch quilt-tip-1.1 (was 7fc34be). 490s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 490s + git branch -D patch-queue/quilt-tip 490s Deleted branch patch-queue/quilt-tip (was d843a68). 490s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 490s + git branch -D indep-arch 490s Deleted branch indep-arch (was e215729). 490s + : 'see what gbp import-orig does' 490s + git checkout master 490s Switched to branch 'master' 490s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 490s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 490s gbp:info: Source package is example 490s gbp:info: Upstream version is 2.0 490s gbp:info: Replacing upstream source on 'master' 490s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 490s + not-gdr-processable merge 490s + git branch gdr-unprocessable/merge 490s + t-git-debrebase analyse 490s + local gdr=git-debrebase 490s + : ' 490s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 490s + git-debrebase --dgit=dgit -D analyse 490s + grep 'Unknown Unprocessable' 490s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 490s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 490s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 490s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 490s git-debrebase ** Unknown 490s git-debrebase *** WALK BOMB unrecognised 490s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 490s ' 490s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 490s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 490s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 490s + DEBEMAIL=dgit-tests@example.org 490s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 490s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 490s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 490s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 490s 1 file changed, 6 insertions(+) 490s + t-dch-commit-r 490s + t-dch-r-rune t-dch-commit 490s + local cmd=t-dch-commit 490s + shift 490s + local suite=unstable 490s + t-dch-commit -r -D unstable '' 490s + t-debchange -r -D unstable '' 490s + DEBEMAIL=dgit-tests@example.org 490s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 490s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 490s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 490s libdistro-info-perl is not installed, Debian release names are not known. 490s libdistro-info-perl is not installed, Ubuntu release names are not known. 490s + git commit -m 'dch -r -D unstable ' debian/changelog 490s [master f31021f] dch -r -D unstable 490s 1 file changed, 3 insertions(+), 2 deletions(-) 490s + echo garbage 490s + git add debian/patches/garbage 490s + git commit -m 'add garbage' debian/patches/garbage 490s [master eb10718] add garbage 490s 1 file changed, 1 insertion(+) 490s create mode 100644 debian/patches/garbage 490s + t-archive-none example 490s + t-select-package example 490s + p=example 490s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 490s + t-archive-none-aq 490s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 490s + : 490s + local 'jsondelim=[' 490s + local suitespec 490s + for suitespec in $suitespecs 490s + local suite=sid 490s + local sname=unstable 490s + t-aq-archive-updated sid example 490s + local suite=sid 490s + local p=example 490s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 490s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 490s + perl -wne ' 490s use JSON; 490s use strict; 490s our @v; 490s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 490s push @v, { 490s "version" => "$1", 490s "sha256sum" => "$2", 490s "component" => "$3", 490s "filename" => "$4", 490s }; 490s END { 490s my $json = JSON->new->canonical(); 490s print $json->encode(\@v) or die $!; 490s } 490s ' 490s + t-aq-archive-updated new example 490s + local suite=new 490s + local p=example 490s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 490s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 490s + perl -wne ' 490s use JSON; 490s use strict; 490s our @v; 490s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 490s push @v, { 490s "version" => "$1", 490s "sha256sum" => "$2", 490s "component" => "$3", 490s "filename" => "$4", 490s }; 490s END { 490s my $json = JSON->new->canonical(); 490s print $json->encode(\@v) or die $!; 490s } 490s ' 490s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 490s + cat 490s + jsondelim=' },' 490s + cat 490s + t-git-none 490s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 490s + set -e 490s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 490s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 490s + t-dgit -wgf --gbp push-source --new 490s + local dgit=dgit 490s + pwd 490s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 490s + : ' 490s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 490s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 491s | git rev-parse --show-toplevel 491s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 491s | git config -z --get-regexp --local '.*' 491s | git config -z --get-regexp --local '.*' 491s | git config -z --get-regexp --global '.*' 491s | git config -z --get-regexp --system '.*' 491s format 3.0 (quilt), quilt mode gbp 491s Format `3.0 (quilt)', need to check/update patch stack 491s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 491s => `' 491s + git diff --quiet HEAD 491s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 491s canonical suite name for unstable is sid 491s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 491s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 491s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 491s | git rev-parse 'HEAD~0' 491s => `eb10718ab213ccfa83613ebbddefbffda941a548' 491s | git symbolic-ref -q HEAD 491s => `refs/heads/master' 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 491s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 491s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 491s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 491s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 491s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - fbdfbcb76509102f22a2646421b3094386fc08fa51f613260d59ecbc4550b5a8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 491s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 491s >(no reflog) 491s splitbrain cache miss 491s CD work 491s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 491s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 491s + git checkout -q -b dgit-view 491s examining quilt state (multiple patches, gbp mode) 491s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 491s CD fake 491s | find -name .git -prune -print0 491s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 491s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 491s + git add -Af . 491s | git write-tree 491s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 491s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 491s CD .. 491s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 491s CD ../fake 491s + git add -Af . 491s | git write-tree 491s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 491s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 491s CD ../work 491s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 491s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 491s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 491s => `' 491s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 491s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 491s => `lib.c\x00new-upstream-file\x00src.c\x00' 491s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 491s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 491s => `lib.c\x00new-upstream-file\x00src.c\x00' 491s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 491s differences @dl == ## ## == == ==. 491s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 491s dgit: quilt differences: src: == orig ## gitignores: == orig == 491s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 491s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 491s => `1530000000 +0000' 491s dgit view: creating patches-applied version using gbp pq 491s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 491s + git update-ref refs/heads/dgit-view HEAD 491s + git checkout -q dgit-view 491s | git rev-parse 'HEAD~0' 491s => `45ea71a69fa522ce760afdab8a420200443753e9' 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 491s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 491s => `' 491s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - fbdfbcb76509102f22a2646421b3094386fc08fa51f613260d59ecbc4550b5a8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 491s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 491s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 491s | git rev-parse 'HEAD~0' 491s => `eb10718ab213ccfa83613ebbddefbffda941a548' 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 491s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 491s dpkg-source: info: using source format '3.0 (quilt)' 491s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 491s dpkg-source: info: using patch list from debian/patches/series 491s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 491s dpkg-source: info: building example in example_2.0-1.dsc 491s CD work 491s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 491s package seems new, not specifying -v 491s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 491s dpkg-genchanges: info: not including original source code in upload 491s CD .. 491s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 491s renaming (Files) example_2.0.orig.tar.gz 491s renaming (Files) example_2.0-1.debian.tar.xz 491s renaming (dsc) example_2.0-1.dsc 491s renaming (changes) example_2.0-1_source.changes 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 491s actually entering push 491s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 491s => `0' 491s + git config remote.dgit.skipdefaultupdate true 491s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 491s get_archive_dsc: nothing in archive, returning undef 491s no version available from the archive 491s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 491s => `' 491s previous reference hash= 491s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 491s => `' 491s fetch_from_archive: lastfetch= 491s nothing found! 491s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 491s + git check-ref-format archive/test-dummy/2.0-1 491s | git symbolic-ref -q HEAD 491s => `refs/heads/master' 491s | git rev-parse 'HEAD~0' 491s => `eb10718ab213ccfa83613ebbddefbffda941a548' 491s ffq_prev_branchinfo branch current refs/heads/master 491s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 491s => `' 491s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 491s => `' 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 491s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 491s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 491s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 491s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 491s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - fbdfbcb76509102f22a2646421b3094386fc08fa51f613260d59ecbc4550b5a8 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 491s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 491s CD work 491s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 491s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 491s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 491s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 491s splitbrain_pseudomerge... 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 491s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 491s => `' 491s + git diff --quiet HEAD 491s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 491s => `' 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 491s checking that example_2.0-1.dsc corresponds to HEAD 491s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 491s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 491s dpkg-source: info: extracting example in example-2.0 491s dpkg-source: info: unpacking example_2.0.orig.tar.gz 491s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 491s dpkg-source: info: using patch list from debian/patches/series 491s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 491s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 491s dpkg-source: info: applying subdir/addnewups 491s CD example-2.0 491s | find -name .git -prune -print0 491s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 491s + git add -Af . 491s | git write-tree 491s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 491s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 491s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 491s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 491s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 491s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 491s files_compare_inputs example_2.0-1.dsc 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 491s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 491s files_compare_inputs example_2.0-1.dsc Files 491s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 491s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 491s files_compare_inputs example_2.0-1_source.changes 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 491s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 491s files_compare_inputs example_2.0-1_source.changes Files 491s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 491s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 491s checking origs needed (2.0)... 491s checking origs needed placement 'devel extra'... 491s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 491s origs example_2.0.orig.tar.gz is_orig 491s -| sh -ec 'cd "$1"; shift 491s 491s find -name "$1" -print0 | 491s xargs -0r sha256sum 491s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 491s origs example_2.0.orig.tar.gz $#$have=-1 491s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 491s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 491s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 491s push_tagwants: $VAR1 = [ 491s '2.0-1', 491s '45ea71a69fa522ce760afdab8a420200443753e9', 491s 'eb10718ab213ccfa83613ebbddefbffda941a548', 491s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 491s ]; 491s $VAR2 = [ 491s { 491s 'TagFn' => sub { "DUMMY" }, 491s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 491s 'Tag' => 'archive/test-dummy/2.0-1', 491s 'TfSuffix' => '', 491s 'Tfn' => sub { "DUMMY" }, 491s 'View' => 'dgit' 491s }, 491s { 491s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 491s 'TagFn' => sub { "DUMMY" }, 491s 'Tag' => 'test-dummy/2.0-1', 491s 'TfSuffix' => '-maintview', 491s 'Tfn' => sub { "DUMMY" }, 491s 'View' => 'maint' 491s } 491s ]; 491s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 491s => `1530000000 +0000' 491s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 491s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 492s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 492s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 492s => `8b9773e7665f0cfd3d94dedfa13bf18fc976540a' 492s + git verify-tag 8b9773e7665f0cfd3d94dedfa13bf18fc976540a 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s gpg: Signature made Mon Mar 31 12:26:25 2025 UTC 492s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 492s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 492s gpg: WARNING: This key is not certified with a trusted signature! 492s gpg: There is no indication that the signature belongs to the owner. 492s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 492s + git update-ref refs/tags/archive/test-dummy/2.0-1 8b9773e7665f0cfd3d94dedfa13bf18fc976540a 492s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 492s => `b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f' 492s + git verify-tag b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s gpg: Signature made Mon Mar 31 12:26:26 2025 UTC 492s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 492s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 492s gpg: WARNING: This key is not certified with a trusted signature! 492s gpg: There is no indication that the signature belongs to the owner. 492s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 492s + git update-ref refs/tags/test-dummy/2.0-1 b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 492s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 492s => `0' 492s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 492s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 492s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 492s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 492s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 492s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 492s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 492s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 492s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s 492s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 492s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 492s 492s Successfully signed dsc, changes files 492s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 492s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 492s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 492s D: Setting host argument. 492s Checking signature on .changes 492s Checking signature on .dsc 492s Uploading to test-dummy (via local to localhost): 492s Successfully uploaded packages. 492s dgit ok: pushed and uploaded 2.0-1 492s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 492s del_lrfetchrefs... 492s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 492s ' 492s + t-salsa-add-remote 492s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 492s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 492s + set -e 492s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 492s + git init --bare 492s hint: Using 'master' as the name for the initial branch. This default branch name 492s hint: is subject to change. To configure the initial branch name to use in all 492s hint: of your new repositories, which will suppress this warning, call: 492s hint: 492s hint: git config --global init.defaultBranch 492s hint: 492s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 492s hint: 'development'. The just-created branch can be renamed via this command: 492s hint: 492s hint: git branch -m 492s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 492s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 492s + git push --set-upstream origin master 492s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 492s * [new branch] master -> master 492s Branch 'master' set up to track remote branch 'master' from 'origin'. 492s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 492s + local 'mpat=E:identical in upstream files' 492s + shift 492s + set +o pipefail 492s + LC_MESSAGES=C 492s + LANGUAGE=C 492s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 492s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local gdr=git-debrebase 492s + : ' 492s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 492s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 492s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 492s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 492s docs/README | 1 + 492s 1 file changed, 1 insertion(+) 492s 492s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 492s git-debrebase: identical in upstream files. See diffstat above, or run 492s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 492s + local 'ps=255 0' 492s + set -o pipefail 492s + case $ps in 492s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local 'mpat=E:identical in upstream files' 492s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local grepper=fgrep 492s + case "$mpat" in 492s + case "$mpat" in 492s + grepper=egrep 492s + mpat='identical in upstream files' 492s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s git-debrebase: identical in upstream files. See diffstat above, or run 492s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 492s + local 'mpat=E:Unused patch file garbage will be discarded' 492s + shift 492s + set +o pipefail 492s + LC_MESSAGES=C 492s + LANGUAGE=C 492s + t-git-debrebase -fupstream-has-debian convert-from-gbp 492s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local gdr=git-debrebase 492s + : ' 492s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 492s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 492s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 492s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 492s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 492s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 492s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 492s $VAR2 = bless( do{\(my $o = { 492s 'name' => 'debian/changelog, entry no.1', 492s 'keep_duplicate' => 0, 492s 'is_pgp_signed' => 0, 492s 'fields' => { 492s 'Source' => 'example', 492s 'Version' => '2.0-1', 492s 'Distribution' => 'unstable', 492s 'Urgency' => 'medium', 492s 'Maintainer' => 'dgit test git user ', 492s 'Timestamp' => '1530000000', 492s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 492s 'Changes' => ' 492s example (2.0-1) unstable; urgency=medium 492s 492s [ Ian Jackson ] 492s * new upstream (did gbp import-orig)' 492s }, 492s 'drop_empty' => 0, 492s 'in_order' => [ 492s 'Source', 492s 'Version', 492s 'Distribution', 492s 'Urgency', 492s 'Maintainer', 492s 'Timestamp', 492s 'Date', 492s 'Changes' 492s ], 492s 'allow_duplicate' => 0, 492s 'out_order' => [], 492s 'allow_pgp' => 1 492s })}, 'Dpkg::Control::Hash' ); 492s last finished-looking changelog entry: (2.0-1) unstable 492s will stitch in dgit view, archive/test-dummy/2.0-1 492s git-debrebase: snags: 1 overriden by individual -f options 492s 492s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 492s + local 'ps=255 0' 492s + set -o pipefail 492s + case $ps in 492s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local 'mpat=E:Unused patch file garbage will be discarded' 492s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s + local grepper=fgrep 492s + case "$mpat" in 492s + case "$mpat" in 492s + grepper=egrep 492s + mpat='Unused patch file garbage will be discarded' 492s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 492s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 492s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 492s + local gdr=git-debrebase 492s + : ' 492s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 492s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 493s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 493s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 493s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 493s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 493s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 493s $VAR2 = bless( do{\(my $o = { 493s 'in_order' => [ 493s 'Source', 493s 'Version', 493s 'Distribution', 493s 'Urgency', 493s 'Maintainer', 493s 'Timestamp', 493s 'Date', 493s 'Changes' 493s ], 493s 'drop_empty' => 0, 493s 'is_pgp_signed' => 0, 493s 'out_order' => [], 493s 'allow_duplicate' => 0, 493s 'name' => 'debian/changelog, entry no.1', 493s 'allow_pgp' => 1, 493s 'keep_duplicate' => 0, 493s 'fields' => { 493s 'Source' => 'example', 493s 'Version' => '2.0-1', 493s 'Distribution' => 'unstable', 493s 'Urgency' => 'medium', 493s 'Maintainer' => 'dgit test git user ', 493s 'Timestamp' => '1530000000', 493s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 493s 'Changes' => ' 493s example (2.0-1) unstable; urgency=medium 493s 493s [ Ian Jackson ] 493s * new upstream (did gbp import-orig)' 493s } 493s })}, 'Dpkg::Control::Hash' ); 493s last finished-looking changelog entry: (2.0-1) unstable 493s will stitch in dgit view, archive/test-dummy/2.0-1 493s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 493s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 493s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 493s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 493s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 493s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 493s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 493s git-debrebase ffq check_specs * 493s git-debrebase ffq merge master 493s git-debrebase ffq check_remote origin remote fetch/merge branch 493s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 493s OK, you are ahead of refs/remotes/origin/master 493s git-debrebase ffq check_remote undef remote push branch 493s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 493s OK, you are ahead of refs/remotes/dgit/dgit/sid 493s git-debrebase: snags: 2 overriden by individual -f options 493s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 493s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 493s git-debrebase >$ 493s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 493s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 493s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 493s ' 493s + git branch converted-from-gbp 493s + v=2.0-2 493s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 493s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 493s + DEBEMAIL=dgit-tests@example.org 493s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 493s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 493s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 493s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 493s 1 file changed, 6 insertions(+) 493s + t-dch-commit-r 493s + t-dch-r-rune t-dch-commit 493s + local cmd=t-dch-commit 493s + shift 493s + local suite=unstable 493s + t-dch-commit -r -D unstable '' 493s + t-debchange -r -D unstable '' 493s + DEBEMAIL=dgit-tests@example.org 493s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 493s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 493s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 493s libdistro-info-perl is not installed, Debian release names are not known. 493s libdistro-info-perl is not installed, Ubuntu release names are not known. 493s + git commit -m 'dch -r -D unstable ' debian/changelog 493s [master 4af0243] dch -r -D unstable 493s 1 file changed, 1 insertion(+), 1 deletion(-) 493s + t-dgit -wgf push-source --new 493s + local dgit=dgit 493s + pwd 493s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 493s + : ' 493s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 493s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 493s | git rev-parse --show-toplevel 493s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 493s | git config -z --get-regexp --local '.*' 493s | git config -z --get-regexp --local '.*' 493s | git config -z --get-regexp --global '.*' 493s | git config -z --get-regexp --system '.*' 493s format 3.0 (quilt), quilt mode linear 493s Format `3.0 (quilt)', need to check/update patch stack 493s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 493s => `' 493s + git diff --quiet HEAD 493s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 493s canonical suite name for unstable is sid 493s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 493s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 493s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 493s | git rev-parse 'HEAD~0' 493s => `4af0243f9227b0d695fbff38df345aca23969e2e' 493s | git symbolic-ref -q HEAD 493s => `refs/heads/master' 493s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 493s CD work 493s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 493s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 493s examining quilt state (multiple patches, linear mode) 493s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 493s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 493s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 493s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 494s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 494s | git rev-parse 'HEAD~0' 494s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 494s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 494s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 494s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 494s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 494s CD fake 494s | find -name .git -prune -print0 494s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 494s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 494s + git add -Af . 494s | git write-tree 494s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 494s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 494s CD .. 494s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s CD ../fake 494s + git add -Af . 494s | git write-tree 494s => `607612c46d7ea5b66697b830f1a50f069061d460' 494s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 494s CD ../work 494s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 494s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 494s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 494s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 494s => `' 494s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 494s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 494s => `lib.c\x00new-upstream-file\x00src.c\x00' 494s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 494s differences @dl ## ## == == == ==. 494s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 494s dgit: quilt differences: src: ## orig ## gitignores: == orig == 494s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 494s starting quiltify (multiple patches, linear mode) 494s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 494s => `debian/control'... 494s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 494s => `' 494s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 494s search finished hooray! 494s quiltify linearisation planning successful, executing... 494s + git checkout -q master 494s | git status --ignored --porcelain 494s => `?? .pc/' 494s nothing quilty to commit, ok. 494s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 494s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 494s | git rev-parse 'HEAD~0' 494s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 494s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 494s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 494s CD work 494s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 494s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s CD .. 494s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 494s dpkg-source: info: using source format '3.0 (quilt)' 494s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 494s dpkg-source: info: using patch list from debian/patches/series 494s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 494s dpkg-source: info: building example in example_2.0-2.dsc 494s CD work 494s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 494s package seems new, not specifying -v 494s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 494s dpkg-genchanges: info: not including original source code in upload 494s CD .. 494s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 494s renaming (Files) example_2.0.orig.tar.gz 494s renaming (Files) example_2.0-2.debian.tar.xz 494s renaming (dsc) example_2.0-2.dsc 494s renaming (changes) example_2.0-2_source.changes 494s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 494s actually entering push 494s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 494s => `1' 494s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 494s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 494s git_lrfetch_sane iteration 0 494s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 494s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 494s => 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/tags/archive/test-dummy/2.0-1 494s => b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/tags/test-dummy/2.0-1 494s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 494s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 494s | git for-each-ref refs/dgit-fetch/test-dummy 494s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 494s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 494s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 494s git_lrfetch_sane: tidying any old suite lrfetchrefs 494s | git for-each-ref refs/dgit-fetch/sid 494s git_lrfetch_sane: git fetch --no-insane emulation complete 494s $VAR1 = { 494s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 494s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f', 494s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '8b9773e7665f0cfd3d94dedfa13bf18fc976540a' 494s }; 494s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 494s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/tags/archive/test-dummy/2.0-1 494s currently refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 494s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/tags/test-dummy/2.0-1 494s currently refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 494s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 494s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 494s offered refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 494s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 494s offered refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 494s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 494s get_archive_dsc: nothing in archive, returning undef 494s no version available from the archive 494s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 494s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 494s 494s Package not found in the archive, but has allegedly been pushed using dgit. 494s Perhaps the upload is stuck in incoming. Using the version from git. 494s 494s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s fetch mergeinfos: 494s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 494s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 494s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 494s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 494s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 494s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 494s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 494s + git check-ref-format archive/test-dummy/2.0-2 494s | git symbolic-ref -q HEAD 494s => `refs/heads/master' 494s | git rev-parse 'HEAD~0' 494s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 494s ffq_prev_branchinfo branch current refs/heads/master 494s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 494s => `' 494s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 494s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 494s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 494s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 494s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 494s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 494s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 494s | git status --ignored --porcelain 494s => `' 494s nothing quilty to commit, ok. 494s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 494s => `' 494s + git diff --quiet HEAD 494s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 494s => `45ea71a69fa522ce760afdab8a420200443753e9' 494s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 494s => `' 494s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 494s checking that example_2.0-2.dsc corresponds to HEAD 494s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 494s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 494s dpkg-source: info: extracting example in example-2.0 494s dpkg-source: info: unpacking example_2.0.orig.tar.gz 494s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 494s dpkg-source: info: using patch list from debian/patches/series 494s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 494s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 494s dpkg-source: info: applying subdir/addnewups 494s CD example-2.0 494s | find -name .git -prune -print0 494s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 494s + git add -Af . 494s | git write-tree 494s => `607612c46d7ea5b66697b830f1a50f069061d460' 494s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 494s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 494s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 494s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 494s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 494s files_compare_inputs example_2.0-2.dsc 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 494s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 494s files_compare_inputs example_2.0-2.dsc Files 494s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 494s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 494s files_compare_inputs example_2.0-2_source.changes 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 494s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 494s files_compare_inputs example_2.0-2_source.changes Files 494s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 494s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 494s checking origs needed (2.0)... 494s checking origs needed placement 'devel extra'... 494s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 494s origs example_2.0.orig.tar.gz is_orig 494s -| sh -ec 'cd "$1"; shift 494s 494s find -name "$1" -print0 | 494s xargs -0r sha256sum 494s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 494s origs example_2.0.orig.tar.gz $#$have=-1 494s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 494s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 494s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 494s push_tagwants: $VAR1 = [ 494s '2.0-2', 494s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 494s undef, 494s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 494s ]; 494s $VAR2 = [ 494s { 494s 'Tfn' => sub { "DUMMY" }, 494s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 494s 'TfSuffix' => '', 494s 'TagFn' => sub { "DUMMY" }, 494s 'Tag' => 'archive/test-dummy/2.0-2', 494s 'View' => 'dgit' 494s }, 494s { 494s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 494s 'Tfn' => sub { "DUMMY" }, 494s 'View' => 'dgit', 494s 'Tag' => 'test-dummy/2.0-2', 494s 'TagFn' => sub { "DUMMY" }, 494s 'TfSuffix' => '-dgit' 494s } 494s ]; 494s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 494s => `1530000000 +0000' 494s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 494s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 494s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 494s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 494s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 494s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 494s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 494s => `73453a4cf312f7fee81e3400e57fb36d7777c35f' 494s + git verify-tag 73453a4cf312f7fee81e3400e57fb36d7777c35f 494s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 494s gpg: Signature made Mon Mar 31 12:26:28 2025 UTC 494s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 494s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 494s gpg: WARNING: This key is not certified with a trusted signature! 494s gpg: There is no indication that the signature belongs to the owner. 494s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 494s + git update-ref refs/tags/archive/test-dummy/2.0-2 73453a4cf312f7fee81e3400e57fb36d7777c35f 494s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 494s => `aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188' 494s + git verify-tag aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 495s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 495s gpg: Signature made Mon Mar 31 12:26:28 2025 UTC 495s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 495s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 495s gpg: WARNING: This key is not certified with a trusted signature! 495s gpg: There is no indication that the signature belongs to the owner. 495s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 495s + git update-ref refs/tags/test-dummy/2.0-2 aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 495s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 495s => `1' 495s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 495s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 495s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 495s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 495s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 495s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 495s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 495s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 495s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 495s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 495s 495s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 495s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 495s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 495s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 495s 495s Successfully signed dsc, changes files 495s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 495s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 495s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 495s D: Setting host argument. 495s Checking signature on .changes 495s Checking signature on .dsc 495s Package includes an .orig.tar.gz file although the debian revision suggests 495s that it might not be required. Multiple uploads of the .orig.tar.gz may be 495s rejected by the upload queue management software. 495s Uploading to test-dummy (via local to localhost): 495s Successfully uploaded packages. 495s dgit ok: pushed and uploaded 2.0-2 495s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 495s del_lrfetchrefs... 495s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 495s del_lrfetchrefs: 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 495s del_lrfetchrefs: b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 495s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 495s ' 495s + git push 495s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 495s eb10718..6b22dd5 master -> master 495s + cd .. 495s + t-archive-process-incoming sid 495s + local suite=sid 495s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 495s + t-archive-query sid 495s + local suite=sid 495s + local dscf=main/example_2.0-2.dsc 495s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 495s + local suite=sid 495s + local p=example 495s + local v=2.0-2 495s + local dscf=main/example_2.0-2.dsc 495s + local sha 495s ++ sha256sum 495s + sha='736e749d291fb4d40099b18d2dc861f684738ca80d84ed89867cf5137c0e195b -' 495s + echo '2.0-2 736e749d291fb4d40099b18d2dc861f684738ca80d84ed89867cf5137c0e195b main/example_2.0-2.dsc' 495s + t-aq-archive-updated sid example 495s + local suite=sid 495s + local p=example 495s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 495s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 495s + perl -wne ' 495s use JSON; 495s use strict; 495s our @v; 495s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 495s push @v, { 495s "version" => "$1", 495s "sha256sum" => "$2", 495s "component" => "$3", 495s "filename" => "$4", 495s }; 495s END { 495s my $json = JSON->new->canonical(); 495s print $json->encode(\@v) or die $!; 495s } 495s ' 495s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 495s ++ echo git mirror aq 495s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 495s . $troot/lib-gdr 495s t-tstunt-parsechangelog 495s p=example 495s t-git-next-date 495s ' 495s + local savevars= 495s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 495s + local 'importeval= 495s . $troot/lib-gdr 495s t-tstunt-parsechangelog 495s p=example 495s t-git-next-date 495s ' 495s + local import=IMPORT.gdr-convert-gbp 495s + exec 495s + local vn 495s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 495s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 495s print STDERR "saving-exporting $vn\n"; 495s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 495s or die $!; 495s } 495s ' 495s saving-exporting DGIT_TEST_REAL_DEBCHANGE 495s saving-exporting DGIT_TEST_REAL_GPG_AGENT 495s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 495s saving-exporting DGIT_TEST_REAL_GPG 495s + set -e 495s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 495s + printf '\n%s\n' ' 495s . $troot/lib-gdr 495s t-tstunt-parsechangelog 495s p=example 495s t-git-next-date 495s ' 495s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 495s + rc=0 495s + set +x 495s + set +e 495s + pwd 495s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s + '[' x '!=' x ']' 495s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 495s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s + set -e 495s + test 0 = 0 495s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 495s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 495s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 495s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 495s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 495s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 495s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 495s +++ : -D 495s +++ export GDR_TEST_DEBUG 495s +++ t-tstunt debchange 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ local var=PATH 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ eval ' 495s case "$PATH" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PATH="$tstunt" ;; 495s *) PATH="$tstunt:$PATH" ;; 495s esac 495s export PATH 495s ' 495s ++++ case "$PATH" in 495s ++++ export PATH 495s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ local var=PERLLIB 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ eval ' 495s case "$PERLLIB" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PERLLIB="$tstunt" ;; 495s *) PERLLIB="$tstunt:$PERLLIB" ;; 495s esac 495s export PERLLIB 495s ' 495s ++++ case "$PERLLIB" in 495s ++++ export PERLLIB 495s +++ local f 495s +++ for f in "$@" 495s +++ t-tstunt--save-real debchange 495s +++ local f=debchange 495s +++ case "$f" in 495s +++ local rc 495s +++ local real 495s +++ set +e 495s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ type -p debchange 495s +++ real=/usr/bin/debchange 495s +++ rc=0 495s +++ set -e 495s +++ case $rc in 495s +++ local varname=debchange 495s +++ varname=DGIT_TEST_REAL_DEBCHANGE 495s +++ eval ' 495s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 495s export DGIT_TEST_REAL_DEBCHANGE 495s ' 495s ++++ : /usr/bin/debchange 495s ++++ export DGIT_TEST_REAL_DEBCHANGE 495s +++ f=./debchange 495s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 495s ++ t-tstunt-parsechangelog 495s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 495s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++ local var=PATH 495s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++ eval ' 495s case "$PATH" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PATH="$tstunt" ;; 495s *) PATH="$tstunt:$PATH" ;; 495s esac 495s export PATH 495s ' 495s +++ case "$PATH" in 495s +++ export PATH 495s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++ local var=PERLLIB 495s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++ eval ' 495s case "$PERLLIB" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PERLLIB="$tstunt" ;; 495s *) PERLLIB="$tstunt:$PERLLIB" ;; 495s esac 495s export PERLLIB 495s ' 495s +++ case "$PERLLIB" in 495s +++ export PERLLIB 495s ++ local f 495s ++ for f in "$@" 495s ++ t-tstunt--save-real dpkg-parsechangelog 495s ++ local f=dpkg-parsechangelog 495s ++ case "$f" in 495s ++ local rc 495s ++ local real 495s ++ set +e 495s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s +++ type -p dpkg-parsechangelog 495s ++ real=/usr/bin/dpkg-parsechangelog 495s ++ rc=0 495s ++ set -e 495s ++ case $rc in 495s ++ local varname=dpkg_parsechangelog 495s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 495s ++ eval ' 495s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 495s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 495s ' 495s +++ : /usr/bin/dpkg-parsechangelog 495s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 495s ++ f=./dpkg-parsechangelog 495s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 495s ++ for f in "$@" 495s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 495s ++ local f=Dpkg/Changelog/Parse.pm 495s ++ case "$f" in 495s ++ return 495s ++ f=./Dpkg/Changelog/Parse.pm 495s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 495s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 495s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 495s ++ p=example 495s ++ t-git-next-date 495s ++ GIT_COMMITTER_DATE='1530000001 +0100' 495s ++ GIT_AUTHOR_DATE='1530000001 +0100' 495s + t-setup-import http-git-check 495s + local setupname=http-git-check 495s + local setupsrc 495s + local lock 495s + '[' x = x ']' 495s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 495s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 495s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check ']' 495s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 495s cd "$1"; shift 495s setupname="$1"; shift 495s simport="$1"; shift 495s if [ -e "$simport" ]; then exit 0; fi 495s env - "$@" \ 495s "tests/setup/$setupname" 495s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src http-git-check /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 495s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 495s + shift 495s + setupname=http-git-check 495s + shift 495s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 495s + shift 495s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check ']' 495s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/http-git-check 495s ++ set -o pipefail 495s ++ . tests/lib-core 495s ++ . tests/lib-restricts 495s ++ trap ' 495s rc=$? 495s set +x 495s test $rc = 0 || echo " 495s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 495s 495s Most relevant logs are just before assignment rc=$rc 495s Will now do cleanup etc. 495s " 495s set -x 495s set +e 495s pwd 495s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 495s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 495s set -e 495s test $rc = 0 || t-report-failure 495s ' EXIT 495s ++ t-filter-out-git-hyphen-dir 495s ++ local pathent 495s +++ type -p git-rev-parse 495s +++ : 495s ++ pathent= 495s ++ case "$pathent" in 495s ++ return 495s ++ t-set-intree 495s ++ '[' x = x ']' 495s ++ return 495s ++ : -D 495s ++ export DGIT_TEST_DEBUG 495s ++ : x 495s ++ export DGIT_TEST_DEBPUSH_DEBUG 495s ++ : 495s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 495s ++ GIT_COMMITTER_DATE='1530000000 +0100' 495s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 495s ++ GIT_AUTHOR_DATE='1530000000 +0100' 495s ++ export LC_CTYPE=C.UTF-8 495s ++ LC_CTYPE=C.UTF-8 495s ++ unset CDPATH 495s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 495s ++ FILTER_BRANCH_SQUELCH_WARNING=1 495s +++ pwd 495s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 495s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 495s ++ testname=http-git-check 495s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 495s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 495s ++ bpd=.. 495s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 495s ++ '[' x '!=' x ']' 495s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s +++ pwd 495s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ t-set-using-tmp 495s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 495s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 495s ++ export 'DEBFULLNAME=dgit test git user' 495s ++ DEBFULLNAME='dgit test git user' 495s ++ git config --global user.email dgit-test@debian.example.net 495s ++ git config --global user.name 'dgit test git user' 495s ++ git config --global protocol.ext.allow always 495s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 495s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 495s ++ export DEBCHANGE_VENDOR=dpkg 495s ++ DEBCHANGE_VENDOR=dpkg 495s ++ unset VISUAL 495s ++ unset GIT_EDITOR 495s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 495s ++ cat 495s ++ schroot=build 495s ++ : aq 495s ++ : archive/test-dummy 495s ++ : sid:unstable 495s ++ t-git-config dgit.default.old-dsc-distro test-dummy 495s ++ git config --global dgit.default.old-dsc-distro test-dummy 495s ++ for import in ${autoimport-gnupg} 495s ++ case "$0" in 495s ++ t-setup-import gnupg 495s ++ local setupname=gnupg 495s ++ local setupsrc 495s ++ local lock 495s ++ '[' x = x ']' 495s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 495s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 495s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 495s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 495s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s ++ . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 495s +++ DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 495s +++ DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 495s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s +++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s +++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s +++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 495s +++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 495s +++ export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 495s +++ cat 495s +++ : /usr/bin/gpg-agent 495s ++++ type -p gpg-agent 495s +++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s +++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s +++ export DGIT_STUNT_AGENT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/gpg-agent 495s +++ DGIT_STUNT_AGENT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/gpg-agent 495s +++ t-tstunt gpg 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ local var=PATH 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ eval ' 495s case "$PATH" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PATH="$tstunt" ;; 495s *) PATH="$tstunt:$PATH" ;; 495s esac 495s export PATH 495s ' 495s ++++ case "$PATH" in 495s ++++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ export PATH 495s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ local var=PERLLIB 495s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s +++ eval ' 495s case "$PERLLIB" in 495s "$tstunt:"*) ;; 495s *":$tstunt:"*) ;; 495s "") PERLLIB="$tstunt" ;; 495s *) PERLLIB="$tstunt:$PERLLIB" ;; 495s esac 495s export PERLLIB 495s ' 495s ++++ case "$PERLLIB" in 495s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 495s ++++ export PERLLIB 495s +++ local f 495s +++ for f in "$@" 495s +++ t-tstunt--save-real gpg 495s +++ local f=gpg 495s +++ case "$f" in 495s +++ local rc 495s +++ local real 495s +++ set +e 495s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 495s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 495s ++++ type -p gpg 495s +++ real=/usr/bin/gpg 495s +++ rc=0 495s +++ set -e 495s +++ case $rc in 495s +++ local varname=gpg 495s +++ varname=DGIT_TEST_REAL_GPG 495s +++ eval ' 495s : ${DGIT_TEST_REAL_GPG:=$real} 495s export DGIT_TEST_REAL_GPG 495s ' 495s ++++ : /usr/bin/gpg 495s ++++ export DGIT_TEST_REAL_GPG 495s +++ f=./gpg 495s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 495s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 495s + t-dependencies libhttp-server-simple-static-perl 495s + : 'Hopefully installed: libhttp-server-simple-static-perl' 495s + t-setup-done '' --files-from=/dev/null ' 495s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 495s read <$tmp/must-clean/git-check.port git_check_port 495s 495s t-git-config --global dgit-distro.test-dummy.git-check url 495s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 495s t-git-config --global dgit-distro.test-dummy.git-check-url \ 495s http://127.0.0.1:$git_check_port 495s ' 495s + local savevars= 495s + local savedirs=--files-from=/dev/null 495s + local 'importeval= 495s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 495s read <$tmp/must-clean/git-check.port git_check_port 495s 495s t-git-config --global dgit-distro.test-dummy.git-check url 495s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 495s t-git-config --global dgit-distro.test-dummy.git-check-url \ 495s http://127.0.0.1:$git_check_port 495s ' 495s + local import=IMPORT.http-git-check 495s + exec 495s + local vn 495s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 495s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 495s print STDERR "saving-exporting $vn\n"; 495s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 495s or die $!; 495s } 495s ' 495s saving-exporting DGIT_TEST_REAL_GPG_AGENT 495s saving-exporting DGIT_TEST_REAL_GPG 495s + set -e 495s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s + tar cf IMPORT.http-git-check.tar --files-from=/dev/null 495s + printf '\n%s\n' ' 495s $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git 495s read <$tmp/must-clean/git-check.port git_check_port 495s 495s t-git-config --global dgit-distro.test-dummy.git-check url 495s t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 495s t-git-config --global dgit-distro.test-dummy.git-check-url \ 495s http://127.0.0.1:$git_check_port 495s ' 495s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 495s + rc=0 495s + set +x 495s + set +e 495s + pwd 495s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 495s + '[' x '!=' x ']' 495s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 495s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s + set -e 495s + test 0 = 0 495s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 495s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 495s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.http-git-check 495s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 495s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 495s ++ /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 495s ++ read git_check_port 495s ++ t-git-config --global dgit-distro.test-dummy.git-check url 495s ++ git config --global --global dgit-distro.test-dummy.git-check url 495s ++ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 495s ++ git config --global --global dgit-distro.test-dummy.git-check-suffix .git/HEAD 495s ++ t-git-config --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:37223 495s ++ git config --global --global dgit-distro.test-dummy.git-check-url http://127.0.0.1:37223 495s + cd example 495s + : 'non-dgit upload (but we prepare it with dgit anyway)' 495s + v=2.0-2+nmu1 495s + t-nmu-upload-1 nmu 495s + t-git-next-date 495s + GIT_COMMITTER_DATE='1530000002 +0100' 495s + GIT_AUTHOR_DATE='1530000002 +0100' 495s + nmubranch=nmu 495s + git checkout -f -b nmu 495s Switched to a new branch 'nmu' 495s + t-git-debrebase 495s + local gdr=git-debrebase 495s + : ' 495s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 495s + git-debrebase --dgit=dgit -D 495s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 495s git-debrebase ffq check_specs * 495s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 495s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 495s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 495s git-debrebase = AddPatches {"Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0,"Differs" => 4}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 495s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 495s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 495s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}]} 495s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 495s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 495s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 495s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 496s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 496s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 496s git-debrebase = Pseudomerge {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Type" => "Pseudomerge"} 496s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 496s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 496s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 496s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 496s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 496s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}]} 496s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 496s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 496s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 496s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 496s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 496s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 496s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 496s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 496s git-debrebase WALK REWRITING NOW cl=HASH(0x5569c7b63d68) procd=HASH(0x5569c7c182d8) 496s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 496s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 496s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 496s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 496s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 496s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 496s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase get_differs 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 496s git-debrebase *** WALK RETURN 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 496s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 496s git-debrebase >= update refs/ffq-prev/heads/nmu 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 496s git-debrebase >= delete refs/debrebase-last/heads/nmu 496s git-debrebase >= update HEAD 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 496s git-debrebase >$ 496s Recorded previous head for preservation 496s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 496s ' 496s + t-git-debrebase convert-to-gbp 496s + local gdr=git-debrebase 496s + : ' 496s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 496s + git-debrebase --dgit=dgit -D convert-to-gbp 496s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 496s git-debrebase get_differs 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 496s git-debrebase classify 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 517ec05ac4fb1052455f3fd8594c07fbc10d34e5/0x2 496s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 517ec05ac4fb1052455f3fd8594c07fbc10d34e5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c"} 496s git-debrebase get_differs 76e34cba590b7381fdabf3320a64b39e7f806f27 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 496s git-debrebase classify 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p 76e34cba590b7381fdabf3320a64b39e7f806f27/0x2 496s git-debrebase = Upstream {"Parents" => [{"CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent 76e34cba590b7381fdabf3320a64b39e7f806f27\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5","Type" => "Upstream"} 496s git-debrebase get_differs 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 496s git-debrebase classify 76e34cba590b7381fdabf3320a64b39e7f806f27 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9/0x2 496s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Parents" => [{"CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 496s git-debrebase get_differs 57f5145b3f1d8b14002345f278bc2d05f3c5d283 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 496s git-debrebase classify 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 57f5145b3f1d8b14002345f278bc2d05f3c5d283/0x10 496s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283"}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 57f5145b3f1d8b14002345f278bc2d05f3c5d283\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Changelog"} 496s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 496s git-debrebase classify 57f5145b3f1d8b14002345f278bc2d05f3c5d283 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 496s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","Type" => "Changelog"} 496s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 496s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 496s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 496s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 496s git-debrebase *** WALK 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 0 - 496s git-debrebase get_differs 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 496s git-debrebase classify 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 517ec05ac4fb1052455f3fd8594c07fbc10d34e5/0x2 496s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 517ec05ac4fb1052455f3fd8594c07fbc10d34e5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c"} 496s git-debrebase get_differs 76e34cba590b7381fdabf3320a64b39e7f806f27 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 496s git-debrebase classify 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p 76e34cba590b7381fdabf3320a64b39e7f806f27/0x2 496s git-debrebase = Upstream {"Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent 76e34cba590b7381fdabf3320a64b39e7f806f27\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "517ec05ac4fb1052455f3fd8594c07fbc10d34e5","Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 496s git-debrebase get_differs 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 496s git-debrebase classify 76e34cba590b7381fdabf3320a64b39e7f806f27 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9/0x2 496s git-debrebase = Upstream {"Parents" => [{"CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","CommitId" => "76e34cba590b7381fdabf3320a64b39e7f806f27","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Upstream"} 496s git-debrebase get_differs 57f5145b3f1d8b14002345f278bc2d05f3c5d283 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 496s git-debrebase classify 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 57f5145b3f1d8b14002345f278bc2d05f3c5d283/0x10 496s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "71f4bf5a8958ca445930338a054a6fe6fd6bcfe9","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 57f5145b3f1d8b14002345f278bc2d05f3c5d283\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283"}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 496s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 496s git-debrebase classify 57f5145b3f1d8b14002345f278bc2d05f3c5d283 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 496s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "57f5145b3f1d8b14002345f278bc2d05f3c5d283","Type" => "Changelog"} 496s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 496s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 496s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 496s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 496s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 2 proc 5 pm -1 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 6 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase WALK BUILD 57f5145b3f1d8b14002345f278bc2d05f3c5d283 Debian (rewriting=0) 496s git-debrebase WALK BUILD 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 Debian (rewriting=0) 496s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 496s git-debrebase WALK BUILD 76e34cba590b7381fdabf3320a64b39e7f806f27 Upstream (rewriting=0) 496s git-debrebase WALK BUILD 517ec05ac4fb1052455f3fd8594c07fbc10d34e5 Upstream (rewriting=0) 496s git-debrebase WALK BUILD 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c Upstream (rewriting=0) 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase get_differs 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c = 0 496s git-debrebase *** WALK RETURN 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase gbp_pq_export bw 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 496s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s git-debrebase >= delete refs/ffq-prev/heads/nmu 496s git-debrebase >= delete refs/debrebase-last/heads/nmu 496s git-debrebase >= update HEAD defc3045ee65e024ff97133f167bad6d877472dd 606ddfd5f59d40cf7f60aeadfbd12cb2c84a3c4c 496s git-debrebase >$ 496s HEAD is now at defc304 Commit patch queue (converted from git-debrebase format) 496s git-debrebase: converted to git-buildpackage branch format 496s git-debrebase: WARNING: do not now run "git-debrebase" any more 496s git-debrebase: WARNING: doing so would drop all upstream patches! 496s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 496s ' 496s + t-git-next-date 496s + GIT_COMMITTER_DATE='1530000003 +0100' 496s + GIT_AUTHOR_DATE='1530000003 +0100' 496s + gbp pq import 496s gbp:info: Trying to apply patches at 'defc3045ee65e024ff97133f167bad6d877472dd' 496s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu' 496s + t-nmu-upload-2 496s + t-git-next-date 496s + GIT_COMMITTER_DATE='1530000004 +0100' 496s + GIT_AUTHOR_DATE='1530000004 +0100' 496s + t-dch-commit -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 496s + t-debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 496s + DEBEMAIL=dgit-tests@example.org 496s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 496s + exec env TZ=UTC faketime -f 2018-06-26 08:00:04 env -u TZ /usr/bin/debchange -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 496s + git commit -m 'dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1' debian/changelog 496s [patch-queue/nmu 62e606f] dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 496s 1 file changed, 6 insertions(+) 496s + t-some-changes 496s + local token= 496s + local which=dum 496s + local fsuffix= 496s + t-git-next-date 496s + GIT_COMMITTER_DATE='1530000005 +0100' 496s + GIT_AUTHOR_DATE='1530000005 +0100' 496s + case "$which" in 496s + echo '// debian ' 496s + git add debian/zorkmid 496s + git commit -m 'DEBIAN add zorkmid ()' 496s [patch-queue/nmu 5f8f6a9] DEBIAN add zorkmid () 496s 1 file changed, 1 insertion(+) 496s create mode 100644 debian/zorkmid 496s + case "$which" in 496s + echo '// upstream ' 496s + git add src.c 496s + git commit -m 'UPSTREAM edit src.c ()' 496s [patch-queue/nmu 6849e90] UPSTREAM edit src.c () 496s 1 file changed, 1 insertion(+) 496s + case "$which" in 496s + for f in debian/zorkmid$fsuffix src$fsuffix.c 496s + echo '// both! ' 496s + git add debian/zorkmid 496s + for f in debian/zorkmid$fsuffix src$fsuffix.c 496s + echo '// both! ' 496s + git add src.c 496s + git commit -m 'MIXED add both() ()' 496s [patch-queue/nmu 670fa04] MIXED add both() () 496s 2 files changed, 2 insertions(+) 496s + t-git-next-date 496s + GIT_COMMITTER_DATE='1530000006 +0100' 496s + GIT_AUTHOR_DATE='1530000006 +0100' 496s + t-nmu-upload-3 496s + t-dch-commit-r 496s + t-dch-r-rune t-dch-commit 496s + local cmd=t-dch-commit 496s + shift 496s + local suite=unstable 496s + t-dch-commit -r -D unstable '' 496s + t-debchange -r -D unstable '' 496s + DEBEMAIL=dgit-tests@example.org 496s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 496s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -r -D unstable 496s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 496s libdistro-info-perl is not installed, Debian release names are not known. 496s libdistro-info-perl is not installed, Ubuntu release names are not known. 496s + git commit -m 'dch -r -D unstable ' debian/changelog 496s [patch-queue/nmu 23eab92] dch -r -D unstable 496s 1 file changed, 2 insertions(+), 2 deletions(-) 496s + t-non-dgit-upload 496s + t-dgit -wgf build-source 496s + local dgit=dgit 496s + pwd 496s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 496s + : ' 496s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 496s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 496s | git rev-parse --show-toplevel 496s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 496s | git config -z --get-regexp --local '.*' 496s | git config -z --get-regexp --local '.*' 496s | git config -z --get-regexp --global '.*' 496s | git config -z --get-regexp --system '.*' 496s format 3.0 (quilt), quilt mode linear 496s Format `3.0 (quilt)', need to check/update patch stack 496s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 496s => `' 496s + git diff --quiet HEAD 496s | git clean -dn 496s => `' 496s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 496s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 496s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 496s | git rev-parse 'HEAD~0' 496s => `23eab9231bebc66df63a58cf1dcf43a42e7cbf71' 496s | git symbolic-ref -q HEAD 496s => `refs/heads/patch-queue/nmu' 496s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 496s CD work 496s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 496s + git reset -q --hard 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 496s examining quilt state (multiple patches, linear mode) 496s branch_is_gdr 23eab9231bebc66df63a58cf1dcf43a42e7cbf71... 496s branch_is_gdr 71f4bf5a8958ca445930338a054a6fe6fd6bcfe9 ?-patches NO 496s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 496s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 496s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 496s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 497s CD fake 497s | find -name .git -prune -print0 497s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 497s + git checkout -f 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian 497s + git add -Af . 497s | git write-tree 497s => `1788bf8b5625467a49467c04d856feb43b0b6986' 497s fake orig tree object 1788bf8b5625467a49467c04d856feb43b0b6986 497s CD .. 497s + git reset -q --hard 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s CD ../fake 497s + git add -Af . 497s | git write-tree 497s => `1cd4795fb8fc362d7692476e021e1b13a5e903e1' 497s fake o+d/p tree object 1788bf8b5625467a49467c04d856feb43b0b6986 497s CD ../work 497s | git ls-tree --name-only -z 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 497s | git diff-tree -z --no-renames -r 1788bf8b5625467a49467c04d856feb43b0b6986 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc bf31719ad256ba6efa065624e66caee0a3e3323f M\x00src.c\x00' 497s quiltify_trees_differ 1788bf8b5625467a49467c04d856feb43b0b6986 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 => 1 497s | git diff-tree -z --no-renames --name-only -r 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `src.c\x00' 497s quiltify_trees_differ 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 497s | git diff-tree -z --no-renames --name-only -r 1788bf8b5625467a49467c04d856feb43b0b6986 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `lib.c\x00new-upstream-file\x00src.c\x00' 497s quiltify_trees_differ 1788bf8b5625467a49467c04d856feb43b0b6986 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 497s differences @dl ## ## ## == == ==. 497s dgit: base trees orig=1788bf8b5625467a4946 o+d/p=1cd4795fb8fc362d7692 497s dgit: quilt differences: src: ## orig ## gitignores: == orig == 497s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 497s starting quiltify (multiple patches, linear mode) 497s | git ls-tree --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/rules debian/control 497s => `debian/control'... 497s quiltify investigate 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s | git diff-tree -z --no-renames --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `src.c\x00' 497s quiltify_trees_differ 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 497s | git ls-tree --name-only 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/rules debian/control 497s => `debian/control'... 497s | git cat-file commit 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s => `tree 3e55010d546443f076d86ad8848c8e7543609e73'... 497s | git diff-tree -z --no-renames --name-only 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s => `debian\x00' 497s quiltify_trees_differ 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 => 0 497s considering C=23eab9231bebc66df63a58cf1dcf43a42e7cbf71 P=670fa04673b0781ff783257fecc557cf8427b9df 497s | git diff-tree -r --name-only 670fa04673b0781ff783257fecc557cf8427b9df 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 -- debian/patches .pc debian/source/format 497s => `' 497s search queue P=670fa04673b0781ff783257fecc557cf8427b9df triv 497s quiltify investigate 670fa04673b0781ff783257fecc557cf8427b9df 497s | git diff-tree -z --no-renames --name-only 670fa04673b0781ff783257fecc557cf8427b9df 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `debian\x00src.c\x00' 497s quiltify_trees_differ 670fa04673b0781ff783257fecc557cf8427b9df 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 497s | git ls-tree --name-only 670fa04673b0781ff783257fecc557cf8427b9df -- debian/rules debian/control 497s => `debian/control'... 497s | git cat-file commit 670fa04673b0781ff783257fecc557cf8427b9df 497s => `tree df5df2d2ccb45e6298d28ef193050005346cc580'... 497s | git diff-tree -z --no-renames --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df 497s => `debian\x00src.c\x00' 497s quiltify_trees_differ 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df => 1 497s considering C=670fa04673b0781ff783257fecc557cf8427b9df P=6849e9014ff33537c19eea91a1b3296721b1b45c 497s | git diff-tree -r --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 670fa04673b0781ff783257fecc557cf8427b9df -- debian/patches .pc debian/source/format 497s => `' 497s search queue P=6849e9014ff33537c19eea91a1b3296721b1b45c NT 497s quiltify investigate 6849e9014ff33537c19eea91a1b3296721b1b45c 497s | git diff-tree -z --no-renames --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `debian\x00src.c\x00' 497s quiltify_trees_differ 6849e9014ff33537c19eea91a1b3296721b1b45c 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 1 497s | git ls-tree --name-only 6849e9014ff33537c19eea91a1b3296721b1b45c -- debian/rules debian/control 497s => `debian/control'... 497s | git cat-file commit 6849e9014ff33537c19eea91a1b3296721b1b45c 497s => `tree 0c4970196145bc2bf2f453b0100fdd8e0f24045a'... 497s | git diff-tree -z --no-renames --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c 497s => `src.c\x00' 497s quiltify_trees_differ 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c => 1 497s considering C=6849e9014ff33537c19eea91a1b3296721b1b45c P=5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 497s | git diff-tree -r --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 6849e9014ff33537c19eea91a1b3296721b1b45c -- debian/patches .pc debian/source/format 497s => `' 497s search queue P=5f8f6a9309aed4ea6f9788677ad3bbc1d926796a NT 497s quiltify investigate 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 497s | git diff-tree -z --no-renames --name-only 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1cd4795fb8fc362d7692476e021e1b13a5e903e1 497s => `debian\x00' 497s quiltify_trees_differ 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a 1cd4795fb8fc362d7692476e021e1b13a5e903e1 => 0 497s search finished hooray! 497s quiltify linearisation planning successful, executing... 497s quiltify traverse 5f8f6a9309aed4ea6f9788677ad3bbc1d926796a..6849e9014ff33537c19eea91a1b3296721b1b45c 497s | git cat-file commit 6849e9014ff33537c19eea91a1b3296721b1b45c 497s => `tree 0c4970196145bc2bf2f453b0100fdd8e0f24045a'... 497s | git log -n1 '--pretty=format:%aD' 6849e9014ff33537c19eea91a1b3296721b1b45c 497s => `Tue, 26 Jun 2018 09:00:05 +0100' 497s + git checkout -q 6849e9014ff33537c19eea91a1b3296721b1b45c 497s + git checkout -q 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 debian/changelog 497s | realpath -- /usr/bin/dgit 497s => `/usr/bin/dgit' 497s | realpath -- .git/dgit/quilt-description.tmp 497s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 497s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-.patch 497s dpkg-source: info: using patch list from debian/patches/series 497s dpkg-source: info: local changes detected, the modified files are: 497s work/src.c 497s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-.patch 497s + git checkout -q 6849e9014ff33537c19eea91a1b3296721b1b45c debian/changelog 497s quiltify traverse 6849e9014ff33537c19eea91a1b3296721b1b45c..670fa04673b0781ff783257fecc557cf8427b9df 497s | git cat-file commit 670fa04673b0781ff783257fecc557cf8427b9df 497s => `tree df5df2d2ccb45e6298d28ef193050005346cc580'... 497s | git log -n1 '--pretty=format:%aD' 670fa04673b0781ff783257fecc557cf8427b9df 497s => `Tue, 26 Jun 2018 09:00:05 +0100' 497s + git checkout -q 670fa04673b0781ff783257fecc557cf8427b9df 497s + git checkout -q 23eab9231bebc66df63a58cf1dcf43a42e7cbf71 debian/changelog 497s | realpath -- /usr/bin/dgit 497s => `/usr/bin/dgit' 497s | realpath -- .git/dgit/quilt-description.tmp 497s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 497s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-.patch 497s dpkg-source: info: using patch list from debian/patches/series 497s dpkg-source: info: local changes detected, the modified files are: 497s work/src.c 497s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-.patch 497s + git checkout -q 670fa04673b0781ff783257fecc557cf8427b9df debian/changelog 497s quiltify traverse 670fa04673b0781ff783257fecc557cf8427b9df..23eab9231bebc66df63a58cf1dcf43a42e7cbf71 497s + git checkout -q master 497s | git status --ignored --porcelain 497s => ` M debian/patches/series'... 497s + git add -f debian/patches 497s Commit Debian 3.0 (quilt) metadata 497s 497s [dgit (9.15) quilt-fixup] 497s 497s + git commit -m 'Commit Debian 3.0 (quilt) metadata 497s 497s [dgit (9.15) quilt-fixup] 497s ' 497s [master 0aa07db] Commit Debian 3.0 (quilt) metadata 497s 3 files changed, 29 insertions(+) 497s create mode 100644 debian/patches/mixed-add-both-.patch 497s create mode 100644 debian/patches/upstream-edit-src.c-.patch 497s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 497s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 497s | git rev-parse 'HEAD~0' 497s => `0aa07db4f0fdaba06a489ec6bf6624578a87b23f' 497s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 497s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 497s CD work 497s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 497s + git reset -q --hard 0aa07db4f0fdaba06a489ec6bf6624578a87b23f 497s CD .. 497s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 497s dpkg-source: info: using source format '3.0 (quilt)' 497s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 497s dpkg-source: info: using patch list from debian/patches/series 497s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 497s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 497s CD work 497s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 497s changelog will contain changes since 2.0-2 497s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 498s dpkg-genchanges: info: not including original source code in upload 498s CD .. 498s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 498s renaming (Files) example_2.0.orig.tar.gz 498s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 498s renaming (dsc) example_2.0-2+nmu1.dsc 498s renaming (changes) example_2.0-2+nmu1_source.changes 498s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 498s dgit ok: source built, results in example_2.0-2+nmu1.dsc and example_2.0-2+nmu1_source.changes 498s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 498s ' 498s + cd .. 498s + c=example_2.0-2+nmu1_source.changes 498s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.0-2+nmu1_source.changes 498s signfile dsc example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 498s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 498s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 498s 498s fixup_changes dsc example_2.0-2+nmu1.dsc example_2.0-2+nmu1_source.changes 498s signfile changes example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 498s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 498s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 498s 498s Successfully signed dsc, changes files 498s + dput -c /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy example_2.0-2+nmu1_source.changes 498s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 498s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 498s D: Setting host argument. 498s Checking signature on .changes 498s Checking signature on .dsc 498s Uploading to test-dummy (via local to localhost): 498s Successfully uploaded packages. 498s + t-archive-process-incoming sid 498s + local suite=sid 498s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 498s + t-archive-query sid 498s + local suite=sid 498s + local dscf=main/example_2.0-2+nmu1.dsc 498s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 498s + local suite=sid 498s + local p=example 498s + local v=2.0-2+nmu1 498s + local dscf=main/example_2.0-2+nmu1.dsc 498s + local sha 498s ++ sha256sum 498s + sha='df92ff4f610a207028ad009a412e6dfbb0b5ddc709bddbe999fa39ceae7584e0 -' 498s + echo '2.0-2+nmu1 df92ff4f610a207028ad009a412e6dfbb0b5ddc709bddbe999fa39ceae7584e0 main/example_2.0-2+nmu1.dsc' 498s + t-aq-archive-updated sid example 498s + local suite=sid 498s + local p=example 498s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 498s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 498s + perl -wne ' 498s use JSON; 498s use strict; 498s our @v; 498s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 498s push @v, { 498s "version" => "$1", 498s "sha256sum" => "$2", 498s "component" => "$3", 498s "filename" => "$4", 498s }; 498s END { 498s my $json = JSON->new->canonical(); 498s print $json->encode(\@v) or die $!; 498s } 498s ' 498s + t-git-next-date 498s + GIT_COMMITTER_DATE='1530000007 +0100' 498s + GIT_AUTHOR_DATE='1530000007 +0100' 498s + cd example 498s + git checkout master 498s Switched to branch 'master' 498s Your branch is up to date with 'origin/master'. 498s + : 'done the nmu, switching back to the maintainer hat' 498s + nmu-fold 498s + t-git-next-date 498s + GIT_COMMITTER_DATE='1530000008 +0100' 498s + GIT_AUTHOR_DATE='1530000008 +0100' 498s + t-dgit fetch 498s + local dgit=dgit 498s + pwd 498s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 498s + : ' 498s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 498s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 498s | git rev-parse --show-toplevel 498s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 498s | git config -z --get-regexp --local '.*' 498s | git config -z --get-regexp --local '.*' 498s | git config -z --get-regexp --global '.*' 498s | git config -z --get-regexp --system '.*' 498s | git symbolic-ref -q HEAD 498s => `refs/heads/master' 498s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 498s canonical suite name for unstable is sid 498s query: fetching http://127.0.0.1:37223/example.git/HEAD... 498s dgit-repos check_for_git => 1. 498s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 498s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 498s git_lrfetch_sane iteration 0 498s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 498s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 498s => 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/tags/archive/test-dummy/2.0-1 498s => 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/tags/archive/test-dummy/2.0-2 498s => b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/tags/test-dummy/2.0-1 498s => aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/tags/test-dummy/2.0-2 498s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 498s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 498s | git for-each-ref refs/dgit-fetch/test-dummy 498s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 498s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 498s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 498s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 498s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 498s git_lrfetch_sane: tidying any old suite lrfetchrefs 498s | git for-each-ref refs/dgit-fetch/sid 498s git_lrfetch_sane: git fetch --no-insane emulation complete 498s $VAR1 = { 498s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f', 498s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '8b9773e7665f0cfd3d94dedfa13bf18fc976540a', 498s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '73453a4cf312f7fee81e3400e57fb36d7777c35f', 498s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188', 498s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 498s }; 498s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 498s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/tags/archive/test-dummy/2.0-1 498s currently refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 498s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/tags/archive/test-dummy/2.0-2 498s currently refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 498s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/tags/test-dummy/2.0-1 498s currently refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 498s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/tags/test-dummy/2.0-2 498s currently refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 498s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 498s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 498s offered refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 498s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 498s offered refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 498s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 498s offered refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 498s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 498s offered refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 498s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 498s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 498s get_archive_dsc: Version 2.0-2+nmu1 498s last upload to archive: NO git hash 498s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 498s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 498s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 498s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 498s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 498s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 498s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 498s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 498s using existing example_2.0.orig.tar.gz 498s considering saving example_2.0.orig.tar.gz: (File exists) no need. 498s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 498s using existing example_2.0-2+nmu1.debian.tar.xz 498s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 498s import considering example_2.0.orig.tar.gz Y .gz orig 498s + chmod -R '+rwX' _unpack-tar 498s CD _unpack-tar 498s | find -name .git -prune -print0 498s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 498s + git add -Af . 498s | git write-tree 498s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 498s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 498s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 498s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 498s CD .. 498s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 498s + chmod -R '+rwX' _unpack-tar 498s CD _unpack-tar 498s | find -name .git -prune -print0 498s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 498s + git add -Af . 498s | git write-tree 498s => `f423a4033bb213dc3f6479fa9fe8938121cd3bb5' 498s | git ls-tree -z f423a4033bb213dc3f6479fa9fe8938121cd3bb5 498s => `040000 tree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54\x09debian\x00' 498s one subtree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 498s CD .. 498s + dpkg-source --no-check --skip-patches -x -- example.dsc 498s dpkg-source: info: extracting example in example-2.0 498s dpkg-source: info: unpacking example_2.0.orig.tar.gz 498s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 498s CD example-2.0 498s | find -name .git -prune -print0 498s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 498s + git add -Af . 498s | git write-tree 498s => `6d28f15d394bda27c6a9a8961b2bc81fcf61e781' 498s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 498s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 498s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 498s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 499s + git add -Af . 499s | git write-tree 499s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 499s import clog search... 499s | dpkg-parsechangelog --format rfc822 --all 499s import clog 2.0-2+nmu1 package changelog, entry no.1... 499s import clog 2.0-2+nmu1 vs 2.0... 499s import clog 2.0-2+nmu1 becomes r1 499s import clog 2.0-2 package changelog, entry no.2... 499s import clog 2.0-2 vs 2.0... 499s import clog 2.0-2 becomes r1 499s import clog 2.0-1 package changelog, entry no.3... 499s import clog 2.0-1 vs 2.0... 499s import clog 2.0-1 becomes r1 499s import clog 1.0-1 package changelog, entry no.4... 499s import clog 1.0-1 vs 2.0... 499s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 499s => `1530000006 +0000' 499s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 499s => `1530000000 +0000' 499s import tartrees authline dgit test git user 1530000006 +0000 499s import tartrees r1authline dgit test git user 1530000000 +0000 499s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 499s | git hash-object -w -t commit --stdin 499s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 499s import tartree example_2.0-2+nmu1.debian.tar.xz 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 499s | git hash-object -w -t commit --stdin 499s => 969f770a4ce0e44543c83f86bc52b1086e105a4f 499s import main commit 499s | git hash-object -w -t commit ../commit.tmp 499s => `e5eb08492f31d817c6b9441907350bc6302882c8' 499s import apply patches... 499s | git hash-object -w -t commit --stdin 499s => e9f96320b1318ff6811938626ebe0fc74d4f5555 499s + git checkout -q -b dapplied e9f96320b1318ff6811938626ebe0fc74d4f5555 499s + git checkout -q -b unpa e5eb08492f31d817c6b9441907350bc6302882c8 499s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 499s => `1530000006 +0000' 499s + git checkout -q unpa 499s + git update-ref -d refs/heads/patch-queue/unpa 499s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 499s | git rev-parse 'HEAD~0' 499s => `e76b40833a6827a6dda6f8583fb72ed7affa43da' 499s | git rev-parse HEAD: 499s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 499s synthesised git commit from .dsc 2.0-2+nmu1 499s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 499s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 499s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob e76b40833a6827a6dda6f8583fb72ed7affa43da:debian/changelog 499s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf e76b40833a6827a6dda6f8583fb72ed7affa43da 499s =>!256 499s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s fetch mergeinfos: 499s commit e76b40833a6827a6dda6f8583fb72ed7affa43da Import of source package 499s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf dgit suite branch on dgit git server 499s ReverseParents=1 Message=Record example (2.0-2+nmu1) in archive suite sid 499s | git cat-file commit e76b40833a6827a6dda6f8583fb72ed7affa43da 499s => `tree c35a831ed16058cd02d5b26782482c07fdbe3b0a'... 499s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 499s => `1530000006 +0000' 499s | git hash-object -w -t commit /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/mergecommit 499s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 499s fetch hash=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 499s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 499s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s | git log -n2 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s => `commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275'... 499s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s => `' 499s | git ls-tree -lrz -- 1c8e3b534eac1867c8911d4e5f923d5f7bcee275: 499s dgit ok: fetched into refs/remotes/dgit/dgit/sid 499s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 499s del_lrfetchrefs... 499s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 499s del_lrfetchrefs: 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 499s del_lrfetchrefs: 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 499s del_lrfetchrefs: b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 499s del_lrfetchrefs: aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 499s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 499s ' 499s + t-git-next-date 499s + GIT_COMMITTER_DATE='1530000009 +0100' 499s + GIT_AUTHOR_DATE='1530000009 +0100' 499s + git merge --ff-only dgit/dgit/sid 499s Updating 6b22dd5..1c8e3b5 499s Fast-forward 499s debian/changelog | 6 ++++++ 499s debian/patches/mixed-add-both-.patch | 14 ++++++++++++++ 499s debian/patches/series | 2 ++ 499s debian/patches/upstream-edit-src.c-.patch | 13 +++++++++++++ 499s debian/zorkmid | 2 ++ 499s src.c | 2 ++ 499s 6 files changed, 39 insertions(+) 499s create mode 100644 debian/patches/mixed-add-both-.patch 499s create mode 100644 debian/patches/upstream-edit-src.c-.patch 499s create mode 100644 debian/zorkmid 499s + git diff --exit-code patch-queue/nmu 499s + git branch unlaundered.nmu 499s + t-git-debrebase 499s + local gdr=git-debrebase 499s + : ' 499s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 499s + git-debrebase --dgit=dgit -D 499s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 499s git-debrebase ffq check_specs * 499s git-debrebase ffq merge master 499s git-debrebase ffq check_remote origin remote fetch/merge branch 499s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 499s OK, you are ahead of refs/remotes/origin/master 499s git-debrebase ffq check_remote undef remote push branch 499s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 499s OK, you are ahead of refs/remotes/dgit/dgit/sid 499s git-debrebase *** WALK 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 0 - 499s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x36 499s git-debrebase get_differs e76b40833a6827a6dda6f8583fb72ed7affa43da c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0 499s git-debrebase classify 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x36 e76b40833a6827a6dda6f8583fb72ed7affa43da/0 499s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 54,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"},{"Differs" => 0,"CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Ix" => 1}],"Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nparent e76b40833a6827a6dda6f8583fb72ed7affa43da\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "Record example (2.0-2+nmu1) in archive suite sid\n","Type" => "Pseudomerge","CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Contributor" => $VAR1->{"Parents"}[1],"Overwritten" => [$VAR1->{"Parents"}[0]]} 499s git-debrebase get_differs 02a3797b3764d6d76e05ca0d881afa88c2b12430 c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x2 499s git-debrebase classify e76b40833a6827a6dda6f8583fb72ed7affa43da $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 02a3797b3764d6d76e05ca0d881afa88c2b12430/0x2 499s git-debrebase = Upstream {"Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","Parents" => [{"Ix" => 0,"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Differs" => 2}],"Type" => "Upstream","CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 02a3797b3764d6d76e05ca0d881afa88c2b12430\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 499s git-debrebase get_differs 9831208f76656ac811c76b57017774de3ed7b1da 0ec7ae0689075193fd516c119e67ec1adbc0b968 = 0x2 499s git-debrebase classify 02a3797b3764d6d76e05ca0d881afa88c2b12430 $t=0ec7ae0689075193fd516c119e67ec1adbc0b968 @p 9831208f76656ac811c76b57017774de3ed7b1da/0x2 499s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0ec7ae0689075193fd516c119e67ec1adbc0b968","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da"}],"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Hdr" => "tree 0ec7ae0689075193fd516c119e67ec1adbc0b968\nparent 9831208f76656ac811c76b57017774de3ed7b1da\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 499s git-debrebase get_differs 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 a23e6d130529f794fcb76ce8913d68adec691fcb = 0x2 499s git-debrebase classify 9831208f76656ac811c76b57017774de3ed7b1da $t=a23e6d130529f794fcb76ce8913d68adec691fcb @p 156c10ffb534a1f5eafbadccb63eca4a26ce8b00/0x2 499s git-debrebase = Upstream {"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Ix" => 0}],"Tree" => "a23e6d130529f794fcb76ce8913d68adec691fcb","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree a23e6d130529f794fcb76ce8913d68adec691fcb\nparent 156c10ffb534a1f5eafbadccb63eca4a26ce8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000006 +0000\n"} 499s git-debrebase get_differs 682d84eb05d2504821c98a0d135926a85f3476c5 ac14e7b566c102651f4279a83b03fbe091783ff9 = 0x2 499s git-debrebase classify 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 $t=ac14e7b566c102651f4279a83b03fbe091783ff9 @p 682d84eb05d2504821c98a0d135926a85f3476c5/0x2 499s git-debrebase = Upstream {"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Differs" => 2}],"Tree" => "ac14e7b566c102651f4279a83b03fbe091783ff9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree ac14e7b566c102651f4279a83b03fbe091783ff9\nparent 682d84eb05d2504821c98a0d135926a85f3476c5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000006 +0000\n"} 499s git-debrebase get_differs e5eb08492f31d817c6b9441907350bc6302882c8 ddb581efae7b5021b033468a6bd472f8ecbce423 = 0x2 499s git-debrebase classify 682d84eb05d2504821c98a0d135926a85f3476c5 $t=ddb581efae7b5021b033468a6bd472f8ecbce423 @p e5eb08492f31d817c6b9441907350bc6302882c8/0x2 499s git-debrebase = Upstream {"Tree" => "ddb581efae7b5021b033468a6bd472f8ecbce423","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8"}],"Type" => "Upstream","CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Hdr" => "tree ddb581efae7b5021b033468a6bd472f8ecbce423\nparent e5eb08492f31d817c6b9441907350bc6302882c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 499s git-debrebase get_differs 6587c6c396e0002956dd3b151fe4b82e0bd7611c 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x34 499s git-debrebase get_differs 969f770a4ce0e44543c83f86bc52b1086e105a4f 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x36 499s git-debrebase classify e5eb08492f31d817c6b9441907350bc6302882c8 $t=6d28f15d394bda27c6a9a8961b2bc81fcf61e781 @p 6587c6c396e0002956dd3b151fe4b82e0bd7611c/0x34 969f770a4ce0e44543c83f86bc52b1086e105a4f/0x36 499s git-debrebase = DgitImportUnpatched {"Tree" => "6d28f15d394bda27c6a9a8961b2bc81fcf61e781","Parents" => [{"IsOrigin" => 1,"IsDgitImport" => "orig","Ix" => 0,"Differs" => 52,"CommitId" => "6587c6c396e0002956dd3b151fe4b82e0bd7611c"},{"CommitId" => "969f770a4ce0e44543c83f86bc52b1086e105a4f","Differs" => 54,"IsOrigin" => 1,"IsDgitImport" => "tarball","Ix" => 1}],"NewMsg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[was: dgit import unpatched example 2.0-2+nmu1]\n","Hdr" => "tree 6d28f15d394bda27c6a9a8961b2bc81fcf61e781\nparent 6587c6c396e0002956dd3b151fe4b82e0bd7611c\nparent 969f770a4ce0e44543c83f86bc52b1086e105a4f\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n","Type" => "DgitImportUnpatched","CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8","OrigParents" => [$VAR1->{"Parents"}[0]]} 499s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 499s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 499s git-debrebase = AddPatches {"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4,"Ix" => 0}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 499s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 499s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 499s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 499s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 499s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 499s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog"} 499s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 499s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 499s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 499s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Contributor" => {"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0},"Type" => "Pseudomerge","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 499s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 499s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 499s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 499s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 499s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 499s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 499s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 499s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 499s git-debrebase = Upstream {"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 499s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 499s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 499s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 499s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 499s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 10 proc 18 pm 1 499s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 499s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 499s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 19 499s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 499s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 499s git-debrebase WALK REWRITING NOW cl=HASH(0x55dc7458bb48) procd=HASH(0x55dc74590c40) 499s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 499s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 499s git-debrebase WALK BUILD e5eb08492f31d817c6b9441907350bc6302882c8 DgitImportUpstreamUpdate (rewriting=1) 499s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e e5eb08492f31d817c6b9441907350bc6302882c8 = 0x34 499s git-debrebase WALK BUILD e5eb08492f31d817c6b9441907350bc6302882c8 DgitImportDebianUpdate (rewriting=1) 499s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 499s git-debrebase WALK BUILD 682d84eb05d2504821c98a0d135926a85f3476c5 Upstream (rewriting=1) 499s git-debrebase WALK BUILD 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 Upstream (rewriting=1) 499s git-debrebase WALK BUILD 9831208f76656ac811c76b57017774de3ed7b1da Upstream (rewriting=1) 499s git-debrebase WALK BUILD 02a3797b3764d6d76e05ca0d881afa88c2b12430 Upstream (rewriting=1) 499s git-debrebase WALK BUILD e76b40833a6827a6dda6f8583fb72ed7affa43da Upstream (rewriting=1) 499s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 499s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 499s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 = 0x4 499s git-debrebase *** WALK RETURN 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 e4eca65c490ba804c753f8fc1ef367ba07d51c08 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 499s git-debrebase: laundered (head was 1c8e3b534eac1867c8911d4e5f923d5f7bcee275) 499s git-debrebase >= update refs/ffq-prev/heads/master 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 0000000000000000000000000000000000000000 499s git-debrebase >= delete refs/debrebase-last/heads/master 499s git-debrebase >= update HEAD 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 499s git-debrebase >$ 499s Recorded previous head for preservation 499s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 499s ' 499s + t-gdr-good laundered 499s + local state=laundered 499s + local beforetag= 499s + case $state in 499s + git diff --quiet -- :. ':!debian/patches' 499s + LC_MESSAGES=C 499s + t-git-debrebase status 499s + local gdr=git-debrebase 499s + : ' 499s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 499s + git-debrebase --dgit=dgit -D status 499s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 499s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 499s git-debrebase = Upstream {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 499s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 499s git-debrebase = Upstream {"Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Type" => "Upstream","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 499s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 499s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 499s git-debrebase = Upstream {"Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"} 499s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 499s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 499s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"}]} 499s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 499s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 499s git-debrebase = Upstream {"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Parents" => [{"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Differs" => 2,"Ix" => 0}]} 499s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 499s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 499s git-debrebase = Packaging {"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Type" => "Packaging","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}],"Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 499s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 499s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16,"Ix" => 0}]} 499s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 499s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 499s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 499s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 499s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 499s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 499s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 499s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 499s ' 499s + case $state in 499s + egrep '^ *branch is laundered' ../status.check 499s branch is laundered 499s + t-gdr-good-analyse HEAD laundered 499s + local head=HEAD 499s + local state=laundered 499s + local wsfx= 499s + local etypes bwtip 499s + case $state in 499s + etypes=Upstream 499s ++ t-git-debrebase breakwater 499s ++ local gdr=git-debrebase 499s ++ : ' 499s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 499s ++ git-debrebase --dgit=dgit -D breakwater 499s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 499s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 499s git-debrebase = Upstream {"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"Ix" => 0,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2}]} 499s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 499s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 499s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Differs" => 2}],"Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 499s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 499s git-debrebase = Upstream {"Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Type" => "Upstream","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}]} 499s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 499s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 499s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0,"Differs" => 2}],"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 499s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 499s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 499s git-debrebase = Upstream {"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 499s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 499s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48}],"Type" => "Packaging","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 499s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 499s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 499s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 499s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 499s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 499s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 499s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 499s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 499s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 499s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 499s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 499s ' 499s + bwtip=Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 499s + anal=../anal 499s + t-git-debrebase analyse HEAD 499s + local gdr=git-debrebase 499s + : ' 499s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 499s + git-debrebase --dgit=dgit -D analyse HEAD 499s git-debrebase *** WALK 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1 *main::STDOUT 499s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 499s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 499s git-debrebase = Upstream {"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 499s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 499s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 499s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Type" => "Upstream","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}]} 499s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 499s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 499s git-debrebase = Upstream {"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 500s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 500s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 500s git-debrebase = Upstream {"Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 500s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 500s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 500s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 500s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 500s git-debrebase = Packaging {"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}],"Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 500s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 500s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 500s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}],"Msg" => "dch -r -D unstable\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 500s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 500s git-debrebase = Changelog {"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 500s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 500s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 500s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 500s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 500s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 4 proc 8 pm -1 500s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 500s ' 500s ++ git rev-parse HEAD 500s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + exec 500s + local cid ctype info nparents 500s + read cid ctype info 500s + : ===== 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream ===== 500s + test 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 = 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + local parents=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + expect=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + enparents=1 500s + : Upstream/SAME 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream ===== 500s + test 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a = 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + local parents=677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + expect=677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + enparents=1 500s + : Upstream/SAME 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream ===== 500s + test 677859b96829ce23dbcd8a3baa95a2353bc42da2 = 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + local parents=f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + expect=f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + enparents=1 500s + : Upstream/SAME f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream ===== 500s + test f9ddccb3801445213b338eaa4f0d5881a35a84dc = f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + local parents=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + expect=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + enparents=1 500s + : Upstream/SAME 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream ===== 500s + test 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 = 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + local parents=e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + expect=e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + enparents=1 500s + : Upstream/SAME e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== e4eca65c490ba804c753f8fc1ef367ba07d51c08 Packaging ===== 500s + test e4eca65c490ba804c753f8fc1ef367ba07d51c08 = e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + local cetype=Upstream 500s + '[' xPackaging = xUpstream ']' 500s ++ git log -n1 --pretty=format:%P e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + local parents=8397762c3c6a31b895366f874e97ed0805b1939e 500s + expect=8397762c3c6a31b895366f874e97ed0805b1939e 500s + enparents=1 500s + : Packaging/Upstream 8397762c3c6a31b895366f874e97ed0805b1939e 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + '[' xY:e4eca65c490ba804c753f8fc1ef367ba07d51c08 '!=' x ']' 500s + test Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 = Y:e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + bwtip= 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :. ':!debian' 500s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :debian/patches 500s + etypes=Packaging 500s ++ printf %s 8397762c3c6a31b895366f874e97ed0805b1939e 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 8397762c3c6a31b895366f874e97ed0805b1939e 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 8397762c3c6a31b895366f874e97ed0805b1939e Changelog ===== 500s + test 8397762c3c6a31b895366f874e97ed0805b1939e = 8397762c3c6a31b895366f874e97ed0805b1939e 500s + local cetype=Packaging 500s + '[' xChangelog = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P 8397762c3c6a31b895366f874e97ed0805b1939e 500s + local parents=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + expect=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + enparents=1 500s + : Changelog/Packaging d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet d640e62b152fddf68faaa04c9d3ca9ab8f417ca3..8397762c3c6a31b895366f874e97ed0805b1939e -- :. ':!debian/changelog' 500s + etypes=Packaging 500s ++ printf %s d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Changelog ===== 500s + test d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 = d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + local cetype=Packaging 500s + '[' xChangelog = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + enparents=1 500s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 -- :. ':!debian/changelog' 500s + etypes=Packaging 500s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 500s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + local cetype=Packaging 500s + '[' xAnchor = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + enparents=1 500s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + break 500s + t-git-debrebase stitch 500s + local gdr=git-debrebase 500s + : ' 500s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 500s + git-debrebase --dgit=dgit -D stitch 500s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 500s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 500s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 500s git-debrebase = Upstream {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe"} 500s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 500s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 500s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 500s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 500s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 500s git-debrebase = Upstream {"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Type" => "Upstream","Parents" => [{"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"} 500s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 500s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 500s git-debrebase = Upstream {"Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"}]} 500s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 500s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 500s git-debrebase = Upstream {"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"} 500s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 500s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 500s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 48,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}],"Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Type" => "Packaging","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 500s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 500s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 500s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 500s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 500s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 500s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 500s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 500s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 500s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 500s git-debrebase >= delete refs/ffq-prev/heads/master 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 500s git-debrebase >= update refs/debrebase-last/heads/master a0e76af573321d5714d63cd5c464d783da6b72b4 0000000000000000000000000000000000000000 500s git-debrebase >= update HEAD a0e76af573321d5714d63cd5c464d783da6b72b4 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s git-debrebase >$ 500s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 500s ' 500s + t-gdr-good stitched 500s + local state=stitched 500s + local beforetag= 500s + case $state in 500s + git diff --quiet -- :. ':!debian/patches' 500s + LC_MESSAGES=C 500s + t-git-debrebase status 500s + local gdr=git-debrebase 500s + : ' 500s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 500s + git-debrebase --dgit=dgit -D status 500s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 500s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 500s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 500s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5"},"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275"}],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4"} 500s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 500s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 500s git-debrebase = Upstream {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream"} 500s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 500s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 500s git-debrebase = Upstream {"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream"} 500s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 500s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 500s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"} 500s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 500s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 500s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830"}],"Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083"} 500s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 500s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 500s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Type" => "Upstream","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 500s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 500s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 500s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0,"Differs" => 48}],"Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"} 500s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 500s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 500s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0,"Differs" => 16}]} 500s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 500s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 500s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"} 500s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 500s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 500s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 500s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 500s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 500s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 500s ' 500s + case $state in 500s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 500s branch contains furniture (not laundered) 500s + egrep '^ stitched$' ../status.check 500s stitched 500s + t-gdr-good-analyse HEAD stitched 500s + local head=HEAD 500s + local state=stitched 500s + local wsfx= 500s + local etypes bwtip 500s + case $state in 500s + etypes=Pseudomerge-Upstream 500s + anal=../anal 500s + t-git-debrebase analyse HEAD 500s + local gdr=git-debrebase 500s + : ' 500s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 500s + git-debrebase --dgit=dgit -D analyse HEAD 500s git-debrebase *** WALK a0e76af573321d5714d63cd5c464d783da6b72b4 1 *main::STDOUT 500s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 500s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 500s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 500s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Differs" => 0},"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Overwritten" => [{"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Ix" => 1,"Differs" => 8}],"Type" => "Pseudomerge","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4"} 500s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 500s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 500s git-debrebase = Upstream {"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Type" => "Upstream"} 500s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 500s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 500s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Parents" => [{"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Differs" => 2}],"Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 500s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 500s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 500s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Parents" => [{"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Ix" => 0,"Differs" => 2}],"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Type" => "Upstream"} 500s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 500s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 500s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Parents" => [{"Ix" => 0,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Differs" => 2}],"Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Type" => "Upstream"} 500s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 500s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 500s git-debrebase = Upstream {"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}],"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream"} 500s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 500s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 500s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Parents" => [{"Differs" => 48,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Ix" => 0}],"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 500s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 500s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 500s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Parents" => [{"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 500s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 500s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 500s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 500s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 500s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 500s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 500s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 500s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 5 proc 10 pm 0 500s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 500s ' 500s ++ git rev-parse HEAD 500s + expect=a0e76af573321d5714d63cd5c464d783da6b72b4 500s + exec 500s + local cid ctype info nparents 500s + read cid ctype info 500s + : ===== a0e76af573321d5714d63cd5c464d783da6b72b4 Pseudomerge Contributor=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 ===== 500s + test a0e76af573321d5714d63cd5c464d783da6b72b4 = a0e76af573321d5714d63cd5c464d783da6b72b4 500s + local cetype=Pseudomerge 500s + '[' xPseudomerge = xPseudomerge ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P a0e76af573321d5714d63cd5c464d783da6b72b4 500s + local 'parents=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 500s + expect='3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 500s + enparents=1 500s + : Pseudomerge/SAME '3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + expect=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + enparents=2 500s + git diff --quiet 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5..a0e76af573321d5714d63cd5c464d783da6b72b4 500s + etypes=Upstream 500s + : 'reject pointless pseudomerges' 500s + local 'overwritten= 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 500s + overwritten=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 500s + t-git-debrebase analyse 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 500s + local gdr=git-debrebase 500s + : ' 500s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 500s + git-debrebase --dgit=dgit -D analyse 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 500s git-debrebase *** WALK 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1 *main::STDOUT 500s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x36 500s git-debrebase get_differs e76b40833a6827a6dda6f8583fb72ed7affa43da c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0 500s git-debrebase classify 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x36 e76b40833a6827a6dda6f8583fb72ed7affa43da/0 500s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"Ix" => 1,"CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da"},"Type" => "Pseudomerge","Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a","CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Overwritten" => [{"Differs" => 54,"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Msg" => "Record example (2.0-2+nmu1) in archive suite sid\n","Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nparent e76b40833a6827a6dda6f8583fb72ed7affa43da\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","Parents" => [$VAR1->{"Overwritten"}[0],$VAR1->{"Contributor"}]} 500s git-debrebase get_differs 02a3797b3764d6d76e05ca0d881afa88c2b12430 c35a831ed16058cd02d5b26782482c07fdbe3b0a = 0x2 500s git-debrebase classify e76b40833a6827a6dda6f8583fb72ed7affa43da $t=c35a831ed16058cd02d5b26782482c07fdbe3b0a @p 02a3797b3764d6d76e05ca0d881afa88c2b12430/0x2 500s git-debrebase = Upstream {"Hdr" => "tree c35a831ed16058cd02d5b26782482c07fdbe3b0a\nparent 02a3797b3764d6d76e05ca0d881afa88c2b12430\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","Parents" => [{"Differs" => 2,"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Ix" => 0}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "e76b40833a6827a6dda6f8583fb72ed7affa43da","Type" => "Upstream","Tree" => "c35a831ed16058cd02d5b26782482c07fdbe3b0a"} 500s git-debrebase get_differs 9831208f76656ac811c76b57017774de3ed7b1da 0ec7ae0689075193fd516c119e67ec1adbc0b968 = 0x2 500s git-debrebase classify 02a3797b3764d6d76e05ca0d881afa88c2b12430 $t=0ec7ae0689075193fd516c119e67ec1adbc0b968 @p 9831208f76656ac811c76b57017774de3ed7b1da/0x2 500s git-debrebase = Upstream {"CommitId" => "02a3797b3764d6d76e05ca0d881afa88c2b12430","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree 0ec7ae0689075193fd516c119e67ec1adbc0b968\nparent 9831208f76656ac811c76b57017774de3ed7b1da\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000006 +0000\n","Parents" => [{"Ix" => 0,"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Differs" => 2}],"Type" => "Upstream","Tree" => "0ec7ae0689075193fd516c119e67ec1adbc0b968"} 500s git-debrebase get_differs 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 a23e6d130529f794fcb76ce8913d68adec691fcb = 0x2 500s git-debrebase classify 9831208f76656ac811c76b57017774de3ed7b1da $t=a23e6d130529f794fcb76ce8913d68adec691fcb @p 156c10ffb534a1f5eafbadccb63eca4a26ce8b00/0x2 500s git-debrebase = Upstream {"CommitId" => "9831208f76656ac811c76b57017774de3ed7b1da","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Differs" => 2}],"Hdr" => "tree a23e6d130529f794fcb76ce8913d68adec691fcb\nparent 156c10ffb534a1f5eafbadccb63eca4a26ce8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000006 +0000\n","Tree" => "a23e6d130529f794fcb76ce8913d68adec691fcb","Type" => "Upstream"} 500s git-debrebase get_differs 682d84eb05d2504821c98a0d135926a85f3476c5 ac14e7b566c102651f4279a83b03fbe091783ff9 = 0x2 500s git-debrebase classify 156c10ffb534a1f5eafbadccb63eca4a26ce8b00 $t=ac14e7b566c102651f4279a83b03fbe091783ff9 @p 682d84eb05d2504821c98a0d135926a85f3476c5/0x2 500s git-debrebase = Upstream {"CommitId" => "156c10ffb534a1f5eafbadccb63eca4a26ce8b00","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5","Differs" => 2}],"Hdr" => "tree ac14e7b566c102651f4279a83b03fbe091783ff9\nparent 682d84eb05d2504821c98a0d135926a85f3476c5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000006 +0000\n","Type" => "Upstream","Tree" => "ac14e7b566c102651f4279a83b03fbe091783ff9"} 500s git-debrebase get_differs e5eb08492f31d817c6b9441907350bc6302882c8 ddb581efae7b5021b033468a6bd472f8ecbce423 = 0x2 500s git-debrebase classify 682d84eb05d2504821c98a0d135926a85f3476c5 $t=ddb581efae7b5021b033468a6bd472f8ecbce423 @p e5eb08492f31d817c6b9441907350bc6302882c8/0x2 500s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "ddb581efae7b5021b033468a6bd472f8ecbce423","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8","Ix" => 0,"Differs" => 2}],"Hdr" => "tree ddb581efae7b5021b033468a6bd472f8ecbce423\nparent e5eb08492f31d817c6b9441907350bc6302882c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000006 +0000\n","CommitId" => "682d84eb05d2504821c98a0d135926a85f3476c5"} 500s git-debrebase get_differs 6587c6c396e0002956dd3b151fe4b82e0bd7611c 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x34 500s git-debrebase get_differs 969f770a4ce0e44543c83f86bc52b1086e105a4f 6d28f15d394bda27c6a9a8961b2bc81fcf61e781 = 0x36 500s git-debrebase classify e5eb08492f31d817c6b9441907350bc6302882c8 $t=6d28f15d394bda27c6a9a8961b2bc81fcf61e781 @p 6587c6c396e0002956dd3b151fe4b82e0bd7611c/0x34 969f770a4ce0e44543c83f86bc52b1086e105a4f/0x36 500s git-debrebase = DgitImportUnpatched {"OrigParents" => [{"Differs" => 52,"IsDgitImport" => "orig","CommitId" => "6587c6c396e0002956dd3b151fe4b82e0bd7611c","Ix" => 0,"IsOrigin" => 1}],"Type" => "DgitImportUnpatched","Tree" => "6d28f15d394bda27c6a9a8961b2bc81fcf61e781","NewMsg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[was: dgit import unpatched example 2.0-2+nmu1]\n","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n","Hdr" => "tree 6d28f15d394bda27c6a9a8961b2bc81fcf61e781\nparent 6587c6c396e0002956dd3b151fe4b82e0bd7611c\nparent 969f770a4ce0e44543c83f86bc52b1086e105a4f\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000006 +0000\n","Parents" => [$VAR1->{"OrigParents"}[0],{"Differs" => 54,"IsDgitImport" => "tarball","Ix" => 1,"CommitId" => "969f770a4ce0e44543c83f86bc52b1086e105a4f","IsOrigin" => 1}],"CommitId" => "e5eb08492f31d817c6b9441907350bc6302882c8"} 500s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 500s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 500s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0,"Differs" => 4}],"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 500s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 500s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 500s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 500s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 500s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 500s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0,"Differs" => 16}],"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 500s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 500s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 500s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 500s git-debrebase = Pseudomerge {"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Parents" => [{"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 500s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 500s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 500s git-debrebase = Upstream {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream"} 500s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 500s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 500s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 500s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 500s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 500s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 500s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 500s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 500s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 500s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 500s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 10 proc 18 pm 1 500s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 500s ' 500s + local ocid otype oinfo 500s + read ocid otype oinfo 500s + case "$otype" in 500s + test xContributor=3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 '!=' xContributor=e76b40833a6827a6dda6f8583fb72ed7affa43da 500s ++ printf %s '3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 500s ++ wc -w 500s + local cnparents=2 500s + test 2 = 2 500s ++ for f in $parents 500s ++ echo 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s ++ for f in $parents 500s ++ echo 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=2 500s + test 2 = 2 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream ===== 500s + test 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 = 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 500s + local parents=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + expect=61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + enparents=1 500s + : Upstream/SAME 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s ++ for f in $parents 500s ++ echo 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream ===== 500s + test 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a = 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 500s + local parents=677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + expect=677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + enparents=1 500s + : Upstream/SAME 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream ===== 500s + test 677859b96829ce23dbcd8a3baa95a2353bc42da2 = 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 677859b96829ce23dbcd8a3baa95a2353bc42da2 500s + local parents=f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + expect=f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + enparents=1 500s + : Upstream/SAME f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream ===== 500s + test f9ddccb3801445213b338eaa4f0d5881a35a84dc = f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P f9ddccb3801445213b338eaa4f0d5881a35a84dc 500s + local parents=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + expect=97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + enparents=1 500s + : Upstream/SAME 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream ===== 500s + test 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 = 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + local cetype=Upstream 500s + '[' xUpstream = xUpstream ']' 500s + cetype=SAME 500s ++ git log -n1 --pretty=format:%P 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 500s + local parents=e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + expect=e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + enparents=1 500s + : Upstream/SAME e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s ++ printf %s e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== e4eca65c490ba804c753f8fc1ef367ba07d51c08 Packaging ===== 500s + test e4eca65c490ba804c753f8fc1ef367ba07d51c08 = e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + local cetype=Upstream 500s + '[' xPackaging = xUpstream ']' 500s ++ git log -n1 --pretty=format:%P e4eca65c490ba804c753f8fc1ef367ba07d51c08 500s + local parents=8397762c3c6a31b895366f874e97ed0805b1939e 500s + expect=8397762c3c6a31b895366f874e97ed0805b1939e 500s + enparents=1 500s + : Packaging/Upstream 8397762c3c6a31b895366f874e97ed0805b1939e 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + '[' x '!=' x ']' 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :. ':!debian' 500s + git diff --quiet 8397762c3c6a31b895366f874e97ed0805b1939e..e4eca65c490ba804c753f8fc1ef367ba07d51c08 -- :debian/patches 500s + etypes=Packaging 500s ++ printf %s 8397762c3c6a31b895366f874e97ed0805b1939e 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 8397762c3c6a31b895366f874e97ed0805b1939e 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 8397762c3c6a31b895366f874e97ed0805b1939e Changelog ===== 500s + test 8397762c3c6a31b895366f874e97ed0805b1939e = 8397762c3c6a31b895366f874e97ed0805b1939e 500s + local cetype=Packaging 500s + '[' xChangelog = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P 8397762c3c6a31b895366f874e97ed0805b1939e 500s + local parents=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + expect=d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + enparents=1 500s + : Changelog/Packaging d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet d640e62b152fddf68faaa04c9d3ca9ab8f417ca3..8397762c3c6a31b895366f874e97ed0805b1939e -- :. ':!debian/changelog' 500s + etypes=Packaging 500s ++ printf %s d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Changelog ===== 500s + test d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 = d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + local cetype=Packaging 500s + '[' xChangelog = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 500s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + enparents=1 500s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 -- :. ':!debian/changelog' 500s + etypes=Packaging 500s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s ++ wc -w 500s + local cnparents=1 500s + test 1 = 1 500s ++ for f in $parents 500s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s ++ wc -w 500s ++ t-sort -u 500s ++ LC_COLLATE=C 500s ++ sort -u 500s + local cndparents=1 500s + test 1 = 1 500s + case "$parents" in 500s + case "$ctype" in 500s + read cid ctype info 500s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 500s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + local cetype=Packaging 500s + '[' xAnchor = xPackaging ']' 500s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 500s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + enparents=1 500s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 500s + case "$ctype/$cetype" in 500s + case "$ctype/$etypes" in 500s + case "$cetype" in 500s + case "$ctype" in 500s + break 500s + v=2.0-3 500s + t-dch-commit -v 2.0-3 -m 'incorporate nmu' 500s + t-debchange -v 2.0-3 -m 'incorporate nmu' 500s + DEBEMAIL=dgit-tests@example.org 500s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-3 -m 'incorporate nmu' 500s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -v 2.0-3 -m incorporate nmu 500s + git commit -m 'dch -v 2.0-3 -m incorporate nmu' debian/changelog 500s [master 95f78a1] dch -v 2.0-3 -m incorporate nmu 500s 1 file changed, 6 insertions(+) 500s + t-dch-commit-r 500s + t-dch-r-rune t-dch-commit 500s + local cmd=t-dch-commit 500s + shift 500s + local suite=unstable 500s + t-dch-commit -r -D unstable '' 500s + t-debchange -r -D unstable '' 500s + DEBEMAIL=dgit-tests@example.org 500s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 500s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -r -D unstable 500s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 500s libdistro-info-perl is not installed, Debian release names are not known. 500s libdistro-info-perl is not installed, Ubuntu release names are not known. 500s + git commit -m 'dch -r -D unstable ' debian/changelog 500s [master 64bcb7d] dch -r -D unstable 500s 1 file changed, 1 insertion(+), 1 deletion(-) 500s + t-dgit -wgf push-source 500s + local dgit=dgit 500s + pwd 500s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 500s + : ' 500s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 500s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 501s | git rev-parse --show-toplevel 501s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 501s | git config -z --get-regexp --local '.*' 501s | git config -z --get-regexp --local '.*' 501s | git config -z --get-regexp --global '.*' 501s | git config -z --get-regexp --system '.*' 501s format 3.0 (quilt), quilt mode linear 501s Format `3.0 (quilt)', need to check/update patch stack 501s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 501s => `' 501s + git diff --quiet HEAD 501s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 501s canonical suite name for unstable is sid 501s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 501s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 501s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 501s | git rev-parse 'HEAD~0' 501s => `64bcb7d55956b0e3ebe624bf9040a976b183e414' 501s | git symbolic-ref -q HEAD 501s => `refs/heads/master' 501s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 501s CD work 501s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 501s + git reset -q --hard 64bcb7d55956b0e3ebe624bf9040a976b183e414 501s examining quilt state (multiple patches, linear mode) 501s branch_is_gdr 64bcb7d55956b0e3ebe624bf9040a976b183e414... 501s branch_is_gdr a0e76af573321d5714d63cd5c464d783da6b72b4 gdr pseudomerge YES 501s + git reset -q --hard 64bcb7d55956b0e3ebe624bf9040a976b183e414 501s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 501s HEAD is now at 4b8c76d Commit patch queue (exported by git-debrebase) 501s | git rev-parse 'HEAD~0' 501s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 501s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 501s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 501s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 501s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 501s CD fake 501s | find -name .git -prune -print0 501s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 501s + git checkout -f 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -- debian 501s + git add -Af . 501s | git write-tree 501s => `bfd118a0d0c903dd1034a01f06ec8634a45837c9' 501s fake orig tree object bfd118a0d0c903dd1034a01f06ec8634a45837c9 501s CD .. 501s + git reset -q --hard 4b8c76d051e32cfd5c0f423504742148ed9e07a4 501s CD ../fake 501s + git add -Af . 501s | git write-tree 501s => `3646aeb322533be919f218f7670519af795187ec' 501s fake o+d/p tree object bfd118a0d0c903dd1034a01f06ec8634a45837c9 501s CD ../work 501s | git ls-tree --name-only -z 4b8c76d051e32cfd5c0f423504742148ed9e07a4 501s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 501s | git diff-tree -z --no-renames -r bfd118a0d0c903dd1034a01f06ec8634a45837c9 4b8c76d051e32cfd5c0f423504742148ed9e07a4 501s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc bf31719ad256ba6efa065624e66caee0a3e3323f M\x00src.c\x00' 501s quiltify_trees_differ bfd118a0d0c903dd1034a01f06ec8634a45837c9 4b8c76d051e32cfd5c0f423504742148ed9e07a4 => 1 501s | git diff-tree -z --no-renames --name-only -r 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec 501s => `' 501s quiltify_trees_differ 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec => 0 501s | git diff-tree -z --no-renames --name-only -r bfd118a0d0c903dd1034a01f06ec8634a45837c9 3646aeb322533be919f218f7670519af795187ec 501s => `lib.c\x00new-upstream-file\x00src.c\x00' 501s quiltify_trees_differ bfd118a0d0c903dd1034a01f06ec8634a45837c9 3646aeb322533be919f218f7670519af795187ec => 1 501s differences @dl ## ## == == == ==. 501s dgit: base trees orig=bfd118a0d0c903dd1034 o+d/p=3646aeb322533be919f2 501s dgit: quilt differences: src: ## orig ## gitignores: == orig == 501s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 501s starting quiltify (multiple patches, linear mode) 501s | git ls-tree --name-only 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -- debian/rules debian/control 501s => `debian/control'... 501s quiltify investigate 4b8c76d051e32cfd5c0f423504742148ed9e07a4 501s | git diff-tree -z --no-renames --name-only 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec 501s => `' 501s quiltify_trees_differ 4b8c76d051e32cfd5c0f423504742148ed9e07a4 3646aeb322533be919f218f7670519af795187ec => 0 501s search finished hooray! 501s quiltify linearisation planning successful, executing... 501s + git checkout -q master 501s | git status --ignored --porcelain 501s => `?? .pc/' 501s nothing quilty to commit, ok. 501s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 501s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 501s | git rev-parse 'HEAD~0' 501s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 501s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 501s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 501s CD work 501s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 501s + git reset -q --hard 4b8c76d051e32cfd5c0f423504742148ed9e07a4 501s CD .. 501s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 502s dpkg-source: info: using source format '3.0 (quilt)' 502s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 502s dpkg-source: info: using patch list from debian/patches/series 502s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 502s dpkg-source: info: building example in example_2.0-3.dsc 502s CD work 502s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 502s changelog will contain changes since 2.0-2+nmu1 502s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S '-v2.0-2+nmu1' 502s dpkg-genchanges: info: not including original source code in upload 502s CD .. 502s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 502s renaming (Files) example_2.0.orig.tar.gz 502s renaming (Files) example_2.0-3.debian.tar.xz 502s renaming (dsc) example_2.0-3.dsc 502s renaming (changes) example_2.0-3_source.changes 502s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 502s actually entering push 502s query: fetching http://127.0.0.1:37223/example.git/HEAD... 502s dgit-repos check_for_git => 1. 502s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 502s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 502s git_lrfetch_sane iteration 0 502s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 502s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 502s => 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/tags/archive/test-dummy/2.0-1 502s => 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/tags/archive/test-dummy/2.0-2 502s => b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/tags/test-dummy/2.0-1 502s => aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/tags/test-dummy/2.0-2 502s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 502s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 502s | git for-each-ref refs/dgit-fetch/test-dummy 502s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 502s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 502s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 502s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 502s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 502s git_lrfetch_sane: tidying any old suite lrfetchrefs 502s | git for-each-ref refs/dgit-fetch/sid 502s git_lrfetch_sane: git fetch --no-insane emulation complete 502s $VAR1 = { 502s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '8b9773e7665f0cfd3d94dedfa13bf18fc976540a', 502s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188', 502s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f', 502s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 502s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '73453a4cf312f7fee81e3400e57fb36d7777c35f' 502s }; 502s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 502s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/tags/archive/test-dummy/2.0-1 502s currently refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 502s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/tags/archive/test-dummy/2.0-2 502s currently refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 502s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/tags/test-dummy/2.0-1 502s currently refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 502s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/tags/test-dummy/2.0-2 502s currently refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 502s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 502s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 502s offered refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 502s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 502s offered refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 502s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 502s offered refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 502s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 502s offered refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 502s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 502s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 502s get_archive_dsc: Version 2.0-2+nmu1 502s last upload to archive: NO git hash 502s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 502s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 502s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 502s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s fetch_from_archive: lastfetch=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 502s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 502s using existing example_2.0.orig.tar.gz 502s considering saving example_2.0.orig.tar.gz: (File exists) no need. 502s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 502s using existing example_2.0-2+nmu1.debian.tar.xz 502s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 502s import considering example_2.0.orig.tar.gz Y .gz orig 502s + chmod -R '+rwX' _unpack-tar 502s CD _unpack-tar 502s | find -name .git -prune -print0 502s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 502s + git add -Af . 502s | git write-tree 502s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 502s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 502s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 502s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 502s CD .. 502s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 502s + chmod -R '+rwX' _unpack-tar 502s CD _unpack-tar 502s | find -name .git -prune -print0 502s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 502s + git add -Af . 502s | git write-tree 502s => `f423a4033bb213dc3f6479fa9fe8938121cd3bb5' 502s | git ls-tree -z f423a4033bb213dc3f6479fa9fe8938121cd3bb5 502s => `040000 tree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54\x09debian\x00' 502s one subtree 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 502s CD .. 502s + dpkg-source --no-check --skip-patches -x -- example.dsc 502s dpkg-source: info: extracting example in example-2.0 502s dpkg-source: info: unpacking example_2.0.orig.tar.gz 502s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 502s CD example-2.0 502s | find -name .git -prune -print0 502s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 502s + git add -Af . 502s | git write-tree 502s => `6d28f15d394bda27c6a9a8961b2bc81fcf61e781' 502s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 502s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 502s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 502s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 502s + git add -Af . 502s | git write-tree 502s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 502s import clog search... 502s | dpkg-parsechangelog --format rfc822 --all 502s import clog 2.0-2+nmu1 package changelog, entry no.1... 502s import clog 2.0-2+nmu1 vs 2.0... 502s import clog 2.0-2+nmu1 becomes r1 502s import clog 2.0-2 package changelog, entry no.2... 502s import clog 2.0-2 vs 2.0... 502s import clog 2.0-2 becomes r1 502s import clog 2.0-1 package changelog, entry no.3... 502s import clog 2.0-1 vs 2.0... 502s import clog 2.0-1 becomes r1 502s import clog 1.0-1 package changelog, entry no.4... 502s import clog 1.0-1 vs 2.0... 502s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 502s => `1530000006 +0000' 502s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 502s => `1530000000 +0000' 502s import tartrees authline dgit test git user 1530000006 +0000 502s import tartrees r1authline dgit test git user 1530000000 +0000 502s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 502s | git hash-object -w -t commit --stdin 502s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 502s import tartree example_2.0-2+nmu1.debian.tar.xz 0a03a4f8476a80bad3a30ca5e0c58345a9d3ec54 502s | git hash-object -w -t commit --stdin 502s => 969f770a4ce0e44543c83f86bc52b1086e105a4f 502s import main commit 502s | git hash-object -w -t commit ../commit.tmp 502s => `e5eb08492f31d817c6b9441907350bc6302882c8' 502s import apply patches... 502s | git hash-object -w -t commit --stdin 502s => e9f96320b1318ff6811938626ebe0fc74d4f5555 502s + git checkout -q -b dapplied e9f96320b1318ff6811938626ebe0fc74d4f5555 502s + git checkout -q -b unpa e5eb08492f31d817c6b9441907350bc6302882c8 502s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 502s => `1530000006 +0000' 502s + git checkout -q unpa 502s + git update-ref -d refs/heads/patch-queue/unpa 502s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 502s | git rev-parse 'HEAD~0' 502s => `e76b40833a6827a6dda6f8583fb72ed7affa43da' 502s | git rev-parse HEAD: 502s => `c35a831ed16058cd02d5b26782482c07fdbe3b0a' 502s synthesised git commit from .dsc 2.0-2+nmu1 502s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 502s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 502s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 1c8e3b534eac1867c8911d4e5f923d5f7bcee275:debian/changelog 502s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob e76b40833a6827a6dda6f8583fb72ed7affa43da:debian/changelog 502s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s fetch mergeinfos: 502s commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 dgit client's archive history view 502s fetch hash=1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 502s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 502s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 502s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 502s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 502s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s | git log -n2 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 502s => `commit 1c8e3b534eac1867c8911d4e5f923d5f7bcee275'... 502s | git ls-tree -lrz -- 1c8e3b534eac1867c8911d4e5f923d5f7bcee275: 502s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 502s + git check-ref-format archive/test-dummy/2.0-3 502s | git symbolic-ref -q HEAD 502s => `refs/heads/master' 502s | git rev-parse 'HEAD~0' 502s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 502s ffq_prev_branchinfo branch current refs/heads/master 502s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 502s => `' 502s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 502s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 502s | git merge-base a0e76af573321d5714d63cd5c464d783da6b72b4 4b8c76d051e32cfd5c0f423504742148ed9e07a4 502s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 502s | git rev-parse 'a0e76af573321d5714d63cd5c464d783da6b72b4~0' 502s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 502s | git rev-parse 'a0e76af573321d5714d63cd5c464d783da6b72b4~0' 502s => `a0e76af573321d5714d63cd5c464d783da6b72b4' 502s | git status --ignored --porcelain 502s => `' 502s nothing quilty to commit, ok. 502s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 502s => `' 502s + git diff --quiet HEAD 502s | git merge-base 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 4b8c76d051e32cfd5c0f423504742148ed9e07a4 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git rev-parse '1c8e3b534eac1867c8911d4e5f923d5f7bcee275~0' 502s => `1c8e3b534eac1867c8911d4e5f923d5f7bcee275' 502s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 502s => `' 502s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 502s checking that example_2.0-3.dsc corresponds to HEAD 502s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-3.dsc 502s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-3.dsc) 502s dpkg-source: info: extracting example in example-2.0 502s dpkg-source: info: unpacking example_2.0.orig.tar.gz 502s dpkg-source: info: unpacking example_2.0-3.debian.tar.xz 502s dpkg-source: info: using patch list from debian/patches/series 502s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 502s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 502s dpkg-source: info: applying subdir/addnewups 502s dpkg-source: info: applying upstream-edit-src.c-.patch 502s dpkg-source: info: applying mixed-add-both-.patch 502s CD example-2.0 502s | find -name .git -prune -print0 502s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 503s + git add -Af . 503s | git write-tree 503s => `3646aeb322533be919f218f7670519af795187ec' 503s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 503s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 503s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 503s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 503s + git diff --quiet 3646aeb322533be919f218f7670519af795187ec 4b8c76d051e32cfd5c0f423504742148ed9e07a4 503s files_compare_inputs example_2.0-3.dsc 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0.orig.tar.gz 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0-3.debian.tar.xz 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0.orig.tar.gz 503s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0-3.debian.tar.xz 503s files_compare_inputs example_2.0-3.dsc Files 503s files_compare_inputs example_2.0-3.dsc Files example_2.0.orig.tar.gz 503s files_compare_inputs example_2.0-3.dsc Files example_2.0-3.debian.tar.xz 503s files_compare_inputs example_2.0-3_source.changes 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.dsc 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.debian.tar.xz 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.dsc 503s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.debian.tar.xz 503s files_compare_inputs example_2.0-3_source.changes Files 503s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.dsc 503s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.debian.tar.xz 503s checking origs needed (2.0)... 503s checking origs needed placement 'devel extra'... 503s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 503s origs example_2.0.orig.tar.gz is_orig 503s -| sh -ec 'cd "$1"; shift 503s 503s find -name "$1" -print0 | 503s xargs -0r sha256sum 503s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 503s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 503s origs example_2.0.orig.tar.gz $#$have=0 503s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 503s origs example_2.0-3.debian.tar.xz | 61dcee8c39efb050e048cd775e4e468f 1544 example_2.0-3.debian.tar.xz 503s ../example_2.0-3_source.changes already has appropriate .orig(s) (if any) 503s push_tagwants: $VAR1 = [ 503s '2.0-3', 503s '4b8c76d051e32cfd5c0f423504742148ed9e07a4', 503s undef, 503s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 503s ]; 503s $VAR2 = [ 503s { 503s 'Tag' => 'archive/test-dummy/2.0-3', 503s 'Tfn' => sub { "DUMMY" }, 503s 'TagFn' => sub { "DUMMY" }, 503s 'View' => 'dgit', 503s 'TfSuffix' => '', 503s 'Objid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4' 503s }, 503s { 503s 'Tag' => 'test-dummy/2.0-3', 503s 'Tfn' => sub { "DUMMY" }, 503s 'TagFn' => sub { "DUMMY" }, 503s 'TfSuffix' => '-dgit', 503s 'View' => 'dgit', 503s 'Objid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4' 503s } 503s ]; 503s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 503s => `1530000009 +0000' 503s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 503s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 503s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 503s => `4b8584297fb76b16f0cbeb4d7fb13ba31469038d' 503s + git verify-tag 4b8584297fb76b16f0cbeb4d7fb13ba31469038d 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s gpg: Signature made Mon Mar 31 12:26:37 2025 UTC 503s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 503s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 503s gpg: WARNING: This key is not certified with a trusted signature! 503s gpg: There is no indication that the signature belongs to the owner. 503s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 503s + git update-ref refs/tags/archive/test-dummy/2.0-3 4b8584297fb76b16f0cbeb4d7fb13ba31469038d 503s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 503s => `59b3e47137fe54a918a6cfd77739bb1d80633277' 503s + git verify-tag 59b3e47137fe54a918a6cfd77739bb1d80633277 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s gpg: Signature made Mon Mar 31 12:26:37 2025 UTC 503s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 503s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 503s gpg: WARNING: This key is not certified with a trusted signature! 503s gpg: There is no indication that the signature belongs to the owner. 503s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 503s + git update-ref refs/tags/test-dummy/2.0-3 59b3e47137fe54a918a6cfd77739bb1d80633277 503s query: fetching http://127.0.0.1:37223/example.git/HEAD... 503s dgit-repos check_for_git => 1. 503s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 4b8c76d051e32cfd5c0f423504742148ed9e07a4:refs/dgit/sid refs/tags/archive/test-dummy/2.0-3 refs/tags/test-dummy/2.0-3 503s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 503s 6b22dd5..4b8c76d 4b8c76d051e32cfd5c0f423504742148ed9e07a4 -> refs/dgit/sid 503s * [new tag] archive/test-dummy/2.0-3 -> archive/test-dummy/2.0-3 503s * [new tag] test-dummy/2.0-3 -> test-dummy/2.0-3 503s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 4b8c76d051e32cfd5c0f423504742148ed9e07a4 503s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-3_source.changes 503s signfile dsc ../example_2.0-3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s 503s fixup_changes dsc ../example_2.0-3.dsc ../example_2.0-3_source.changes 503s signfile changes ../example_2.0-3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 503s 503s Successfully signed dsc, changes files 503s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-3_source.changes 503s gpg: ../example_2.0-3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 503s gpg: ../example_2.0-3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 503s D: Setting host argument. 503s Checking signature on .changes 503s Checking signature on .dsc 503s Uploading to test-dummy (via local to localhost): 503s Successfully uploaded packages. 503s dgit ok: pushed and uploaded 2.0-3 503s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 503s del_lrfetchrefs... 503s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 503s del_lrfetchrefs: 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 503s del_lrfetchrefs: 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 503s del_lrfetchrefs: b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 503s del_lrfetchrefs: aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 503s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 503s ' 503s + : 'now test a new upstream' 503s + t-make-new-upstream-tarball 2.1 503s + local uv=2.1 503s + git checkout make-upstream 503s Switched to branch 'make-upstream' 503s + echo 'upstream 2.1' 503s + git commit -a -m 'upstream 2.1 tarball' 503s [make-upstream eb18467] upstream 2.1 tarball 503s 1 file changed, 1 insertion(+) 503s + t-make-orig example 2.1 make-upstream 503s + local p=example 503s + local v=2.1 503s + local tag=make-upstream 503s + ust=example_2.1.orig.tar.gz 503s + GZIP=-1 503s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 503s gzip: warning: GZIP environment variable is deprecated; use an alias or script 503s + git checkout master 503s Switched to branch 'master' 503s Your branch is ahead of 'origin/master' by 21 commits. 503s (use "git push" to publish your local commits) 503s + v=2.1-0+nmu1 503s + t-nmu-upload-1 nmu2 503s + t-git-next-date 503s + GIT_COMMITTER_DATE='1530000010 +0100' 503s + GIT_AUTHOR_DATE='1530000010 +0100' 503s + nmubranch=nmu2 503s + git checkout -f -b nmu2 503s Switched to a new branch 'nmu2' 503s + t-git-debrebase 503s + local gdr=git-debrebase 503s + : ' 503s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 503s + git-debrebase --dgit=dgit -D 503s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu2 503s git-debrebase ffq check_specs * 503s git-debrebase *** WALK 4b8c76d051e32cfd5c0f423504742148ed9e07a4 0 - 503s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 503s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 503s git-debrebase = AddPatches {"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Parents" => [{"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Differs" => 4,"Ix" => 0}],"Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "3646aeb322533be919f218f7670519af795187ec","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches"} 503s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 503s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 503s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Ix" => 0}],"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "588d548f5ba959c551704087c40f106f9f6369af"} 503s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 503s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 503s git-debrebase = Changelog {"Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Type" => "Changelog","CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4"}]} 503s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 503s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 503s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 503s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Differs" => 0},"Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Pseudomerge","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Overwritten" => [{"Ix" => 1,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Differs" => 8}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 503s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 503s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 503s git-debrebase = Upstream {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Parents" => [{"Ix" => 0,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Differs" => 2}],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream"} 503s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 503s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 503s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 503s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 503s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 503s git-debrebase = Upstream {"Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Parents" => [{"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Differs" => 2}]} 503s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 503s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 503s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Differs" => 2}],"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n"} 503s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 503s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 503s git-debrebase = Upstream {"Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}]} 503s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 503s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 503s git-debrebase = Packaging {"Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}],"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Type" => "Packaging","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5"} 504s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 504s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 504s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Ix" => 0}],"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 504s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 504s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 504s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"} 504s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 504s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 504s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 504s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 504s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 6 proc 14 pm 0 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 504s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 504s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 504s git-debrebase WALK BUILD 95f78a1ec281f58eba538b9baef816d74e131c60 Debian (rewriting=0) 504s git-debrebase WALK REWRITING NOW cl=HASH(0x55ca467a54d0) procd=HASH(0x55ca46859748) 504s git-debrebase WALK BUILD 64bcb7d55956b0e3ebe624bf9040a976b183e414 Debian (rewriting=1) 504s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 504s git-debrebase WALK BUILD 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 Upstream (rewriting=1) 504s git-debrebase WALK BUILD f9ddccb3801445213b338eaa4f0d5881a35a84dc Upstream (rewriting=1) 504s git-debrebase WALK BUILD 677859b96829ce23dbcd8a3baa95a2353bc42da2 Upstream (rewriting=1) 504s git-debrebase WALK BUILD 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a Upstream (rewriting=1) 504s git-debrebase WALK BUILD 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 Upstream (rewriting=1) 504s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 504s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase get_differs 1730142aa2f160b263adae4ebebd0b03e88e65db 4b8c76d051e32cfd5c0f423504742148ed9e07a4 = 0x4 504s git-debrebase *** WALK RETURN 1730142aa2f160b263adae4ebebd0b03e88e65db 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 504s git-debrebase: laundered (head was 4b8c76d051e32cfd5c0f423504742148ed9e07a4) 504s git-debrebase >= update refs/ffq-prev/heads/nmu2 4b8c76d051e32cfd5c0f423504742148ed9e07a4 0000000000000000000000000000000000000000 504s git-debrebase >= delete refs/debrebase-last/heads/nmu2 504s git-debrebase >= update HEAD 1730142aa2f160b263adae4ebebd0b03e88e65db 4b8c76d051e32cfd5c0f423504742148ed9e07a4 504s git-debrebase >$ 504s Recorded previous head for preservation 504s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 504s ' 504s + t-git-debrebase convert-to-gbp 504s + local gdr=git-debrebase 504s + : ' 504s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 504s + git-debrebase --dgit=dgit -D convert-to-gbp 504s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu2 504s git-debrebase get_differs 8e7cc4e38186cddfc4b3361cab4620764327ce86 588d548f5ba959c551704087c40f106f9f6369af = 0x2 504s git-debrebase classify 1730142aa2f160b263adae4ebebd0b03e88e65db $t=588d548f5ba959c551704087c40f106f9f6369af @p 8e7cc4e38186cddfc4b3361cab4620764327ce86/0x2 504s git-debrebase = Upstream {"Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 8e7cc4e38186cddfc4b3361cab4620764327ce86\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Ix" => 0}],"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "1730142aa2f160b263adae4ebebd0b03e88e65db","Tree" => "588d548f5ba959c551704087c40f106f9f6369af"} 504s git-debrebase get_differs a1b7f18866012b961437b6f75ed0ae106783d5e3 f499c0659991db19beb67b16f469c055a223e7fc = 0x2 504s git-debrebase classify 8e7cc4e38186cddfc4b3361cab4620764327ce86 $t=f499c0659991db19beb67b16f469c055a223e7fc @p a1b7f18866012b961437b6f75ed0ae106783d5e3/0x2 504s git-debrebase = Upstream {"Hdr" => "tree f499c0659991db19beb67b16f469c055a223e7fc\nparent a1b7f18866012b961437b6f75ed0ae106783d5e3\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Tree" => "f499c0659991db19beb67b16f469c055a223e7fc"} 504s git-debrebase get_differs 8ebe99a8eaeb097e7649649995e09351099b2837 a6c7fc2a683420c1079bc60ede79d9f59311059d = 0x2 504s git-debrebase classify a1b7f18866012b961437b6f75ed0ae106783d5e3 $t=a6c7fc2a683420c1079bc60ede79d9f59311059d @p 8ebe99a8eaeb097e7649649995e09351099b2837/0x2 504s git-debrebase = Upstream {"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Tree" => "a6c7fc2a683420c1079bc60ede79d9f59311059d","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree a6c7fc2a683420c1079bc60ede79d9f59311059d\nparent 8ebe99a8eaeb097e7649649995e09351099b2837\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Ix" => 0}],"Type" => "Upstream"} 504s git-debrebase get_differs 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 2d1cc236e6e89374bef4755396e3465a27536576 = 0x2 504s git-debrebase classify 8ebe99a8eaeb097e7649649995e09351099b2837 $t=2d1cc236e6e89374bef4755396e3465a27536576 @p 4199dd68aeb91b09ff7d051eafcca2f7d224aa69/0x2 504s git-debrebase = Upstream {"Tree" => "2d1cc236e6e89374bef4755396e3465a27536576","CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Type" => "Upstream","Hdr" => "tree 2d1cc236e6e89374bef4755396e3465a27536576\nparent 4199dd68aeb91b09ff7d051eafcca2f7d224aa69\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 504s git-debrebase get_differs 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 8e868e2c82b6dd7ce537069074e9f89d840ecc4a = 0x2 504s git-debrebase classify 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 $t=8e868e2c82b6dd7ce537069074e9f89d840ecc4a @p 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee/0x2 504s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 8e868e2c82b6dd7ce537069074e9f89d840ecc4a\nparent 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8e868e2c82b6dd7ce537069074e9f89d840ecc4a","CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69"} 504s git-debrebase get_differs 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 a025f915994e2a44e5b54ca34c824fa2ac1768a3 = 0x10 504s git-debrebase classify 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee $t=a025f915994e2a44e5b54ca34c824fa2ac1768a3 @p 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78/0x10 504s git-debrebase = Changelog {"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Tree" => "a025f915994e2a44e5b54ca34c824fa2ac1768a3","Msg" => "dch -r -D unstable\n","Hdr" => "tree a025f915994e2a44e5b54ca34c824fa2ac1768a3\nparent 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Ix" => 0}],"Type" => "Changelog"} 504s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 = 0x10 504s git-debrebase classify 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 $t=f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x10 504s git-debrebase = Changelog {"Tree" => "f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0","CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Type" => "Changelog","Hdr" => "tree f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Msg" => "dch -v 2.0-3 -m incorporate nmu\n"} 504s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 504s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 504s git-debrebase = Packaging {"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","Parents" => [{"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Differs" => 48,"Ix" => 0}],"Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Packaging","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 504s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 504s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 504s git-debrebase = Changelog {"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16,"Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 504s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 504s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 504s git-debrebase = Changelog {"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 504s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 504s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 504s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 504s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 504s git-debrebase *** WALK 1730142aa2f160b263adae4ebebd0b03e88e65db 0 - 504s git-debrebase get_differs 8e7cc4e38186cddfc4b3361cab4620764327ce86 588d548f5ba959c551704087c40f106f9f6369af = 0x2 504s git-debrebase classify 1730142aa2f160b263adae4ebebd0b03e88e65db $t=588d548f5ba959c551704087c40f106f9f6369af @p 8e7cc4e38186cddfc4b3361cab4620764327ce86/0x2 504s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 8e7cc4e38186cddfc4b3361cab4620764327ce86\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","CommitId" => "1730142aa2f160b263adae4ebebd0b03e88e65db"} 504s git-debrebase get_differs a1b7f18866012b961437b6f75ed0ae106783d5e3 f499c0659991db19beb67b16f469c055a223e7fc = 0x2 504s git-debrebase classify 8e7cc4e38186cddfc4b3361cab4620764327ce86 $t=f499c0659991db19beb67b16f469c055a223e7fc @p a1b7f18866012b961437b6f75ed0ae106783d5e3/0x2 504s git-debrebase = Upstream {"CommitId" => "8e7cc4e38186cddfc4b3361cab4620764327ce86","Tree" => "f499c0659991db19beb67b16f469c055a223e7fc","Hdr" => "tree f499c0659991db19beb67b16f469c055a223e7fc\nparent a1b7f18866012b961437b6f75ed0ae106783d5e3\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 504s git-debrebase get_differs 8ebe99a8eaeb097e7649649995e09351099b2837 a6c7fc2a683420c1079bc60ede79d9f59311059d = 0x2 504s git-debrebase classify a1b7f18866012b961437b6f75ed0ae106783d5e3 $t=a6c7fc2a683420c1079bc60ede79d9f59311059d @p 8ebe99a8eaeb097e7649649995e09351099b2837/0x2 504s git-debrebase = Upstream {"CommitId" => "a1b7f18866012b961437b6f75ed0ae106783d5e3","Tree" => "a6c7fc2a683420c1079bc60ede79d9f59311059d","Hdr" => "tree a6c7fc2a683420c1079bc60ede79d9f59311059d\nparent 8ebe99a8eaeb097e7649649995e09351099b2837\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 504s git-debrebase get_differs 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 2d1cc236e6e89374bef4755396e3465a27536576 = 0x2 504s git-debrebase classify 8ebe99a8eaeb097e7649649995e09351099b2837 $t=2d1cc236e6e89374bef4755396e3465a27536576 @p 4199dd68aeb91b09ff7d051eafcca2f7d224aa69/0x2 504s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69","Differs" => 2}],"Hdr" => "tree 2d1cc236e6e89374bef4755396e3465a27536576\nparent 4199dd68aeb91b09ff7d051eafcca2f7d224aa69\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "8ebe99a8eaeb097e7649649995e09351099b2837","Tree" => "2d1cc236e6e89374bef4755396e3465a27536576"} 504s git-debrebase get_differs 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 8e868e2c82b6dd7ce537069074e9f89d840ecc4a = 0x2 504s git-debrebase classify 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 $t=8e868e2c82b6dd7ce537069074e9f89d840ecc4a @p 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee/0x2 504s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Ix" => 0}],"Hdr" => "tree 8e868e2c82b6dd7ce537069074e9f89d840ecc4a\nparent 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8e868e2c82b6dd7ce537069074e9f89d840ecc4a","CommitId" => "4199dd68aeb91b09ff7d051eafcca2f7d224aa69"} 504s git-debrebase get_differs 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 a025f915994e2a44e5b54ca34c824fa2ac1768a3 = 0x10 504s git-debrebase classify 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee $t=a025f915994e2a44e5b54ca34c824fa2ac1768a3 @p 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78/0x10 504s git-debrebase = Changelog {"CommitId" => "3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee","Tree" => "a025f915994e2a44e5b54ca34c824fa2ac1768a3","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Differs" => 16}],"Hdr" => "tree a025f915994e2a44e5b54ca34c824fa2ac1768a3\nparent 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Changelog"} 504s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 = 0x10 504s git-debrebase classify 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 $t=f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0 @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x10 504s git-debrebase = Changelog {"CommitId" => "5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78","Tree" => "f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0","Hdr" => "tree f11c2cd79b3a3cad91e2d65eef74a5084f3b6bd0\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Msg" => "dch -v 2.0-3 -m incorporate nmu\n"} 504s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 504s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 504s git-debrebase = Packaging {"Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 48,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}],"Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"} 504s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 504s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 504s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16,"Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"} 504s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 504s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 504s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 504s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 504s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 504s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 504s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 504s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 4 upp 4 proc 10 pm -1 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 11 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 504s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 504s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 504s git-debrebase WALK BUILD 5fb8f309ef0ec9c88d36dc5258c48ebd96c42b78 Debian (rewriting=0) 504s git-debrebase WALK BUILD 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee Debian (rewriting=0) 504s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 504s git-debrebase WALK BUILD 4199dd68aeb91b09ff7d051eafcca2f7d224aa69 Upstream (rewriting=0) 504s git-debrebase WALK BUILD 8ebe99a8eaeb097e7649649995e09351099b2837 Upstream (rewriting=0) 504s git-debrebase WALK BUILD a1b7f18866012b961437b6f75ed0ae106783d5e3 Upstream (rewriting=0) 504s git-debrebase WALK BUILD 8e7cc4e38186cddfc4b3361cab4620764327ce86 Upstream (rewriting=0) 504s git-debrebase WALK BUILD 1730142aa2f160b263adae4ebebd0b03e88e65db Upstream (rewriting=0) 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase get_differs 1730142aa2f160b263adae4ebebd0b03e88e65db 1730142aa2f160b263adae4ebebd0b03e88e65db = 0 504s git-debrebase *** WALK RETURN 1730142aa2f160b263adae4ebebd0b03e88e65db 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase gbp_pq_export bw 3393b9e969e887ec0f0cd19fbc3f1fd83d1c29ee 1730142aa2f160b263adae4ebebd0b03e88e65db 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 504s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s git-debrebase >= delete refs/ffq-prev/heads/nmu2 504s git-debrebase >= delete refs/debrebase-last/heads/nmu2 504s git-debrebase >= update HEAD 2a5668ff11df9ddd94edc26cda07e3574df9beb4 1730142aa2f160b263adae4ebebd0b03e88e65db 504s git-debrebase >$ 504s HEAD is now at 2a5668f Commit patch queue (converted from git-debrebase format) 504s git-debrebase: converted to git-buildpackage branch format 504s git-debrebase: WARNING: do not now run "git-debrebase" any more 504s git-debrebase: WARNING: doing so would drop all upstream patches! 504s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 504s ' 504s + t-git-next-date 504s + GIT_COMMITTER_DATE='1530000011 +0100' 504s + GIT_AUTHOR_DATE='1530000011 +0100' 504s + gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../example_2.1.orig.tar.gz 504s gbp:info: Importing '../example_2.1.orig.tar.gz' to branch 'upstream'... 504s gbp:info: Source package is example 504s gbp:info: Upstream version is 2.1 504s gbp:info: Replacing upstream source on 'nmu2' 504s gbp:info: Successfully imported version 2.1 of ../example_2.1.orig.tar.gz 504s + t-dch-commit -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 504s + t-debchange -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 504s + DEBEMAIL=dgit-tests@example.org 504s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.1-0+nmu1 -m 'new upstream 2.1-0+nmu1' 504s + exec env TZ=UTC faketime -f 2018-06-26 08:00:11 env -u TZ /usr/bin/debchange -v 2.1-0+nmu1 -m new upstream 2.1-0+nmu1 504s + git commit -m 'dch -v 2.1-0+nmu1 -m new upstream 2.1-0+nmu1' debian/changelog 504s [nmu2 597525c] dch -v 2.1-0+nmu1 -m new upstream 2.1-0+nmu1 504s 1 file changed, 6 insertions(+) 504s + gbp pq import 504s gbp:info: Trying to apply patches at '597525cfcf288a010cf1df875c22371c7509ca8b' 504s gbp:info: 5 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu2' 504s + t-nmu-upload-2 504s + t-git-next-date 504s + GIT_COMMITTER_DATE='1530000012 +0100' 504s + GIT_AUTHOR_DATE='1530000012 +0100' 504s + t-dch-commit -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 504s + t-debchange -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 504s + DEBEMAIL=dgit-tests@example.org 504s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.1-0+nmu1 -m 'nmu nmu2 2.1-0+nmu1' 504s + exec env TZ=UTC faketime -f 2018-06-26 08:00:12 env -u TZ /usr/bin/debchange -v 2.1-0+nmu1 -m nmu nmu2 2.1-0+nmu1 504s + git commit -m 'dch -v 2.1-0+nmu1 -m nmu nmu2 2.1-0+nmu1' debian/changelog 504s [patch-queue/nmu2 7e1722f] dch -v 2.1-0+nmu1 -m nmu nmu2 2.1-0+nmu1 504s 1 file changed, 2 insertions(+), 1 deletion(-) 504s + t-some-changes 504s + local token= 504s + local which=dum 504s + local fsuffix= 504s + t-git-next-date 504s + GIT_COMMITTER_DATE='1530000013 +0100' 504s + GIT_AUTHOR_DATE='1530000013 +0100' 504s + case "$which" in 504s + echo '// debian ' 504s + git add debian/zorkmid 504s + git commit -m 'DEBIAN add zorkmid ()' 504s [patch-queue/nmu2 1648a0a] DEBIAN add zorkmid () 504s 1 file changed, 1 insertion(+) 504s + case "$which" in 504s + echo '// upstream ' 504s + git add src.c 504s + git commit -m 'UPSTREAM edit src.c ()' 504s [patch-queue/nmu2 c48a6ce] UPSTREAM edit src.c () 504s 1 file changed, 1 insertion(+) 504s + case "$which" in 504s + for f in debian/zorkmid$fsuffix src$fsuffix.c 504s + echo '// both! ' 504s + git add debian/zorkmid 504s + for f in debian/zorkmid$fsuffix src$fsuffix.c 504s + echo '// both! ' 504s + git add src.c 504s + git commit -m 'MIXED add both() ()' 504s [patch-queue/nmu2 33e3119] MIXED add both() () 504s 2 files changed, 2 insertions(+) 504s + t-git-next-date 504s + GIT_COMMITTER_DATE='1530000014 +0100' 504s + GIT_AUTHOR_DATE='1530000014 +0100' 504s + t-nmu-upload-3 504s + t-dch-commit-r 504s + t-dch-r-rune t-dch-commit 504s + local cmd=t-dch-commit 504s + shift 504s + local suite=unstable 504s + t-dch-commit -r -D unstable '' 504s + t-debchange -r -D unstable '' 504s + DEBEMAIL=dgit-tests@example.org 504s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 504s + exec env TZ=UTC faketime -f 2018-06-26 08:00:14 env -u TZ /usr/bin/debchange -r -D unstable 504s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 504s libdistro-info-perl is not installed, Debian release names are not known. 504s libdistro-info-perl is not installed, Ubuntu release names are not known. 504s + git commit -m 'dch -r -D unstable ' debian/changelog 504s [patch-queue/nmu2 ff9fa6f] dch -r -D unstable 504s 1 file changed, 2 insertions(+), 2 deletions(-) 504s + t-non-dgit-upload 504s + t-dgit -wgf build-source 504s + local dgit=dgit 504s + pwd 504s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 504s + : ' 504s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 504s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 505s | git rev-parse --show-toplevel 505s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 505s | git config -z --get-regexp --local '.*' 505s | git config -z --get-regexp --local '.*' 505s | git config -z --get-regexp --global '.*' 505s | git config -z --get-regexp --system '.*' 505s format 3.0 (quilt), quilt mode linear 505s Format `3.0 (quilt)', need to check/update patch stack 505s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 505s => `' 505s + git diff --quiet HEAD 505s | git clean -dn 505s => `' 505s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 505s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 505s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 505s | git rev-parse 'HEAD~0' 505s => `ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d' 505s | git symbolic-ref -q HEAD 505s => `refs/heads/patch-queue/nmu2' 505s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 505s CD work 505s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 505s + git reset -q --hard ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s examining quilt state (multiple patches, linear mode) 505s branch_is_gdr ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d... 505s branch_is_gdr feb151382cbab92751733236265afcef5b81dd7e ?-2-merge NO 505s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 505s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 505s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 505s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 505s CD fake 505s | find -name .git -prune -print0 505s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 505s + git checkout -f ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian 505s + git add -Af . 505s | git write-tree 505s => `dfd5341a8fd62ac03b2b10fa0b69d779addacecd' 505s fake orig tree object dfd5341a8fd62ac03b2b10fa0b69d779addacecd 505s CD .. 505s + git reset -q --hard ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s CD ../fake 505s + git add -Af . 505s | git write-tree 505s => `e9b1e9ee7732b4a589a8ac9d7221d12096ce784e' 505s fake o+d/p tree object dfd5341a8fd62ac03b2b10fa0b69d779addacecd 505s CD ../work 505s | git ls-tree --name-only -z ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 505s | git diff-tree -z --no-renames -r dfd5341a8fd62ac03b2b10fa0b69d779addacecd ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 228893359330cf7d9317f507a2f99f2b4f86d6b6 M\x00src.c\x00' 505s quiltify_trees_differ dfd5341a8fd62ac03b2b10fa0b69d779addacecd ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d => 1 505s | git diff-tree -z --no-renames --name-only -r ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `src.c\x00' 505s quiltify_trees_differ ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 505s | git diff-tree -z --no-renames --name-only -r dfd5341a8fd62ac03b2b10fa0b69d779addacecd e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `lib.c\x00new-upstream-file\x00src.c\x00' 505s quiltify_trees_differ dfd5341a8fd62ac03b2b10fa0b69d779addacecd e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 505s differences @dl ## ## ## == == ==. 505s dgit: base trees orig=dfd5341a8fd62ac03b2b o+d/p=e9b1e9ee7732b4a589a8 505s dgit: quilt differences: src: ## orig ## gitignores: == orig == 505s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 505s starting quiltify (multiple patches, linear mode) 505s | git ls-tree --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/rules debian/control 505s => `debian/control'... 505s quiltify investigate ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s | git diff-tree -z --no-renames --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `src.c\x00' 505s quiltify_trees_differ ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 505s | git ls-tree --name-only ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/rules debian/control 505s => `debian/control'... 505s | git cat-file commit ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s => `tree b7719de99f15ce9e6a317fa90890f1113985c6e3'... 505s | git diff-tree -z --no-renames --name-only 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 505s => `debian\x00' 505s quiltify_trees_differ 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d => 0 505s considering C=ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d P=33e3119e9ec3925192450b99116358f1815922eb 505s | git diff-tree -r --name-only 33e3119e9ec3925192450b99116358f1815922eb ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d -- debian/patches .pc debian/source/format 505s => `' 505s search queue P=33e3119e9ec3925192450b99116358f1815922eb triv 505s quiltify investigate 33e3119e9ec3925192450b99116358f1815922eb 505s | git diff-tree -z --no-renames --name-only 33e3119e9ec3925192450b99116358f1815922eb e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `debian\x00src.c\x00' 505s quiltify_trees_differ 33e3119e9ec3925192450b99116358f1815922eb e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 505s | git ls-tree --name-only 33e3119e9ec3925192450b99116358f1815922eb -- debian/rules debian/control 505s => `debian/control'... 505s | git cat-file commit 33e3119e9ec3925192450b99116358f1815922eb 505s => `tree abb5b6d47ae13d94d3433ce9ed02c0f15aa9d357'... 505s | git diff-tree -z --no-renames --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb 505s => `debian\x00src.c\x00' 505s quiltify_trees_differ c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb => 1 505s considering C=33e3119e9ec3925192450b99116358f1815922eb P=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s | git diff-tree -r --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 33e3119e9ec3925192450b99116358f1815922eb -- debian/patches .pc debian/source/format 505s => `' 505s search queue P=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 NT 505s quiltify investigate c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s | git diff-tree -z --no-renames --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `debian\x00src.c\x00' 505s quiltify_trees_differ c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 1 505s | git ls-tree --name-only c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 -- debian/rules debian/control 505s => `debian/control'... 505s | git cat-file commit c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s => `tree 5da388363c347c99285c2c904a43bb9b56c8fa55'... 505s | git diff-tree -z --no-renames --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s => `src.c\x00' 505s quiltify_trees_differ 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 => 1 505s considering C=c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 P=1648a0a3cb34c619a5a1447b0840792a114b6417 505s | git diff-tree -r --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 -- debian/patches .pc debian/source/format 505s => `' 505s search queue P=1648a0a3cb34c619a5a1447b0840792a114b6417 NT 505s quiltify investigate 1648a0a3cb34c619a5a1447b0840792a114b6417 505s | git diff-tree -z --no-renames --name-only 1648a0a3cb34c619a5a1447b0840792a114b6417 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e 505s => `debian\x00' 505s quiltify_trees_differ 1648a0a3cb34c619a5a1447b0840792a114b6417 e9b1e9ee7732b4a589a8ac9d7221d12096ce784e => 0 505s search finished hooray! 505s quiltify linearisation planning successful, executing... 505s quiltify traverse 1648a0a3cb34c619a5a1447b0840792a114b6417..c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s | git cat-file commit c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s => `tree 5da388363c347c99285c2c904a43bb9b56c8fa55'... 505s | git log -n1 '--pretty=format:%aD' c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s => `Tue, 26 Jun 2018 09:00:13 +0100' 505s + git checkout -q c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 505s + git checkout -q ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d debian/changelog 505s | realpath -- /usr/bin/dgit 505s => `/usr/bin/dgit' 505s | realpath -- .git/dgit/quilt-description.tmp 505s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 505s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-.patch1 505s dpkg-source: info: using patch list from debian/patches/series 505s dpkg-source: info: local changes detected, the modified files are: 505s work/src.c 505s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-.patch1 505s + git checkout -q c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26 debian/changelog 505s quiltify traverse c48a6ce4c3afb5a33bb8be2333a75dc7831bcf26..33e3119e9ec3925192450b99116358f1815922eb 505s | git cat-file commit 33e3119e9ec3925192450b99116358f1815922eb 505s => `tree abb5b6d47ae13d94d3433ce9ed02c0f15aa9d357'... 505s | git log -n1 '--pretty=format:%aD' 33e3119e9ec3925192450b99116358f1815922eb 505s => `Tue, 26 Jun 2018 09:00:13 +0100' 505s + git checkout -q 33e3119e9ec3925192450b99116358f1815922eb 505s + git checkout -q ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d debian/changelog 505s | realpath -- /usr/bin/dgit 505s => `/usr/bin/dgit' 505s | realpath -- .git/dgit/quilt-description.tmp 505s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 505s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-.patch1 505s dpkg-source: info: using patch list from debian/patches/series 505s dpkg-source: info: local changes detected, the modified files are: 505s work/src.c 506s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-.patch1 506s + git checkout -q 33e3119e9ec3925192450b99116358f1815922eb debian/changelog 506s quiltify traverse 33e3119e9ec3925192450b99116358f1815922eb..ff9fa6f82f71857e2113b09ee6bfe67225ed2c5d 506s + git checkout -q master 506s | git status --ignored --porcelain 506s => ` M debian/patches/series'... 506s + git add -f debian/patches 506s Commit Debian 3.0 (quilt) metadata 506s 506s [dgit (9.15) quilt-fixup] 506s 506s + git commit -m 'Commit Debian 3.0 (quilt) metadata 506s 506s [dgit (9.15) quilt-fixup] 506s ' 506s [master 5100621] Commit Debian 3.0 (quilt) metadata 506s 3 files changed, 32 insertions(+) 506s create mode 100644 debian/patches/mixed-add-both-.patch1 506s create mode 100644 debian/patches/upstream-edit-src.c-.patch1 506s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 506s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 506s | git rev-parse 'HEAD~0' 506s => `5100621d624b5770c893f72700cc63040238aea6' 506s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 506s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 506s CD work 506s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 506s + git reset -q --hard 5100621d624b5770c893f72700cc63040238aea6 506s CD .. 506s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 506s dpkg-source: info: using source format '3.0 (quilt)' 506s dpkg-source: info: building example using existing ./example_2.1.orig.tar.gz 506s dpkg-source: info: using patch list from debian/patches/series 506s dpkg-source: info: building example in example_2.1-0+nmu1.debian.tar.xz 506s dpkg-source: info: building example in example_2.1-0+nmu1.dsc 506s CD work 506s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 506s changelog will contain changes since 2.0-2+nmu1 506s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.1-0+nmu1_source.changes' dpkg-genchanges -S '-v2.0-2+nmu1' 506s dpkg-genchanges: info: not including original source code in upload 506s CD .. 506s moving example_2.1-0+nmu1.dsc, example_2.1-0+nmu1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 506s renaming (Files) example_2.1.orig.tar.gz 506s renaming (Files) example_2.1-0+nmu1.debian.tar.xz 506s renaming (dsc) example_2.1-0+nmu1.dsc 506s renaming (changes) example_2.1-0+nmu1_source.changes 506s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 506s dgit ok: source built, results in example_2.1-0+nmu1.dsc and example_2.1-0+nmu1_source.changes 506s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 506s ' 506s + cd .. 506s + c=example_2.1-0+nmu1_source.changes 506s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.1-0+nmu1_source.changes 506s signfile dsc example_2.1-0+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 506s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 506s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 506s 506s fixup_changes dsc example_2.1-0+nmu1.dsc example_2.1-0+nmu1_source.changes 506s signfile changes example_2.1-0+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 506s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 506s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 506s 506s Successfully signed dsc, changes files 506s + dput -c /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy example_2.1-0+nmu1_source.changes 506s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.1-0+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 506s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.1-0+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 506s D: Setting host argument. 506s Checking signature on .changes 506s Checking signature on .dsc 506s Uploading to test-dummy (via local to localhost): 506s Successfully uploaded packages. 506s + t-archive-process-incoming sid 506s + local suite=sid 506s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-3.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-3.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-3_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1-0+nmu1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1-0+nmu1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.1-0+nmu1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 506s + t-archive-query sid 506s + local suite=sid 506s + local dscf=main/example_2.1-0+nmu1.dsc 506s + t-archive-query-aq sid example 2.1-0+nmu1 main/example_2.1-0+nmu1.dsc 506s + local suite=sid 506s + local p=example 506s + local v=2.1-0+nmu1 506s + local dscf=main/example_2.1-0+nmu1.dsc 506s + local sha 506s ++ sha256sum 506s + sha='a885c3d8991fab1408e6885325cfba20abf505f7c02257632c6cecd49f03c36a -' 506s + echo '2.1-0+nmu1 a885c3d8991fab1408e6885325cfba20abf505f7c02257632c6cecd49f03c36a main/example_2.1-0+nmu1.dsc' 506s + t-aq-archive-updated sid example 506s + local suite=sid 506s + local p=example 506s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 506s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 506s + perl -wne ' 506s use JSON; 506s use strict; 506s our @v; 506s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 506s push @v, { 506s "version" => "$1", 506s "sha256sum" => "$2", 506s "component" => "$3", 506s "filename" => "$4", 506s }; 506s END { 506s my $json = JSON->new->canonical(); 506s print $json->encode(\@v) or die $!; 506s } 506s ' 506s + t-git-next-date 506s + GIT_COMMITTER_DATE='1530000015 +0100' 506s + GIT_AUTHOR_DATE='1530000015 +0100' 506s + cd example 506s + git checkout master 506s Switched to branch 'master' 506s Your branch is ahead of 'origin/master' by 21 commits. 506s (use "git push" to publish your local commits) 506s + : 'done the nmu, back to the maintainer' 506s + nmu-fold 506s + t-git-next-date 506s + GIT_COMMITTER_DATE='1530000016 +0100' 506s + GIT_AUTHOR_DATE='1530000016 +0100' 506s + t-dgit fetch 506s + local dgit=dgit 506s + pwd 506s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 506s + : ' 506s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 506s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 507s | git rev-parse --show-toplevel 507s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 507s | git config -z --get-regexp --local '.*' 507s | git config -z --get-regexp --local '.*' 507s | git config -z --get-regexp --global '.*' 507s | git config -z --get-regexp --system '.*' 507s | git symbolic-ref -q HEAD 507s => `refs/heads/master' 507s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 507s canonical suite name for unstable is sid 507s query: fetching http://127.0.0.1:37223/example.git/HEAD... 507s dgit-repos check_for_git => 1. 507s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 507s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 507s git_lrfetch_sane iteration 0 507s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 507s => 4b8c76d051e32cfd5c0f423504742148ed9e07a4 refs/dgit/sid 507s => 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/tags/archive/test-dummy/2.0-1 507s => 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/tags/archive/test-dummy/2.0-2 507s => 4b8584297fb76b16f0cbeb4d7fb13ba31469038d refs/tags/archive/test-dummy/2.0-3 507s => b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/tags/test-dummy/2.0-1 507s => aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/tags/test-dummy/2.0-2 507s => 59b3e47137fe54a918a6cfd77739bb1d80633277 refs/tags/test-dummy/2.0-3 507s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 507s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 507s | git for-each-ref refs/dgit-fetch/test-dummy 507s |> 4b8c76d051e32cfd5c0f423504742148ed9e07a4 commit refs/dgit-fetch/test-dummy/dgit/sid 507s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 507s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 507s |> 4b8584297fb76b16f0cbeb4d7fb13ba31469038d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 507s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 507s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 507s |> 59b3e47137fe54a918a6cfd77739bb1d80633277 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 507s git_lrfetch_sane: tidying any old suite lrfetchrefs 507s | git for-each-ref refs/dgit-fetch/sid 507s git_lrfetch_sane: git fetch --no-insane emulation complete 507s $VAR1 = { 507s 'refs/dgit-fetch/test-dummy/dgit/sid' => '4b8c76d051e32cfd5c0f423504742148ed9e07a4', 507s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '73453a4cf312f7fee81e3400e57fb36d7777c35f', 507s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188', 507s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3' => '59b3e47137fe54a918a6cfd77739bb1d80633277', 507s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f', 507s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '8b9773e7665f0cfd3d94dedfa13bf18fc976540a', 507s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3' => '4b8584297fb76b16f0cbeb4d7fb13ba31469038d' 507s }; 507s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 507s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/tags/archive/test-dummy/2.0-1 507s currently refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 507s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/tags/archive/test-dummy/2.0-2 507s currently refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 507s |> 4b8584297fb76b16f0cbeb4d7fb13ba31469038d tag refs/tags/archive/test-dummy/2.0-3 507s currently refs/tags/archive/test-dummy/2.0-3=4b8584297fb76b16f0cbeb4d7fb13ba31469038d 507s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/tags/test-dummy/2.0-1 507s currently refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 507s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/tags/test-dummy/2.0-2 507s currently refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 507s |> 59b3e47137fe54a918a6cfd77739bb1d80633277 tag refs/tags/test-dummy/2.0-3 507s currently refs/tags/test-dummy/2.0-3=59b3e47137fe54a918a6cfd77739bb1d80633277 507s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 507s |> 8b9773e7665f0cfd3d94dedfa13bf18fc976540a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 507s offered refs/tags/archive/test-dummy/2.0-1=8b9773e7665f0cfd3d94dedfa13bf18fc976540a 507s |> 73453a4cf312f7fee81e3400e57fb36d7777c35f tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 507s offered refs/tags/archive/test-dummy/2.0-2=73453a4cf312f7fee81e3400e57fb36d7777c35f 507s |> 4b8584297fb76b16f0cbeb4d7fb13ba31469038d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 507s offered refs/tags/archive/test-dummy/2.0-3=4b8584297fb76b16f0cbeb4d7fb13ba31469038d 507s |> b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 507s offered refs/tags/test-dummy/2.0-1=b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f 507s |> aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 507s offered refs/tags/test-dummy/2.0-2=aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 507s |> 59b3e47137fe54a918a6cfd77739bb1d80633277 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 507s offered refs/tags/test-dummy/2.0-3=59b3e47137fe54a918a6cfd77739bb1d80633277 507s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 507s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.1-0+nmu1.dsc... 507s get_archive_dsc: Version 2.1-0+nmu1 507s last upload to archive: NO git hash 507s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s previous reference hash=4b8c76d051e32cfd5c0f423504742148ed9e07a4 507s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s fetch_from_archive: lastfetch=4b8c76d051e32cfd5c0f423504742148ed9e07a4 507s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 507s considering reusing example_2.1.orig.tar.gz: (No such file or directory) linked. 507s using existing example_2.1.orig.tar.gz 507s considering saving example_2.1.orig.tar.gz: (File exists) no need. 507s considering reusing example_2.1-0+nmu1.debian.tar.xz: (No such file or directory) linked. 507s using existing example_2.1-0+nmu1.debian.tar.xz 507s considering saving example_2.1-0+nmu1.debian.tar.xz: (File exists) no need. 507s import considering example_2.1.orig.tar.gz Y .gz orig 507s + chmod -R '+rwX' _unpack-tar 507s CD _unpack-tar 507s | find -name .git -prune -print0 507s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 507s + git add -Af . 507s | git write-tree 507s => `fbb99216bb0d1a7a2e1da73de5f8568c4b4e04d3' 507s | git ls-tree -z fbb99216bb0d1a7a2e1da73de5f8568c4b4e04d3 507s => `040000 tree 7ec50e88ff90f859d6b39f1078a1fa7580955823\x09example-2.1\x00' 507s one subtree 7ec50e88ff90f859d6b39f1078a1fa7580955823 507s CD .. 507s import considering example_2.1-0+nmu1.debian.tar.xz Y .xz (none) 507s + chmod -R '+rwX' _unpack-tar 507s CD _unpack-tar 507s | find -name .git -prune -print0 507s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 507s + git add -Af . 507s | git write-tree 507s => `0990bee1a7fa5ea7c6bcc4119f6718d9db638ae5' 507s | git ls-tree -z 0990bee1a7fa5ea7c6bcc4119f6718d9db638ae5 507s => `040000 tree 6d953e19e79376229c0456bd0cbfb70496fb5d1f\x09debian\x00' 507s one subtree 6d953e19e79376229c0456bd0cbfb70496fb5d1f 507s CD .. 507s + dpkg-source --no-check --skip-patches -x -- example.dsc 507s dpkg-source: info: extracting example in example-2.1 507s dpkg-source: info: unpacking example_2.1.orig.tar.gz 507s dpkg-source: info: unpacking example_2.1-0+nmu1.debian.tar.xz 507s CD example-2.1 507s | find -name .git -prune -print0 507s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 507s + git add -Af . 507s | git write-tree 507s => `648a3758d9b667d29500784c4b37ed8354be0810' 507s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 507s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 507s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 507s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 507s + git add -Af . 507s | git write-tree 507s => `fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6' 507s import clog search... 507s | dpkg-parsechangelog --format rfc822 --all 507s import clog 2.1-0+nmu1 package changelog, entry no.1... 507s import clog 2.1-0+nmu1 vs 2.1... 507s import clog 2.1-0+nmu1 becomes r1 507s import clog 2.0-3 package changelog, entry no.2... 507s import clog 2.0-3 vs 2.1... 507s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 507s => `1530000014 +0000' 507s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 507s => `1530000014 +0000' 507s import tartrees authline dgit test git user 1530000014 +0000 507s import tartrees r1authline dgit test git user 1530000014 +0000 507s import tartree example_2.1.orig.tar.gz 7ec50e88ff90f859d6b39f1078a1fa7580955823 507s | git hash-object -w -t commit --stdin 507s => 8c5d0e0174b5de39e69e18884925db0015d27527 507s import tartree example_2.1-0+nmu1.debian.tar.xz 6d953e19e79376229c0456bd0cbfb70496fb5d1f 507s | git hash-object -w -t commit --stdin 507s => d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 507s import main commit 507s | git hash-object -w -t commit ../commit.tmp 507s => `3840466cb74b8a6a4ed3ec06a72e03175d74a9ce' 507s import apply patches... 507s | git hash-object -w -t commit --stdin 507s => 055d67275a015e32ca8cd174f7ee6623945ba156 507s + git checkout -q -b dapplied 055d67275a015e32ca8cd174f7ee6623945ba156 507s + git checkout -q -b unpa 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 507s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 507s => `1530000014 +0000' 507s + git checkout -q unpa 507s + git update-ref -d refs/heads/patch-queue/unpa 507s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 507s | git rev-parse 'HEAD~0' 507s => `a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7' 507s | git rev-parse HEAD: 507s => `fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6' 507s synthesised git commit from .dsc 2.1-0+nmu1 507s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 4b8c76d051e32cfd5c0f423504742148ed9e07a4:debian/changelog 507s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 507s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7:debian/changelog 507s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 507s =>!256 507s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 4b8c76d051e32cfd5c0f423504742148ed9e07a4 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s fetch mergeinfos: 507s commit a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 Import of source package 507s commit 4b8c76d051e32cfd5c0f423504742148ed9e07a4 dgit suite branch on dgit git server 507s ReverseParents=1 Message=Record example (2.1-0+nmu1) in archive suite sid 507s | git cat-file commit a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 507s => `tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6'... 507s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:14 +0000' 507s => `1530000014 +0000' 507s | git hash-object -w -t commit /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/mergecommit 507s => `cfab37c19bff9fd6c55919a11af887e45eb3af44' 507s fetch hash=cfab37c19bff9fd6c55919a11af887e45eb3af44 507s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 cfab37c19bff9fd6c55919a11af887e45eb3af44 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git merge-base 4b8c76d051e32cfd5c0f423504742148ed9e07a4 cfab37c19bff9fd6c55919a11af887e45eb3af44 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s | git rev-parse '4b8c76d051e32cfd5c0f423504742148ed9e07a4~0' 507s => `4b8c76d051e32cfd5c0f423504742148ed9e07a4' 507s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE cfab37c19bff9fd6c55919a11af887e45eb3af44 507s | git log -n2 cfab37c19bff9fd6c55919a11af887e45eb3af44 507s => `commit cfab37c19bff9fd6c55919a11af887e45eb3af44'... 507s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid cfab37c19bff9fd6c55919a11af887e45eb3af44 507s => `' 507s | git ls-tree -lrz -- cfab37c19bff9fd6c55919a11af887e45eb3af44: 507s dgit ok: fetched into refs/remotes/dgit/dgit/sid 507s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 507s del_lrfetchrefs... 507s del_lrfetchrefs: 4b8c76d051e32cfd5c0f423504742148ed9e07a4 refs/dgit-fetch/test-dummy/dgit/sid 507s del_lrfetchrefs: 8b9773e7665f0cfd3d94dedfa13bf18fc976540a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 507s del_lrfetchrefs: 73453a4cf312f7fee81e3400e57fb36d7777c35f refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 507s del_lrfetchrefs: 4b8584297fb76b16f0cbeb4d7fb13ba31469038d refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 507s del_lrfetchrefs: b3bfb0d76f7b21b9beabe06be65a3ce66ee99c3f refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 507s del_lrfetchrefs: aa9cce2a68f1e0ddf4a571a2ddd5f68a778cc188 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 507s del_lrfetchrefs: 59b3e47137fe54a918a6cfd77739bb1d80633277 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 507s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 507s ' 507s + t-git-next-date 507s + GIT_COMMITTER_DATE='1530000017 +0100' 507s + GIT_AUTHOR_DATE='1530000017 +0100' 507s + git merge --ff-only dgit/dgit/sid 507s Updating 4b8c76d..cfab37c 507s Fast-forward 507s debian/changelog | 7 +++++++ 507s debian/patches/mixed-add-both-.patch1 | 15 +++++++++++++++ 507s debian/patches/series | 2 ++ 507s debian/patches/upstream-edit-src.c-.patch1 | 15 +++++++++++++++ 507s debian/zorkmid | 2 ++ 507s docs/README | 1 + 507s src.c | 2 ++ 507s 7 files changed, 44 insertions(+) 507s create mode 100644 debian/patches/mixed-add-both-.patch1 507s create mode 100644 debian/patches/upstream-edit-src.c-.patch1 507s + git diff --exit-code patch-queue/nmu2 507s + git branch unlaundered.nmu2 507s + t-git-debrebase 507s + local gdr=git-debrebase 507s + : ' 507s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 507s + git-debrebase --dgit=dgit -D 507s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 507s git-debrebase ffq check_specs * 507s git-debrebase ffq merge master 507s git-debrebase ffq check_remote origin remote fetch/merge branch 507s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 507s OK, you are ahead of refs/remotes/origin/master 507s git-debrebase ffq check_remote undef remote push branch 507s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 507s OK, you are ahead of refs/remotes/dgit/dgit/sid 507s git-debrebase *** WALK cfab37c19bff9fd6c55919a11af887e45eb3af44 0 - 507s git-debrebase get_differs 4b8c76d051e32cfd5c0f423504742148ed9e07a4 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x36 507s git-debrebase get_differs a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0 507s git-debrebase classify cfab37c19bff9fd6c55919a11af887e45eb3af44 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 4b8c76d051e32cfd5c0f423504742148ed9e07a4/0x36 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7/0 507s git-debrebase = Pseudomerge {"Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 4b8c76d051e32cfd5c0f423504742148ed9e07a4\nparent a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Parents" => [{"Differs" => 54,"Ix" => 0,"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4"},{"CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7","Ix" => 1,"Differs" => 0}],"CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Msg" => "Record example (2.1-0+nmu1) in archive suite sid\n","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[0]],"Contributor" => $VAR1->{"Parents"}[1]} 507s git-debrebase get_differs 81d8596985612b198bef8077a81b9f493a86bd17 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x2 507s git-debrebase classify a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 81d8596985612b198bef8077a81b9f493a86bd17/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Parents" => [{"CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Ix" => 0,"Differs" => 2}],"CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 81d8596985612b198bef8077a81b9f493a86bd17\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6"} 507s git-debrebase get_differs 9030a2f23038d2f402171d4ce0b637846272eabf 2b5743524074b13f18388c85f0ab3a4675727f25 = 0x2 507s git-debrebase classify 81d8596985612b198bef8077a81b9f493a86bd17 $t=2b5743524074b13f18388c85f0ab3a4675727f25 @p 9030a2f23038d2f402171d4ce0b637846272eabf/0x2 507s git-debrebase = Upstream {"Tree" => "2b5743524074b13f18388c85f0ab3a4675727f25","Hdr" => "tree 2b5743524074b13f18388c85f0ab3a4675727f25\nparent 9030a2f23038d2f402171d4ce0b637846272eabf\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Parents" => [{"Differs" => 2,"CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Ix" => 0}],"Type" => "Upstream"} 507s git-debrebase get_differs 90bfe62f6454203b392beea73d3366747a145432 e3680aec0b2b043eb1fc1bb33973bdece72374b5 = 0x2 507s git-debrebase classify 9030a2f23038d2f402171d4ce0b637846272eabf $t=e3680aec0b2b043eb1fc1bb33973bdece72374b5 @p 90bfe62f6454203b392beea73d3366747a145432/0x2 507s git-debrebase = Upstream {"CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Parents" => [{"Ix" => 0,"CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Hdr" => "tree e3680aec0b2b043eb1fc1bb33973bdece72374b5\nparent 90bfe62f6454203b392beea73d3366747a145432\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "e3680aec0b2b043eb1fc1bb33973bdece72374b5","Type" => "Upstream"} 507s git-debrebase get_differs 1d3db2255664fa14deafceb28bea050df8f692f5 dd5fa39e05cd2d16628cd518828b599193709422 = 0x2 507s git-debrebase classify 90bfe62f6454203b392beea73d3366747a145432 $t=dd5fa39e05cd2d16628cd518828b599193709422 @p 1d3db2255664fa14deafceb28bea050df8f692f5/0x2 507s git-debrebase = Upstream {"Tree" => "dd5fa39e05cd2d16628cd518828b599193709422","Hdr" => "tree dd5fa39e05cd2d16628cd518828b599193709422\nparent 1d3db2255664fa14deafceb28bea050df8f692f5\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5"}],"CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Type" => "Upstream"} 507s git-debrebase get_differs 5dd6a6e50a46e433773f5d68475b27acda36bd78 64dbf9bd449b82949cb964daf820d7d9c12ddc1b = 0x2 507s git-debrebase classify 1d3db2255664fa14deafceb28bea050df8f692f5 $t=64dbf9bd449b82949cb964daf820d7d9c12ddc1b @p 5dd6a6e50a46e433773f5d68475b27acda36bd78/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5","Parents" => [{"CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 64dbf9bd449b82949cb964daf820d7d9c12ddc1b\nparent 5dd6a6e50a46e433773f5d68475b27acda36bd78\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "64dbf9bd449b82949cb964daf820d7d9c12ddc1b"} 507s git-debrebase get_differs 439d330e0a4b3e4941acdbce4cda9605ea1c993e 50ecbd6a17951348a127992f7a6688a3f830177b = 0x2 507s git-debrebase classify 5dd6a6e50a46e433773f5d68475b27acda36bd78 $t=50ecbd6a17951348a127992f7a6688a3f830177b @p 439d330e0a4b3e4941acdbce4cda9605ea1c993e/0x2 507s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Tree" => "50ecbd6a17951348a127992f7a6688a3f830177b","Hdr" => "tree 50ecbd6a17951348a127992f7a6688a3f830177b\nparent 439d330e0a4b3e4941acdbce4cda9605ea1c993e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000014 +0000\n","Type" => "Upstream"} 507s git-debrebase get_differs 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 1532541e2f6366582d6b27d965181748e3f8904a = 0x2 507s git-debrebase classify 439d330e0a4b3e4941acdbce4cda9605ea1c993e $t=1532541e2f6366582d6b27d965181748e3f8904a @p 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Parents" => [{"Differs" => 2,"CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Ix" => 0}],"Hdr" => "tree 1532541e2f6366582d6b27d965181748e3f8904a\nparent 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "1532541e2f6366582d6b27d965181748e3f8904a"} 507s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 648a3758d9b667d29500784c4b37ed8354be0810 = 0x34 507s git-debrebase get_differs d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 648a3758d9b667d29500784c4b37ed8354be0810 = 0x36 507s git-debrebase classify 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce $t=648a3758d9b667d29500784c4b37ed8354be0810 @p 8c5d0e0174b5de39e69e18884925db0015d27527/0x34 d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81/0x36 507s git-debrebase = DgitImportUnpatched {"Tree" => "648a3758d9b667d29500784c4b37ed8354be0810","CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Parents" => [{"IsOrigin" => 1,"Differs" => 52,"IsDgitImport" => "orig","Ix" => 0,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527"},{"IsDgitImport" => "tarball","IsOrigin" => 1,"Differs" => 54,"CommitId" => "d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81","Ix" => 1}],"Type" => "DgitImportUnpatched","NewMsg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[was: dgit import unpatched example 2.1-0+nmu1]\n","OrigParents" => [$VAR1->{"Parents"}[0]],"Hdr" => "tree 648a3758d9b667d29500784c4b37ed8354be0810\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nparent d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n"} 507s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 507s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 507s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "3646aeb322533be919f218f7670519af795187ec","Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Parents" => [{"Ix" => 0,"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Differs" => 4}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 507s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 507s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 507s git-debrebase = Changelog {"Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Ix" => 0,"Differs" => 16}],"Type" => "Changelog"} 507s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 507s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 507s git-debrebase = Changelog {"Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f","Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Parents" => [{"Ix" => 0,"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Differs" => 16}],"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Type" => "Changelog"} 507s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 507s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 507s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 507s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Ix" => 0,"Differs" => 0},"Type" => "Pseudomerge","Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 507s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 507s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 507s git-debrebase = Upstream {"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0}],"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Type" => "Upstream"} 507s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 507s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Differs" => 2}],"Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 507s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 507s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"}],"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 507s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 507s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Differs" => 2}],"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc"} 507s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 507s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 507s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Parents" => [{"Differs" => 2,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Ix" => 0}]} 507s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 507s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 507s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Parents" => [{"Differs" => 48,"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}],"Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5"} 507s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 507s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 507s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3"}],"Msg" => "dch -r -D unstable\n","CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 507s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 507s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 507s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Type" => "Changelog"} 507s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 507s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 507s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 507s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 507s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 14 proc 25 pm 1 507s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 508s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 508s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 26 508s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 508s git-debrebase WALK BUILD d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 Debian (rewriting=0) 508s git-debrebase WALK BUILD 8397762c3c6a31b895366f874e97ed0805b1939e Debian (rewriting=0) 508s git-debrebase WALK BUILD e4eca65c490ba804c753f8fc1ef367ba07d51c08 Debian (rewriting=0) 508s git-debrebase WALK BUILD 95f78a1ec281f58eba538b9baef816d74e131c60 Debian (rewriting=0) 508s git-debrebase WALK REWRITING NOW cl=HASH(0x5582f455e180) procd=HASH(0x5582f456a628) 508s git-debrebase WALK BUILD 64bcb7d55956b0e3ebe624bf9040a976b183e414 Debian (rewriting=1) 508s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 508s git-debrebase WALK BUILD 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce DgitImportUpstreamUpdate (rewriting=1) 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce = 0x36 508s git-debrebase WALK BUILD 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce DgitImportDebianUpdate (rewriting=1) 508s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 508s git-debrebase WALK BUILD 439d330e0a4b3e4941acdbce4cda9605ea1c993e Upstream (rewriting=1) 508s git-debrebase WALK BUILD 5dd6a6e50a46e433773f5d68475b27acda36bd78 Upstream (rewriting=1) 508s git-debrebase WALK BUILD 1d3db2255664fa14deafceb28bea050df8f692f5 Upstream (rewriting=1) 508s git-debrebase WALK BUILD 90bfe62f6454203b392beea73d3366747a145432 Upstream (rewriting=1) 508s git-debrebase WALK BUILD 9030a2f23038d2f402171d4ce0b637846272eabf Upstream (rewriting=1) 508s git-debrebase WALK BUILD 81d8596985612b198bef8077a81b9f493a86bd17 Upstream (rewriting=1) 508s git-debrebase WALK BUILD a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 Upstream (rewriting=1) 508s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 508s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 508s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44 = 0x4 508s git-debrebase *** WALK RETURN 84ac322ff033ab96c026918c20e3a958c6d24146 f730b85f299afe1020b13e03243511c5bd8a6cbe 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 508s git-debrebase: laundered (head was cfab37c19bff9fd6c55919a11af887e45eb3af44) 508s git-debrebase >= update refs/ffq-prev/heads/master cfab37c19bff9fd6c55919a11af887e45eb3af44 0000000000000000000000000000000000000000 508s git-debrebase >= delete refs/debrebase-last/heads/master 508s git-debrebase >= update HEAD 84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44 508s git-debrebase >$ 508s Recorded previous head for preservation 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s + t-gdr-good laundered 508s + local state=laundered 508s + local beforetag= 508s + case $state in 508s + git diff --quiet -- :. ':!debian/patches' 508s + LC_MESSAGES=C 508s + t-git-debrebase status 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D status 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Type" => "Upstream"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Parents" => [{"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Type" => "Upstream","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a"}]} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Type" => "Upstream","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca"}]} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Type" => "Upstream","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc"}]} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}]} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Parents" => [{"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Ix" => 0,"Differs" => 48}],"Type" => "Packaging","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0,"Differs" => 2},{"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 48}],"Type" => "Anchor","CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n"} 508s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s + case $state in 508s + egrep '^ *branch is laundered' ../status.check 508s branch is laundered 508s + t-gdr-good-analyse HEAD laundered 508s + local head=HEAD 508s + local state=laundered 508s + local wsfx= 508s + local etypes bwtip 508s + case $state in 508s + etypes=Upstream 508s ++ t-git-debrebase breakwater 508s ++ local gdr=git-debrebase 508s ++ : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s ++ git-debrebase --dgit=dgit -D breakwater 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Type" => "Upstream"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"}],"Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Type" => "Upstream"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Type" => "Upstream"} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Ix" => 0,"Differs" => 2}],"Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream"} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca"}]} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Type" => "Upstream","Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Parents" => [{"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Ix" => 0,"Differs" => 2}]} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}],"Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Parents" => [{"Ix" => 0,"Differs" => 48,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6"}],"Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527"}],"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd"},$VAR1->{"OrigParents"}[0]],"Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","Type" => "Anchor","CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6"} 508s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s + bwtip=Y:f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + anal=../anal 508s + t-git-debrebase analyse HEAD 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D analyse HEAD 508s git-debrebase *** WALK 84ac322ff033ab96c026918c20e3a958c6d24146 1 *main::STDOUT 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Type" => "Upstream","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Type" => "Upstream","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Differs" => 2}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Parents" => [{"Ix" => 0,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Type" => "Upstream","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Differs" => 2,"Ix" => 0}],"Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Type" => "Upstream","Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Type" => "Upstream","Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Type" => "Upstream","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Differs" => 2,"Ix" => 0}]} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Type" => "Packaging","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Parents" => [{"Ix" => 0,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Differs" => 48}],"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Type" => "Anchor","Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","OrigParents" => [{"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 48}],"Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","Parents" => [{"Differs" => 2,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n"} 508s git-debrebase *** WALK prep done cur=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 brw 0 upp 6 proc 8 pm -1 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s ++ git rev-parse HEAD 508s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 508s + exec 508s + local cid ctype info nparents 508s + read cid ctype info 508s + : ===== 84ac322ff033ab96c026918c20e3a958c6d24146 Upstream ===== 508s + test 84ac322ff033ab96c026918c20e3a958c6d24146 = 84ac322ff033ab96c026918c20e3a958c6d24146 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 84ac322ff033ab96c026918c20e3a958c6d24146 508s + local parents=28033291551e80f8f5e16a90271754ad87575e3f 508s + expect=28033291551e80f8f5e16a90271754ad87575e3f 508s + enparents=1 508s + : Upstream/SAME 28033291551e80f8f5e16a90271754ad87575e3f 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s 28033291551e80f8f5e16a90271754ad87575e3f 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo 28033291551e80f8f5e16a90271754ad87575e3f 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== 28033291551e80f8f5e16a90271754ad87575e3f Upstream ===== 508s + test 28033291551e80f8f5e16a90271754ad87575e3f = 28033291551e80f8f5e16a90271754ad87575e3f 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 28033291551e80f8f5e16a90271754ad87575e3f 508s + local parents=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s + expect=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s + enparents=1 508s + : Upstream/SAME 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 Upstream ===== 508s + test 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 = 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 508s + local parents=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s + expect=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s + enparents=1 508s + : Upstream/SAME efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a Upstream ===== 508s + test efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a = efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 508s + local parents=1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s + expect=1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s + enparents=1 508s + : Upstream/SAME 1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s 1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo 1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== 1ca66fb225fad62360bdceb664ba6d30edd5a9db Upstream ===== 508s + test 1ca66fb225fad62360bdceb664ba6d30edd5a9db = 1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 1ca66fb225fad62360bdceb664ba6d30edd5a9db 508s + local parents=a7dcce470e3e188e596a71a3b6a7046b999571ca 508s + expect=a7dcce470e3e188e596a71a3b6a7046b999571ca 508s + enparents=1 508s + : Upstream/SAME a7dcce470e3e188e596a71a3b6a7046b999571ca 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s a7dcce470e3e188e596a71a3b6a7046b999571ca 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo a7dcce470e3e188e596a71a3b6a7046b999571ca 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== a7dcce470e3e188e596a71a3b6a7046b999571ca Upstream ===== 508s + test a7dcce470e3e188e596a71a3b6a7046b999571ca = a7dcce470e3e188e596a71a3b6a7046b999571ca 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P a7dcce470e3e188e596a71a3b6a7046b999571ca 508s + local parents=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s + expect=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s + enparents=1 508s + : Upstream/SAME 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== 1bda1595899985b5bc1d1b75fbf6dbb6645490dc Upstream ===== 508s + test 1bda1595899985b5bc1d1b75fbf6dbb6645490dc = 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s + local cetype=Upstream 508s + '[' xUpstream = xUpstream ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 508s + local parents=f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + expect=f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + enparents=1 508s + : Upstream/SAME f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s ++ printf %s f730b85f299afe1020b13e03243511c5bd8a6cbe 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo f730b85f299afe1020b13e03243511c5bd8a6cbe 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== f730b85f299afe1020b13e03243511c5bd8a6cbe Packaging ===== 508s + test f730b85f299afe1020b13e03243511c5bd8a6cbe = f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + local cetype=Upstream 508s + '[' xPackaging = xUpstream ']' 508s ++ git log -n1 --pretty=format:%P f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + local parents=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s + expect=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s + enparents=1 508s + : Packaging/Upstream 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + '[' xY:f730b85f299afe1020b13e03243511c5bd8a6cbe '!=' x ']' 508s + test Y:f730b85f299afe1020b13e03243511c5bd8a6cbe = Y:f730b85f299afe1020b13e03243511c5bd8a6cbe 508s + bwtip= 508s + case "$cetype" in 508s + case "$ctype" in 508s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :. ':!debian' 508s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :debian/patches 508s + etypes=Packaging 508s ++ printf %s 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s ++ wc -w 508s + local cnparents=1 508s + test 1 = 1 508s ++ for f in $parents 508s ++ echo 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s ++ wc -w 508s ++ t-sort -u 508s ++ LC_COLLATE=C 508s ++ sort -u 508s + local cndparents=1 508s + test 1 = 1 508s + case "$parents" in 508s + case "$ctype" in 508s + read cid ctype info 508s + : ===== 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 Anchor ===== 508s + test 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 = 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s + local cetype=Packaging 508s + '[' xAnchor = xPackaging ']' 508s ++ git log -n1 --pretty=format:%P 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 508s + local 'parents=a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 508s + expect='a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 508s + enparents=1 508s + : Anchor/Packaging 'a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s + break 508s + t-git-debrebase stitch 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D stitch 508s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f"}],"Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Type" => "Upstream"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"}],"Type" => "Upstream","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a"}],"Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch"} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Type" => "Upstream","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}]} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Type" => "Upstream","Parents" => [{"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc"}]} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}]} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Type" => "Packaging","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Parents" => [{"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Differs" => 48,"Ix" => 0}]} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n","CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527"}],"Parents" => [{"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7"} 508s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 508s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 508s git-debrebase >= delete refs/ffq-prev/heads/master cfab37c19bff9fd6c55919a11af887e45eb3af44 508s git-debrebase >= update refs/debrebase-last/heads/master 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 0000000000000000000000000000000000000000 508s git-debrebase >= update HEAD 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 84ac322ff033ab96c026918c20e3a958c6d24146 508s git-debrebase >$ 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s + t-gdr-good stitched 508s + local state=stitched 508s + local beforetag= 508s + case $state in 508s + git diff --quiet -- :. ':!debian/patches' 508s + LC_MESSAGES=C 508s + t-git-debrebase status 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D status 508s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0 508s git-debrebase get_differs cfab37c19bff9fd6c55919a11af887e45eb3af44 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x8 508s git-debrebase classify 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 84ac322ff033ab96c026918c20e3a958c6d24146/0 cfab37c19bff9fd6c55919a11af887e45eb3af44/0x8 508s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Overwritten" => [{"CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Ix" => 1,"Differs" => 8}],"Parents" => [{"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 84ac322ff033ab96c026918c20e3a958c6d24146\nparent cfab37c19bff9fd6c55919a11af887e45eb3af44\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","CommitId" => "22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51","Contributor" => $VAR1->{"Parents"}[0]} 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Parents" => [{"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"}],"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Type" => "Upstream"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Parents" => [{"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547"} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Type" => "Upstream"} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38","Parents" => [{"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc"}],"Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831","Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Type" => "Upstream"} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe"}],"Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Type" => "Upstream"} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Parents" => [{"Ix" => 0,"Differs" => 48,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6"}],"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","OrigParents" => [{"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Ix" => 1,"Differs" => 48}],"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Anchor"} 508s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s + case $state in 508s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 508s branch contains furniture (not laundered) 508s + egrep '^ stitched$' ../status.check 508s stitched 508s + t-gdr-good-analyse HEAD stitched 508s + local head=HEAD 508s + local state=stitched 508s + local wsfx= 508s + local etypes bwtip 508s + case $state in 508s + etypes=Pseudomerge-Upstream 508s + anal=../anal 508s + t-git-debrebase analyse HEAD 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D analyse HEAD 508s git-debrebase *** WALK 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 1 *main::STDOUT 508s git-debrebase get_differs 84ac322ff033ab96c026918c20e3a958c6d24146 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0 508s git-debrebase get_differs cfab37c19bff9fd6c55919a11af887e45eb3af44 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x8 508s git-debrebase classify 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 84ac322ff033ab96c026918c20e3a958c6d24146/0 cfab37c19bff9fd6c55919a11af887e45eb3af44/0x8 508s git-debrebase = Pseudomerge {"CommitId" => "22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 84ac322ff033ab96c026918c20e3a958c6d24146\nparent cfab37c19bff9fd6c55919a11af887e45eb3af44\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Overwritten" => [{"Differs" => 8,"CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Ix" => 1}],"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146"},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Type" => "Pseudomerge"} 508s git-debrebase get_differs 28033291551e80f8f5e16a90271754ad87575e3f 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 = 0x2 508s git-debrebase classify 84ac322ff033ab96c026918c20e3a958c6d24146 $t=688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14 @p 28033291551e80f8f5e16a90271754ad87575e3f/0x2 508s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14","Parents" => [{"Ix" => 0,"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Differs" => 2}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","Hdr" => "tree 688705b2ec8a83c2be90fb47b12ef3a7ea8d7f14\nparent 28033291551e80f8f5e16a90271754ad87575e3f\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "84ac322ff033ab96c026918c20e3a958c6d24146"} 508s git-debrebase get_differs 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 ff4553064af3dcb78ccc5c522da6fe428096e94a = 0x2 508s git-debrebase classify 28033291551e80f8f5e16a90271754ad87575e3f $t=ff4553064af3dcb78ccc5c522da6fe428096e94a @p 8fc2dd44802dbfbda6714a8300c0f2ffd035c547/0x2 508s git-debrebase = Upstream {"CommitId" => "28033291551e80f8f5e16a90271754ad87575e3f","Hdr" => "tree ff4553064af3dcb78ccc5c522da6fe428096e94a\nparent 8fc2dd44802dbfbda6714a8300c0f2ffd035c547\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "ff4553064af3dcb78ccc5c522da6fe428096e94a","Parents" => [{"Ix" => 0,"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Differs" => 2}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Type" => "Upstream"} 508s git-debrebase get_differs efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a f29ccede4fbc8625991edb02089a0390ee831e86 = 0x2 508s git-debrebase classify 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 $t=f29ccede4fbc8625991edb02089a0390ee831e86 @p efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a/0x2 508s git-debrebase = Upstream {"CommitId" => "8fc2dd44802dbfbda6714a8300c0f2ffd035c547","Hdr" => "tree f29ccede4fbc8625991edb02089a0390ee831e86\nparent efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Ix" => 0}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Tree" => "f29ccede4fbc8625991edb02089a0390ee831e86","Type" => "Upstream"} 508s git-debrebase get_differs 1ca66fb225fad62360bdceb664ba6d30edd5a9db 2de73fb98a33c21de5b8672952c1fd652dec8627 = 0x2 508s git-debrebase classify efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a $t=2de73fb98a33c21de5b8672952c1fd652dec8627 @p 1ca66fb225fad62360bdceb664ba6d30edd5a9db/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 2de73fb98a33c21de5b8672952c1fd652dec8627\nparent 1ca66fb225fad62360bdceb664ba6d30edd5a9db\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a","Type" => "Upstream","Tree" => "2de73fb98a33c21de5b8672952c1fd652dec8627","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db"}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch"} 508s git-debrebase get_differs a7dcce470e3e188e596a71a3b6a7046b999571ca 8ed831332c39bd0f121a33979bdcd4aeee8cff38 = 0x2 508s git-debrebase classify 1ca66fb225fad62360bdceb664ba6d30edd5a9db $t=8ed831332c39bd0f121a33979bdcd4aeee8cff38 @p a7dcce470e3e188e596a71a3b6a7046b999571ca/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 8ed831332c39bd0f121a33979bdcd4aeee8cff38\nparent a7dcce470e3e188e596a71a3b6a7046b999571ca\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "1ca66fb225fad62360bdceb664ba6d30edd5a9db","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "8ed831332c39bd0f121a33979bdcd4aeee8cff38"} 508s git-debrebase get_differs 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 48d40863ab030873619f07b9fabd0578ef6b5831 = 0x2 508s git-debrebase classify a7dcce470e3e188e596a71a3b6a7046b999571ca $t=48d40863ab030873619f07b9fabd0578ef6b5831 @p 1bda1595899985b5bc1d1b75fbf6dbb6645490dc/0x2 508s git-debrebase = Upstream {"Hdr" => "tree 48d40863ab030873619f07b9fabd0578ef6b5831\nparent 1bda1595899985b5bc1d1b75fbf6dbb6645490dc\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000017 +0100\n","CommitId" => "a7dcce470e3e188e596a71a3b6a7046b999571ca","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Differs" => 2}],"Tree" => "48d40863ab030873619f07b9fabd0578ef6b5831"} 508s git-debrebase get_differs f730b85f299afe1020b13e03243511c5bd8a6cbe 616d04e4126efffc468fa930bc9ff5f98c51c790 = 0x2 508s git-debrebase classify 1bda1595899985b5bc1d1b75fbf6dbb6645490dc $t=616d04e4126efffc468fa930bc9ff5f98c51c790 @p f730b85f299afe1020b13e03243511c5bd8a6cbe/0x2 508s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Differs" => 2}],"Tree" => "616d04e4126efffc468fa930bc9ff5f98c51c790","Type" => "Upstream","CommitId" => "1bda1595899985b5bc1d1b75fbf6dbb6645490dc","Hdr" => "tree 616d04e4126efffc468fa930bc9ff5f98c51c790\nparent f730b85f299afe1020b13e03243511c5bd8a6cbe\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 54841f8593cfec2b2b97883fcba32cab336ca413 = 0x30 508s git-debrebase classify f730b85f299afe1020b13e03243511c5bd8a6cbe $t=54841f8593cfec2b2b97883fcba32cab336ca413 @p 90368bf36b087c93f0dfbdb6534beaf38a8f44b6/0x30 508s git-debrebase = Packaging {"Tree" => "54841f8593cfec2b2b97883fcba32cab336ca413","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n","Parents" => [{"Ix" => 0,"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Differs" => 48}],"Type" => "Packaging","CommitId" => "f730b85f299afe1020b13e03243511c5bd8a6cbe","Hdr" => "tree 54841f8593cfec2b2b97883fcba32cab336ca413\nparent 90368bf36b087c93f0dfbdb6534beaf38a8f44b6\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n"} 508s git-debrebase get_differs a5e5523a5fe98dba70b9397fa26103193cccbabd b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x2 508s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 b9594437541a0d9cd3cf49322f146f3e573967e7 = 0x30 508s git-debrebase classify 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 $t=b9594437541a0d9cd3cf49322f146f3e573967e7 @p a5e5523a5fe98dba70b9397fa26103193cccbabd/0x2 8c5d0e0174b5de39e69e18884925db0015d27527/0x30 508s git-debrebase = Anchor {"CommitId" => "90368bf36b087c93f0dfbdb6534beaf38a8f44b6","Hdr" => "tree b9594437541a0d9cd3cf49322f146f3e573967e7\nparent a5e5523a5fe98dba70b9397fa26103193cccbabd\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000017 +0100\n","Tree" => "b9594437541a0d9cd3cf49322f146f3e573967e7","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n\n[git-debrebase anchor: convert dgit import: upstream update]\n","OrigParents" => [{"Ix" => 1,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 48}],"Parents" => [{"Differs" => 2,"CommitId" => "a5e5523a5fe98dba70b9397fa26103193cccbabd","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 508s git-debrebase *** WALK prep done cur=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 brw 0 upp 7 proc 10 pm 0 508s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 508s ' 508s ++ git rev-parse HEAD 508s + expect=22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 508s + exec 508s + local cid ctype info nparents 508s + read cid ctype info 508s + : ===== 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 Pseudomerge Contributor=84ac322ff033ab96c026918c20e3a958c6d24146 ===== 508s + test 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 = 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 508s + local cetype=Pseudomerge 508s + '[' xPseudomerge = xPseudomerge ']' 508s + cetype=SAME 508s ++ git log -n1 --pretty=format:%P 22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 508s + local 'parents=84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 508s + expect='84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 508s + enparents=1 508s + : Pseudomerge/SAME '84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 508s + case "$ctype/$cetype" in 508s + case "$ctype/$etypes" in 508s + case "$cetype" in 508s + case "$ctype" in 508s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 508s + expect=84ac322ff033ab96c026918c20e3a958c6d24146 508s + enparents=2 508s + git diff --quiet 84ac322ff033ab96c026918c20e3a958c6d24146..22c6f70652bb4af0a2f5aa85a7e37bcf5455bb51 508s + etypes=Upstream 508s + : 'reject pointless pseudomerges' 508s + local 'overwritten= cfab37c19bff9fd6c55919a11af887e45eb3af44' 508s + overwritten=cfab37c19bff9fd6c55919a11af887e45eb3af44 508s + t-git-debrebase analyse cfab37c19bff9fd6c55919a11af887e45eb3af44 508s + local gdr=git-debrebase 508s + : ' 508s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 508s + git-debrebase --dgit=dgit -D analyse cfab37c19bff9fd6c55919a11af887e45eb3af44 509s git-debrebase *** WALK cfab37c19bff9fd6c55919a11af887e45eb3af44 1 *main::STDOUT 509s git-debrebase get_differs 4b8c76d051e32cfd5c0f423504742148ed9e07a4 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x36 509s git-debrebase get_differs a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0 509s git-debrebase classify cfab37c19bff9fd6c55919a11af887e45eb3af44 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 4b8c76d051e32cfd5c0f423504742148ed9e07a4/0x36 a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7/0 509s git-debrebase = Pseudomerge {"Msg" => "Record example (2.1-0+nmu1) in archive suite sid\n","CommitId" => "cfab37c19bff9fd6c55919a11af887e45eb3af44","Contributor" => {"Differs" => 0,"Ix" => 1,"CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7"},"Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Type" => "Pseudomerge","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 4b8c76d051e32cfd5c0f423504742148ed9e07a4\nparent a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Overwritten" => [{"Differs" => 54,"Ix" => 0,"CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4"}],"Parents" => [$VAR1->{"Overwritten"}[0],$VAR1->{"Contributor"}]} 509s git-debrebase get_differs 81d8596985612b198bef8077a81b9f493a86bd17 fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 = 0x2 509s git-debrebase classify a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 $t=fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6 @p 81d8596985612b198bef8077a81b9f493a86bd17/0x2 509s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Ix" => 0}],"Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch1","CommitId" => "a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7","Tree" => "fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6","Hdr" => "tree fc93959e847b0ac54ff0d1ecc4e5b485b55d76c6\nparent 81d8596985612b198bef8077a81b9f493a86bd17\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Type" => "Upstream"} 509s git-debrebase get_differs 9030a2f23038d2f402171d4ce0b637846272eabf 2b5743524074b13f18388c85f0ab3a4675727f25 = 0x2 509s git-debrebase classify 81d8596985612b198bef8077a81b9f493a86bd17 $t=2b5743524074b13f18388c85f0ab3a4675727f25 @p 9030a2f23038d2f402171d4ce0b637846272eabf/0x2 509s git-debrebase = Upstream {"Hdr" => "tree 2b5743524074b13f18388c85f0ab3a4675727f25\nparent 9030a2f23038d2f402171d4ce0b637846272eabf\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000014 +0000\n","Type" => "Upstream","Tree" => "2b5743524074b13f18388c85f0ab3a4675727f25","CommitId" => "81d8596985612b198bef8077a81b9f493a86bd17","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch1","Parents" => [{"CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Ix" => 0,"Differs" => 2}]} 509s git-debrebase get_differs 90bfe62f6454203b392beea73d3366747a145432 e3680aec0b2b043eb1fc1bb33973bdece72374b5 = 0x2 509s git-debrebase classify 9030a2f23038d2f402171d4ce0b637846272eabf $t=e3680aec0b2b043eb1fc1bb33973bdece72374b5 @p 90bfe62f6454203b392beea73d3366747a145432/0x2 509s git-debrebase = Upstream {"Hdr" => "tree e3680aec0b2b043eb1fc1bb33973bdece72374b5\nparent 90bfe62f6454203b392beea73d3366747a145432\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","Type" => "Upstream","Tree" => "e3680aec0b2b043eb1fc1bb33973bdece72374b5","CommitId" => "9030a2f23038d2f402171d4ce0b637846272eabf","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"Differs" => 2,"CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Ix" => 0}]} 509s git-debrebase get_differs 1d3db2255664fa14deafceb28bea050df8f692f5 dd5fa39e05cd2d16628cd518828b599193709422 = 0x2 509s git-debrebase classify 90bfe62f6454203b392beea73d3366747a145432 $t=dd5fa39e05cd2d16628cd518828b599193709422 @p 1d3db2255664fa14deafceb28bea050df8f692f5/0x2 509s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree dd5fa39e05cd2d16628cd518828b599193709422\nparent 1d3db2255664fa14deafceb28bea050df8f692f5\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000014 +0000\n","CommitId" => "90bfe62f6454203b392beea73d3366747a145432","Tree" => "dd5fa39e05cd2d16628cd518828b599193709422","Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Parents" => [{"Differs" => 2,"CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5","Ix" => 0}]} 509s git-debrebase get_differs 5dd6a6e50a46e433773f5d68475b27acda36bd78 64dbf9bd449b82949cb964daf820d7d9c12ddc1b = 0x2 509s git-debrebase classify 1d3db2255664fa14deafceb28bea050df8f692f5 $t=64dbf9bd449b82949cb964daf820d7d9c12ddc1b @p 5dd6a6e50a46e433773f5d68475b27acda36bd78/0x2 509s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree 64dbf9bd449b82949cb964daf820d7d9c12ddc1b\nparent 5dd6a6e50a46e433773f5d68475b27acda36bd78\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "64dbf9bd449b82949cb964daf820d7d9c12ddc1b","CommitId" => "1d3db2255664fa14deafceb28bea050df8f692f5","Parents" => [{"Differs" => 2,"CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Ix" => 0}]} 509s git-debrebase get_differs 439d330e0a4b3e4941acdbce4cda9605ea1c993e 50ecbd6a17951348a127992f7a6688a3f830177b = 0x2 509s git-debrebase classify 5dd6a6e50a46e433773f5d68475b27acda36bd78 $t=50ecbd6a17951348a127992f7a6688a3f830177b @p 439d330e0a4b3e4941acdbce4cda9605ea1c993e/0x2 509s git-debrebase = Upstream {"Parents" => [{"CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 50ecbd6a17951348a127992f7a6688a3f830177b\nparent 439d330e0a4b3e4941acdbce4cda9605ea1c993e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000014 +0000\n","CommitId" => "5dd6a6e50a46e433773f5d68475b27acda36bd78","Tree" => "50ecbd6a17951348a127992f7a6688a3f830177b"} 509s git-debrebase get_differs 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce 1532541e2f6366582d6b27d965181748e3f8904a = 0x2 509s git-debrebase classify 439d330e0a4b3e4941acdbce4cda9605ea1c993e $t=1532541e2f6366582d6b27d965181748e3f8904a @p 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce/0x2 509s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","Differs" => 2}],"Hdr" => "tree 1532541e2f6366582d6b27d965181748e3f8904a\nparent 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000014 +0000\n","Type" => "Upstream","CommitId" => "439d330e0a4b3e4941acdbce4cda9605ea1c993e","Tree" => "1532541e2f6366582d6b27d965181748e3f8904a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 509s git-debrebase get_differs 8c5d0e0174b5de39e69e18884925db0015d27527 648a3758d9b667d29500784c4b37ed8354be0810 = 0x34 509s git-debrebase get_differs d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81 648a3758d9b667d29500784c4b37ed8354be0810 = 0x36 509s git-debrebase classify 3840466cb74b8a6a4ed3ec06a72e03175d74a9ce $t=648a3758d9b667d29500784c4b37ed8354be0810 @p 8c5d0e0174b5de39e69e18884925db0015d27527/0x34 d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81/0x36 509s git-debrebase = DgitImportUnpatched {"Type" => "DgitImportUnpatched","OrigParents" => [{"IsDgitImport" => "orig","Ix" => 0,"CommitId" => "8c5d0e0174b5de39e69e18884925db0015d27527","Differs" => 52,"IsOrigin" => 1}],"Hdr" => "tree 648a3758d9b667d29500784c4b37ed8354be0810\nparent 8c5d0e0174b5de39e69e18884925db0015d27527\nparent d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81\nauthor dgit test git user 1530000014 +0000\ncommitter dgit test git user 1530000014 +0000\n","Tree" => "648a3758d9b667d29500784c4b37ed8354be0810","CommitId" => "3840466cb74b8a6a4ed3ec06a72e03175d74a9ce","NewMsg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[was: dgit import unpatched example 2.1-0+nmu1]\n","Msg" => "example (2.1-0+nmu1) unstable; urgency=medium\n\n * new upstream 2.1-0+nmu1\n * nmu nmu2 2.1-0+nmu1\n\n[dgit import unpatched example 2.1-0+nmu1]\n","Parents" => [$VAR1->{"OrigParents"}[0],{"Differs" => 54,"IsOrigin" => 1,"IsDgitImport" => "tarball","Ix" => 1,"CommitId" => "d0437dfefb7a0bfb14385790c8f9e7b79c3a7c81"}]} 509s git-debrebase get_differs 64bcb7d55956b0e3ebe624bf9040a976b183e414 3646aeb322533be919f218f7670519af795187ec = 0x4 509s git-debrebase classify 4b8c76d051e32cfd5c0f423504742148ed9e07a4 $t=3646aeb322533be919f218f7670519af795187ec @p 64bcb7d55956b0e3ebe624bf9040a976b183e414/0x4 509s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "3646aeb322533be919f218f7670519af795187ec","CommitId" => "4b8c76d051e32cfd5c0f423504742148ed9e07a4","Hdr" => "tree 3646aeb322533be919f218f7670519af795187ec\nparent 64bcb7d55956b0e3ebe624bf9040a976b183e414\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Ix" => 0}]} 509s git-debrebase get_differs 95f78a1ec281f58eba538b9baef816d74e131c60 588d548f5ba959c551704087c40f106f9f6369af = 0x10 509s git-debrebase classify 64bcb7d55956b0e3ebe624bf9040a976b183e414 $t=588d548f5ba959c551704087c40f106f9f6369af @p 95f78a1ec281f58eba538b9baef816d74e131c60/0x10 509s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "64bcb7d55956b0e3ebe624bf9040a976b183e414","Tree" => "588d548f5ba959c551704087c40f106f9f6369af","Hdr" => "tree 588d548f5ba959c551704087c40f106f9f6369af\nparent 95f78a1ec281f58eba538b9baef816d74e131c60\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Ix" => 0,"Differs" => 16}]} 509s git-debrebase get_differs a0e76af573321d5714d63cd5c464d783da6b72b4 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f = 0x10 509s git-debrebase classify 95f78a1ec281f58eba538b9baef816d74e131c60 $t=7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f @p a0e76af573321d5714d63cd5c464d783da6b72b4/0x10 509s git-debrebase = Changelog {"Tree" => "7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f","CommitId" => "95f78a1ec281f58eba538b9baef816d74e131c60","Type" => "Changelog","Hdr" => "tree 7bc66d65d9d8ddfa1bd07b8ec13b3e5dfdd2463f\nparent a0e76af573321d5714d63cd5c464d783da6b72b4\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "dch -v 2.0-3 -m incorporate nmu\n","Parents" => [{"Differs" => 16,"CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Ix" => 0}]} 509s git-debrebase get_differs 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0 509s git-debrebase get_differs 1c8e3b534eac1867c8911d4e5f923d5f7bcee275 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x8 509s git-debrebase classify a0e76af573321d5714d63cd5c464d783da6b72b4 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5/0 1c8e3b534eac1867c8911d4e5f923d5f7bcee275/0x8 509s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "1c8e3b534eac1867c8911d4e5f923d5f7bcee275","Differs" => 8}],"Parents" => [{"CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","CommitId" => "a0e76af573321d5714d63cd5c464d783da6b72b4","Contributor" => $VAR1->{"Parents"}[0],"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","Type" => "Pseudomerge","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5\nparent 1c8e3b534eac1867c8911d4e5f923d5f7bcee275\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 509s git-debrebase get_differs 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a 11675dd1dd76e15eb5768a1ed166754f8b001efe = 0x2 509s git-debrebase classify 3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5 $t=11675dd1dd76e15eb5768a1ed166754f8b001efe @p 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a/0x2 509s git-debrebase = Upstream {"Tree" => "11675dd1dd76e15eb5768a1ed166754f8b001efe","CommitId" => "3acc19b07f40d5caaf9d9e01fff28faa2a0ac1e5","Hdr" => "tree 11675dd1dd76e15eb5768a1ed166754f8b001efe\nparent 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() ()\n\n\nGbp-Pq: Name mixed-add-both-.patch","Parents" => [{"CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Ix" => 0,"Differs" => 2}]} 509s git-debrebase get_differs 677859b96829ce23dbcd8a3baa95a2353bc42da2 1dd4e4d58336418c54db7d14400a68dd3847610b = 0x2 509s git-debrebase classify 61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a $t=1dd4e4d58336418c54db7d14400a68dd3847610b @p 677859b96829ce23dbcd8a3baa95a2353bc42da2/0x2 509s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"}],"Msg" => "UPSTREAM edit src.c ()\n\n\nGbp-Pq: Name upstream-edit-src.c-.patch","Hdr" => "tree 1dd4e4d58336418c54db7d14400a68dd3847610b\nparent 677859b96829ce23dbcd8a3baa95a2353bc42da2\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","CommitId" => "61c3347c5ede40de68ef4c13e7ce7e5b3ab97d1a","Tree" => "1dd4e4d58336418c54db7d14400a68dd3847610b"} 509s git-debrebase get_differs f9ddccb3801445213b338eaa4f0d5881a35a84dc e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 = 0x2 509s git-debrebase classify 677859b96829ce23dbcd8a3baa95a2353bc42da2 $t=e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943 @p f9ddccb3801445213b338eaa4f0d5881a35a84dc/0x2 509s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943\nparent f9ddccb3801445213b338eaa4f0d5881a35a84dc\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "e419a1bd8f6cd6a2a29c0372d9d63eb6e1c22943","CommitId" => "677859b96829ce23dbcd8a3baa95a2353bc42da2"} 509s git-debrebase get_differs 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 ef84c3a3e09a19163fa9c6d06f17b67742dc2083 = 0x2 509s git-debrebase classify f9ddccb3801445213b338eaa4f0d5881a35a84dc $t=ef84c3a3e09a19163fa9c6d06f17b67742dc2083 @p 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830/0x2 509s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree ef84c3a3e09a19163fa9c6d06f17b67742dc2083\nparent 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "f9ddccb3801445213b338eaa4f0d5881a35a84dc","Tree" => "ef84c3a3e09a19163fa9c6d06f17b67742dc2083","Parents" => [{"CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Ix" => 0,"Differs" => 2}]} 509s git-debrebase get_differs e4eca65c490ba804c753f8fc1ef367ba07d51c08 f7ddb6858bdc3032bc6302a74ee93d43d92dae5c = 0x2 509s git-debrebase classify 97acb7f0bf74cb2d9f272d96eaf8dd68755c1830 $t=f7ddb6858bdc3032bc6302a74ee93d43d92dae5c @p e4eca65c490ba804c753f8fc1ef367ba07d51c08/0x2 509s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08"}],"Tree" => "f7ddb6858bdc3032bc6302a74ee93d43d92dae5c","CommitId" => "97acb7f0bf74cb2d9f272d96eaf8dd68755c1830","Hdr" => "tree f7ddb6858bdc3032bc6302a74ee93d43d92dae5c\nparent e4eca65c490ba804c753f8fc1ef367ba07d51c08\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 509s git-debrebase get_differs 8397762c3c6a31b895366f874e97ed0805b1939e 78cf67faf6512a51d8c626099f80d6b3007fd3c5 = 0x30 509s git-debrebase classify e4eca65c490ba804c753f8fc1ef367ba07d51c08 $t=78cf67faf6512a51d8c626099f80d6b3007fd3c5 @p 8397762c3c6a31b895366f874e97ed0805b1939e/0x30 509s git-debrebase = Packaging {"Parents" => [{"Differs" => 48,"Ix" => 0,"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e"}],"Type" => "Packaging","Hdr" => "tree 78cf67faf6512a51d8c626099f80d6b3007fd3c5\nparent 8397762c3c6a31b895366f874e97ed0805b1939e\nauthor dgit test git user 1530000006 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "78cf67faf6512a51d8c626099f80d6b3007fd3c5","CommitId" => "e4eca65c490ba804c753f8fc1ef367ba07d51c08","Msg" => "example (2.0-2+nmu1) unstable; urgency=medium\n\n * nmu nmu 2.0-2+nmu1\n\n[dgit import unpatched example 2.0-2+nmu1]\n\n[git-debrebase convert dgit import: debian changes]\n"} 509s git-debrebase get_differs d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 509s git-debrebase classify 8397762c3c6a31b895366f874e97ed0805b1939e $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p d640e62b152fddf68faaa04c9d3ca9ab8f417ca3/0x10 509s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Differs" => 16}],"CommitId" => "8397762c3c6a31b895366f874e97ed0805b1939e","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent d640e62b152fddf68faaa04c9d3ca9ab8f417ca3\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 509s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 509s git-debrebase classify d640e62b152fddf68faaa04c9d3ca9ab8f417ca3 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 509s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","CommitId" => "d640e62b152fddf68faaa04c9d3ca9ab8f417ca3","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 509s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 509s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 509s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 509s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 509s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 14 proc 25 pm 1 509s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 509s ' 509s + local ocid otype oinfo 509s + read ocid otype oinfo 509s + case "$otype" in 509s + test xContributor=84ac322ff033ab96c026918c20e3a958c6d24146 '!=' xContributor=a48e9bbfd5ed8efa3b3f717f57a96b99ed0a3cf7 509s ++ printf %s '84ac322ff033ab96c026918c20e3a958c6d24146 cfab37c19bff9fd6c55919a11af887e45eb3af44' 509s ++ wc -w 509s + local cnparents=2 509s + test 2 = 2 509s ++ for f in $parents 509s ++ echo 84ac322ff033ab96c026918c20e3a958c6d24146 509s ++ for f in $parents 509s ++ echo cfab37c19bff9fd6c55919a11af887e45eb3af44 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=2 509s + test 2 = 2 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 84ac322ff033ab96c026918c20e3a958c6d24146 Upstream ===== 509s + test 84ac322ff033ab96c026918c20e3a958c6d24146 = 84ac322ff033ab96c026918c20e3a958c6d24146 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P 84ac322ff033ab96c026918c20e3a958c6d24146 509s + local parents=28033291551e80f8f5e16a90271754ad87575e3f 509s + expect=28033291551e80f8f5e16a90271754ad87575e3f 509s + enparents=1 509s + : Upstream/SAME 28033291551e80f8f5e16a90271754ad87575e3f 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s 28033291551e80f8f5e16a90271754ad87575e3f 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo 28033291551e80f8f5e16a90271754ad87575e3f 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 28033291551e80f8f5e16a90271754ad87575e3f Upstream ===== 509s + test 28033291551e80f8f5e16a90271754ad87575e3f = 28033291551e80f8f5e16a90271754ad87575e3f 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P 28033291551e80f8f5e16a90271754ad87575e3f 509s + local parents=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s + expect=8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s + enparents=1 509s + : Upstream/SAME 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 Upstream ===== 509s + test 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 = 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P 8fc2dd44802dbfbda6714a8300c0f2ffd035c547 509s + local parents=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s + expect=efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s + enparents=1 509s + : Upstream/SAME efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a Upstream ===== 509s + test efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a = efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P efe4d1fcdfec0eab1818acdb06736d80f9ba4d7a 509s + local parents=1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s + expect=1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s + enparents=1 509s + : Upstream/SAME 1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s 1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo 1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 1ca66fb225fad62360bdceb664ba6d30edd5a9db Upstream ===== 509s + test 1ca66fb225fad62360bdceb664ba6d30edd5a9db = 1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P 1ca66fb225fad62360bdceb664ba6d30edd5a9db 509s + local parents=a7dcce470e3e188e596a71a3b6a7046b999571ca 509s + expect=a7dcce470e3e188e596a71a3b6a7046b999571ca 509s + enparents=1 509s + : Upstream/SAME a7dcce470e3e188e596a71a3b6a7046b999571ca 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s a7dcce470e3e188e596a71a3b6a7046b999571ca 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo a7dcce470e3e188e596a71a3b6a7046b999571ca 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== a7dcce470e3e188e596a71a3b6a7046b999571ca Upstream ===== 509s + test a7dcce470e3e188e596a71a3b6a7046b999571ca = a7dcce470e3e188e596a71a3b6a7046b999571ca 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P a7dcce470e3e188e596a71a3b6a7046b999571ca 509s + local parents=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s + expect=1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s + enparents=1 509s + : Upstream/SAME 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s ++ t-sort -u 509s ++ wc -w 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 1bda1595899985b5bc1d1b75fbf6dbb6645490dc Upstream ===== 509s + test 1bda1595899985b5bc1d1b75fbf6dbb6645490dc = 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s + local cetype=Upstream 509s + '[' xUpstream = xUpstream ']' 509s + cetype=SAME 509s ++ git log -n1 --pretty=format:%P 1bda1595899985b5bc1d1b75fbf6dbb6645490dc 509s + local parents=f730b85f299afe1020b13e03243511c5bd8a6cbe 509s + expect=f730b85f299afe1020b13e03243511c5bd8a6cbe 509s + enparents=1 509s + : Upstream/SAME f730b85f299afe1020b13e03243511c5bd8a6cbe 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s ++ printf %s f730b85f299afe1020b13e03243511c5bd8a6cbe 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo f730b85f299afe1020b13e03243511c5bd8a6cbe 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== f730b85f299afe1020b13e03243511c5bd8a6cbe Packaging ===== 509s + test f730b85f299afe1020b13e03243511c5bd8a6cbe = f730b85f299afe1020b13e03243511c5bd8a6cbe 509s + local cetype=Upstream 509s + '[' xPackaging = xUpstream ']' 509s ++ git log -n1 --pretty=format:%P f730b85f299afe1020b13e03243511c5bd8a6cbe 509s + local parents=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s + expect=90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s + enparents=1 509s + : Packaging/Upstream 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + '[' x '!=' x ']' 509s + case "$cetype" in 509s + case "$ctype" in 509s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :. ':!debian' 509s + git diff --quiet 90368bf36b087c93f0dfbdb6534beaf38a8f44b6..f730b85f299afe1020b13e03243511c5bd8a6cbe -- :debian/patches 509s + etypes=Packaging 509s ++ printf %s 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s ++ wc -w 509s + local cnparents=1 509s + test 1 = 1 509s ++ for f in $parents 509s ++ echo 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s ++ wc -w 509s ++ t-sort -u 509s ++ LC_COLLATE=C 509s ++ sort -u 509s + local cndparents=1 509s + test 1 = 1 509s + case "$parents" in 509s + case "$ctype" in 509s + read cid ctype info 509s + : ===== 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 Anchor ===== 509s + test 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 = 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s + local cetype=Packaging 509s + '[' xAnchor = xPackaging ']' 509s ++ git log -n1 --pretty=format:%P 90368bf36b087c93f0dfbdb6534beaf38a8f44b6 509s + local 'parents=a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 509s + expect='a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 509s + enparents=1 509s + : Anchor/Packaging 'a5e5523a5fe98dba70b9397fa26103193cccbabd 8c5d0e0174b5de39e69e18884925db0015d27527' 509s + case "$ctype/$cetype" in 509s + case "$ctype/$etypes" in 509s + case "$cetype" in 509s + case "$ctype" in 509s + break 509s + t-ok 509s + : ======================================== 509s + t-check-only-bpd 509s + '[' .. = .. ']' 509s + return 509s + t-fscks 509s + shopt -s nullglob 509s + for d in $tmp/*/.git $tmp/git/*.git 509s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 509s + t-git-fsck 509s ++ git rev-parse --git-dir 509s + local fsckerrs=.git/dgit-test-fsck.errs 509s + set +e 509s + LC_MESSAGES=C 509s + git fsck --no-dangling --strict 509s + tee .git/dgit-test-fsck.errs 509s + ps='0 0' 509s + set -e 509s + local pats 509s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 509s + test '0 0' = '0 0' 509s + pats+=(-e 'notice: HEAD points to an unborn branch') 509s + pats+=(-e 'notice: No default references') 509s + set +e 509s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 509s + rc=1 509s + set -e 509s + case $rc in 509s + for d in $tmp/*/.git $tmp/git/*.git 509s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 509s + t-git-fsck 509s ++ git rev-parse --git-dir 509s + local fsckerrs=./dgit-test-fsck.errs 509s + set +e 509s + LC_MESSAGES=C 509s + git fsck --no-dangling --strict 509s + tee ./dgit-test-fsck.errs 509s notice: HEAD points to an unborn branch (master) 509s + ps='0 0' 509s + set -e 509s + local pats 509s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 509s + test '0 0' = '0 0' 509s + pats+=(-e 'notice: HEAD points to an unborn branch') 509s + pats+=(-e 'notice: No default references') 509s + set +e 509s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 509s + rc=1 509s + set -e 509s + case $rc in 509s + t-save-artifacts 509s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts 509s + '[' x/tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts = x ']' 509s + '[' xtmp = x ']' 509s + GZIP=-1v 509s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-import-dgit-artifacts/gdr-import-dgit.tar.gz '--exclude=*.tar' . 509s gzip: warning: GZIP environment variable is deprecated; use an alias or script 509s 79.5% 509s + echo ok. 509s ok. 509s + rc=0 509s + set +x 509s + set +e 509s + pwd 509s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 509s + '[' x '!=' x ']' 509s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 509s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 509s + set -e 509s + test 0 = 0 509s /tmp/autopkgtest.ztMUxl/wrapper.sh: Killing leaked background processes: 17405 509s PID TTY STAT TIME COMMAND 509s 17405 ? S 0:00 /usr/bin/perl -w /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/http-static-server /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 509s autopkgtest [12:26:43]: test gdr-import-dgit: -----------------------] 509s gdr-import-dgit PASS 509s autopkgtest [12:26:43]: test gdr-import-dgit: - - - - - - - - - - results - - - - - - - - - - 509s autopkgtest [12:26:43]: test gdr-merge-conflicts: preparing testbed 570s autopkgtest [12:27:44]: testbed dpkg architecture: amd64 570s autopkgtest [12:27:44]: testbed apt version: 2.4.13 570s autopkgtest [12:27:44]: @@@@@@@@@@@@@@@@@@@@ test bed setup 570s autopkgtest [12:27:44]: testbed release detected to be: jammy 571s autopkgtest [12:27:45]: updating testbed package index (apt update) 571s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 571s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 571s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 571s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 571s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 571s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 571s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 571s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 571s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 571s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 571s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 571s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 571s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 571s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 571s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 571s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 571s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 574s Fetched 1719 kB in 1s (3208 kB/s) 575s Reading package lists... 576s autopkgtest [12:27:50]: upgrading testbed (apt dist-upgrade and autopurge) 576s Reading package lists... 576s Building dependency tree... 576s Reading state information... 577s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 577s Starting 2 pkgProblemResolver with broken count: 0 577s Done 577s Entering ResolveByKeep 577s 578s The following packages will be upgraded: 578s apt apt-utils libapt-pkg6.0 578s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 578s Need to get 2486 kB of archives. 578s After this operation, 0 B of additional disk space will be used. 578s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 578s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 578s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 578s Fetched 2486 kB in 0s (49.1 MB/s) 578s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 578s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 578s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 578s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 578s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 578s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 578s Unpacking apt (2.4.14) over (2.4.13) ... 578s Setting up apt (2.4.14) ... 579s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 579s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 579s Unpacking apt-utils (2.4.14) over (2.4.13) ... 579s Setting up apt-utils (2.4.14) ... 579s Processing triggers for man-db (2.10.2-1) ... 579s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 581s Reading package lists... 581s Building dependency tree... 581s Reading state information... 581s Starting pkgProblemResolver with broken count: 0 581s Starting 2 pkgProblemResolver with broken count: 0 581s Done 582s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 582s autopkgtest [12:27:56]: rebooting testbed after setup commands that affected boot 595s Reading package lists... 595s Building dependency tree... 595s Reading state information... 595s Starting pkgProblemResolver with broken count: 0 595s Starting 2 pkgProblemResolver with broken count: 0 595s Done 596s The following NEW packages will be installed: 596s chiark-utils-bin devscripts diffstat fakeroot faketime gettext git 596s git-buildpackage git-debrebase git-man libb-hooks-op-check-perl 596s libclass-method-modifiers-perl libclass-xsaccessor-perl 596s libdevel-callchecker-perl libdynaloader-functions-perl libencode-locale-perl 596s liberror-perl libfakeroot libfaketime libfile-dirlist-perl 596s libfile-fnmatch-perl libfile-homedir-perl libfile-listing-perl 596s libfile-touch-perl libfile-which-perl libgomp1 libhtml-parser-perl 596s libhtml-tagset-perl libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 596s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 596s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 596s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 596s libmoo-perl libnet-http-perl libnet-ssleay-perl libparams-classify-perl 596s librole-tiny-perl libsub-quote-perl libtimedate-perl libtry-tiny-perl 596s liburi-perl libwww-perl libwww-robotrules-perl patchutils 596s perl-openssl-defaults python3-dateutil quilt wdiff 596s 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded. 596s Need to get 9521 kB of archives. 596s After this operation, 39.2 MB of additional disk space will be used. 596s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 596s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 596s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 596s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 596s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 596s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 596s Get:7 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 596s Get:8 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 596s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 596s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 596s Get:11 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 596s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 596s Get:13 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 596s Get:14 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 596s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 596s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 596s Get:17 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 596s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 596s Get:19 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 596s Get:20 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 596s Get:21 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 596s Get:22 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 596s Get:23 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 596s Get:24 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 596s Get:25 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 596s Get:26 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 596s Get:27 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 596s Get:28 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 596s Get:29 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 596s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 596s Get:31 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 596s Get:32 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 596s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 596s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 596s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 596s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 596s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 596s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 596s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 596s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 596s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 596s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 596s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 596s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 diffstat amd64 1.64-1build2 [29.2 kB] 596s Get:45 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 596s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 596s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 596s Get:48 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 596s Get:49 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 596s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 596s Get:51 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 596s Get:52 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-fnmatch-perl amd64 0.02-2build8 [10.5 kB] 596s Get:53 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-debrebase all 9.15 [67.5 kB] 596s Get:54 http://ftpmaster.internal/ubuntu jammy/universe amd64 quilt all 0.66-2.1 [304 kB] 596s Get:55 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 596s Get:56 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 596s Get:57 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 596s Fetched 9521 kB in 0s (48.5 MB/s) 596s Selecting previously unselected package libfakeroot:amd64. 596s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 596s Preparing to unpack .../00-libfakeroot_1.28-1ubuntu1_amd64.deb ... 596s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 596s Selecting previously unselected package fakeroot. 596s Preparing to unpack .../01-fakeroot_1.28-1ubuntu1_amd64.deb ... 596s Unpacking fakeroot (1.28-1ubuntu1) ... 596s Selecting previously unselected package libfile-dirlist-perl. 596s Preparing to unpack .../02-libfile-dirlist-perl_0.05-2_all.deb ... 596s Unpacking libfile-dirlist-perl (0.05-2) ... 596s Selecting previously unselected package libfile-which-perl. 596s Preparing to unpack .../03-libfile-which-perl_1.23-1_all.deb ... 596s Unpacking libfile-which-perl (1.23-1) ... 597s Selecting previously unselected package libfile-homedir-perl. 597s Preparing to unpack .../04-libfile-homedir-perl_1.006-1_all.deb ... 597s Unpacking libfile-homedir-perl (1.006-1) ... 597s Selecting previously unselected package libfile-touch-perl. 597s Preparing to unpack .../05-libfile-touch-perl_0.12-1_all.deb ... 597s Unpacking libfile-touch-perl (0.12-1) ... 597s Selecting previously unselected package libio-pty-perl. 597s Preparing to unpack .../06-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 597s Unpacking libio-pty-perl (1:1.15-2build2) ... 597s Selecting previously unselected package libipc-run-perl. 597s Preparing to unpack .../07-libipc-run-perl_20200505.0-1_all.deb ... 597s Unpacking libipc-run-perl (20200505.0-1) ... 597s Selecting previously unselected package libclass-method-modifiers-perl. 597s Preparing to unpack .../08-libclass-method-modifiers-perl_2.13-1_all.deb ... 597s Unpacking libclass-method-modifiers-perl (2.13-1) ... 597s Selecting previously unselected package libclass-xsaccessor-perl. 597s Preparing to unpack .../09-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 597s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 597s Selecting previously unselected package libb-hooks-op-check-perl. 597s Preparing to unpack .../10-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 597s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 597s Selecting previously unselected package libdynaloader-functions-perl. 597s Preparing to unpack .../11-libdynaloader-functions-perl_0.003-1.1_all.deb ... 597s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 597s Selecting previously unselected package libdevel-callchecker-perl. 597s Preparing to unpack .../12-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 597s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 597s Selecting previously unselected package libparams-classify-perl. 597s Preparing to unpack .../13-libparams-classify-perl_0.015-1build5_amd64.deb ... 597s Unpacking libparams-classify-perl (0.015-1build5) ... 597s Selecting previously unselected package libmodule-runtime-perl. 597s Preparing to unpack .../14-libmodule-runtime-perl_0.016-1_all.deb ... 597s Unpacking libmodule-runtime-perl (0.016-1) ... 597s Selecting previously unselected package libimport-into-perl. 597s Preparing to unpack .../15-libimport-into-perl_1.002005-1_all.deb ... 597s Unpacking libimport-into-perl (1.002005-1) ... 597s Selecting previously unselected package librole-tiny-perl. 597s Preparing to unpack .../16-librole-tiny-perl_2.002004-1_all.deb ... 597s Unpacking librole-tiny-perl (2.002004-1) ... 597s Selecting previously unselected package libsub-quote-perl. 597s Preparing to unpack .../17-libsub-quote-perl_2.006006-1_all.deb ... 597s Unpacking libsub-quote-perl (2.006006-1) ... 597s Selecting previously unselected package libmoo-perl. 597s Preparing to unpack .../18-libmoo-perl_2.005004-3_all.deb ... 597s Unpacking libmoo-perl (2.005004-3) ... 597s Selecting previously unselected package libencode-locale-perl. 597s Preparing to unpack .../19-libencode-locale-perl_1.05-1.1_all.deb ... 597s Unpacking libencode-locale-perl (1.05-1.1) ... 597s Selecting previously unselected package libtimedate-perl. 597s Preparing to unpack .../20-libtimedate-perl_2.3300-2_all.deb ... 597s Unpacking libtimedate-perl (2.3300-2) ... 597s Selecting previously unselected package libhttp-date-perl. 597s Preparing to unpack .../21-libhttp-date-perl_6.05-1_all.deb ... 597s Unpacking libhttp-date-perl (6.05-1) ... 597s Selecting previously unselected package libfile-listing-perl. 597s Preparing to unpack .../22-libfile-listing-perl_6.14-1_all.deb ... 597s Unpacking libfile-listing-perl (6.14-1) ... 597s Selecting previously unselected package libhtml-tagset-perl. 597s Preparing to unpack .../23-libhtml-tagset-perl_3.20-4_all.deb ... 597s Unpacking libhtml-tagset-perl (3.20-4) ... 597s Selecting previously unselected package liburi-perl. 597s Preparing to unpack .../24-liburi-perl_5.10-1_all.deb ... 597s Unpacking liburi-perl (5.10-1) ... 597s Selecting previously unselected package libhtml-parser-perl:amd64. 597s Preparing to unpack .../25-libhtml-parser-perl_3.76-1build2_amd64.deb ... 597s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 597s Selecting previously unselected package libhtml-tree-perl. 597s Preparing to unpack .../26-libhtml-tree-perl_5.07-2_all.deb ... 597s Unpacking libhtml-tree-perl (5.07-2) ... 597s Selecting previously unselected package libio-html-perl. 597s Preparing to unpack .../27-libio-html-perl_1.004-2_all.deb ... 597s Unpacking libio-html-perl (1.004-2) ... 597s Selecting previously unselected package liblwp-mediatypes-perl. 597s Preparing to unpack .../28-liblwp-mediatypes-perl_6.04-1_all.deb ... 597s Unpacking liblwp-mediatypes-perl (6.04-1) ... 597s Selecting previously unselected package libhttp-message-perl. 597s Preparing to unpack .../29-libhttp-message-perl_6.36-1_all.deb ... 597s Unpacking libhttp-message-perl (6.36-1) ... 597s Selecting previously unselected package libhttp-cookies-perl. 597s Preparing to unpack .../30-libhttp-cookies-perl_6.10-1_all.deb ... 597s Unpacking libhttp-cookies-perl (6.10-1) ... 597s Selecting previously unselected package libhttp-negotiate-perl. 597s Preparing to unpack .../31-libhttp-negotiate-perl_6.01-1_all.deb ... 597s Unpacking libhttp-negotiate-perl (6.01-1) ... 597s Selecting previously unselected package perl-openssl-defaults:amd64. 597s Preparing to unpack .../32-perl-openssl-defaults_5build2_amd64.deb ... 597s Unpacking perl-openssl-defaults:amd64 (5build2) ... 597s Selecting previously unselected package libnet-ssleay-perl:amd64. 597s Preparing to unpack .../33-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 597s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 597s Selecting previously unselected package libio-socket-ssl-perl. 597s Preparing to unpack .../34-libio-socket-ssl-perl_2.074-2_all.deb ... 597s Unpacking libio-socket-ssl-perl (2.074-2) ... 597s Selecting previously unselected package libnet-http-perl. 597s Preparing to unpack .../35-libnet-http-perl_6.22-1_all.deb ... 597s Unpacking libnet-http-perl (6.22-1) ... 597s Selecting previously unselected package liblwp-protocol-https-perl. 597s Preparing to unpack .../36-liblwp-protocol-https-perl_6.10-1_all.deb ... 597s Unpacking liblwp-protocol-https-perl (6.10-1) ... 597s Selecting previously unselected package libtry-tiny-perl. 597s Preparing to unpack .../37-libtry-tiny-perl_0.31-1_all.deb ... 597s Unpacking libtry-tiny-perl (0.31-1) ... 597s Selecting previously unselected package libwww-robotrules-perl. 597s Preparing to unpack .../38-libwww-robotrules-perl_6.02-1_all.deb ... 597s Unpacking libwww-robotrules-perl (6.02-1) ... 597s Selecting previously unselected package libwww-perl. 597s Preparing to unpack .../39-libwww-perl_6.61-1_all.deb ... 597s Unpacking libwww-perl (6.61-1) ... 597s Selecting previously unselected package patchutils. 597s Preparing to unpack .../40-patchutils_0.4.2-1build2_amd64.deb ... 597s Unpacking patchutils (0.4.2-1build2) ... 597s Selecting previously unselected package wdiff. 597s Preparing to unpack .../41-wdiff_1.2.2-2build3_amd64.deb ... 597s Unpacking wdiff (1.2.2-2build3) ... 597s Selecting previously unselected package devscripts. 597s Preparing to unpack .../42-devscripts_2.22.1ubuntu1_amd64.deb ... 597s Unpacking devscripts (2.22.1ubuntu1) ... 597s Selecting previously unselected package diffstat. 597s Preparing to unpack .../43-diffstat_1.64-1build2_amd64.deb ... 597s Unpacking diffstat (1.64-1build2) ... 597s Selecting previously unselected package libgomp1:amd64. 597s Preparing to unpack .../44-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 597s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 597s Selecting previously unselected package gettext. 597s Preparing to unpack .../45-gettext_0.21-4ubuntu4_amd64.deb ... 597s Unpacking gettext (0.21-4ubuntu4) ... 597s Selecting previously unselected package liberror-perl. 597s Preparing to unpack .../46-liberror-perl_0.17029-1_all.deb ... 597s Unpacking liberror-perl (0.17029-1) ... 597s Selecting previously unselected package git-man. 597s Preparing to unpack .../47-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 597s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 597s Selecting previously unselected package git. 597s Preparing to unpack .../48-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 597s Unpacking git (1:2.34.1-1ubuntu1.12) ... 598s Selecting previously unselected package python3-dateutil. 598s Preparing to unpack .../49-python3-dateutil_2.8.1-6_all.deb ... 598s Unpacking python3-dateutil (2.8.1-6) ... 598s Selecting previously unselected package git-buildpackage. 598s Preparing to unpack .../50-git-buildpackage_0.9.25_all.deb ... 598s Unpacking git-buildpackage (0.9.25) ... 598s Selecting previously unselected package libfile-fnmatch-perl. 598s Preparing to unpack .../51-libfile-fnmatch-perl_0.02-2build8_amd64.deb ... 598s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 598s Selecting previously unselected package git-debrebase. 598s Preparing to unpack .../52-git-debrebase_9.15_all.deb ... 598s Unpacking git-debrebase (9.15) ... 598s Selecting previously unselected package quilt. 598s Preparing to unpack .../53-quilt_0.66-2.1_all.deb ... 598s Unpacking quilt (0.66-2.1) ... 598s Selecting previously unselected package chiark-utils-bin. 598s Preparing to unpack .../54-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 598s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 598s Selecting previously unselected package libfaketime:amd64. 598s Preparing to unpack .../55-libfaketime_0.9.8-9_amd64.deb ... 598s Unpacking libfaketime:amd64 (0.9.8-9) ... 598s Selecting previously unselected package faketime. 598s Preparing to unpack .../56-faketime_0.9.8-9_amd64.deb ... 598s Unpacking faketime (0.9.8-9) ... 598s Setting up wdiff (1.2.2-2build3) ... 598s Setting up libfile-which-perl (1.23-1) ... 598s Setting up libdynaloader-functions-perl (0.003-1.1) ... 598s Setting up libclass-method-modifiers-perl (2.13-1) ... 598s Setting up libio-pty-perl (1:1.15-2build2) ... 598s Setting up libhtml-tagset-perl (3.20-4) ... 598s Setting up liblwp-mediatypes-perl (6.04-1) ... 598s Setting up libtry-tiny-perl (0.31-1) ... 598s Setting up perl-openssl-defaults:amd64 (5build2) ... 598s Setting up libencode-locale-perl (1.05-1.1) ... 598s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 598s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 598s Setting up chiark-utils-bin (6.1.2+nmu1) ... 598s Setting up fakeroot (1.28-1ubuntu1) ... 598s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 598s Setting up liberror-perl (0.17029-1) ... 598s Setting up patchutils (0.4.2-1build2) ... 598s Setting up diffstat (1.64-1build2) ... 598s Setting up libio-html-perl (1.004-2) ... 598s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 598s Setting up libipc-run-perl (20200505.0-1) ... 598s Setting up libfile-fnmatch-perl (0.02-2build8) ... 598s Setting up libtimedate-perl (2.3300-2) ... 598s Setting up librole-tiny-perl (2.002004-1) ... 598s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 598s Setting up python3-dateutil (2.8.1-6) ... 598s Setting up libsub-quote-perl (2.006006-1) ... 598s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 598s Setting up libfile-dirlist-perl (0.05-2) ... 598s Setting up libfile-homedir-perl (1.006-1) ... 598s Setting up liburi-perl (5.10-1) ... 598s Setting up libfile-touch-perl (0.12-1) ... 598s Setting up libfaketime:amd64 (0.9.8-9) ... 598s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 598s Setting up faketime (0.9.8-9) ... 598s Setting up libhttp-date-perl (6.05-1) ... 598s Setting up gettext (0.21-4ubuntu4) ... 598s Setting up libfile-listing-perl (6.14-1) ... 598s Setting up libnet-http-perl (6.22-1) ... 598s Setting up quilt (0.66-2.1) ... 598s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 598s Setting up git (1:2.34.1-1ubuntu1.12) ... 598s Setting up libwww-robotrules-perl (6.02-1) ... 598s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 598s Setting up libio-socket-ssl-perl (2.074-2) ... 598s Setting up libhttp-message-perl (6.36-1) ... 598s Setting up libhttp-negotiate-perl (6.01-1) ... 598s Setting up libhttp-cookies-perl (6.10-1) ... 598s Setting up libhtml-tree-perl (5.07-2) ... 598s Setting up libparams-classify-perl (0.015-1build5) ... 598s Setting up libmodule-runtime-perl (0.016-1) ... 598s Setting up libimport-into-perl (1.002005-1) ... 598s Setting up libmoo-perl (2.005004-3) ... 598s Setting up liblwp-protocol-https-perl (6.10-1) ... 598s Setting up libwww-perl (6.61-1) ... 598s Setting up devscripts (2.22.1ubuntu1) ... 598s Setting up git-buildpackage (0.9.25) ... 598s Setting up git-debrebase (9.15) ... 598s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 598s Processing triggers for man-db (2.10.2-1) ... 598s Processing triggers for install-info (6.8-4build1) ... 599s autopkgtest [12:28:13]: test gdr-merge-conflicts: [----------------------- 599s ++ set -o pipefail 599s ++ . tests/lib-core 599s ++ . tests/lib-restricts 599s ++ trap ' 599s rc=$? 599s set +x 599s test $rc = 0 || echo " 599s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 599s 599s Most relevant logs are just before assignment rc=$rc 599s Will now do cleanup etc. 599s " 599s set -x 599s set +e 599s pwd 599s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 599s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 599s set -e 599s test $rc = 0 || t-report-failure 599s ' EXIT 599s ++ t-filter-out-git-hyphen-dir 599s ++ local pathent 599s +++ type -p git-rev-parse 599s +++ : 599s ++ pathent= 599s ++ case "$pathent" in 599s ++ return 599s ++ t-set-intree 599s ++ '[' x = x ']' 599s ++ return 599s ++ : -D 599s ++ export DGIT_TEST_DEBUG 599s ++ : x 599s ++ export DGIT_TEST_DEBPUSH_DEBUG 599s ++ : 599s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 599s ++ GIT_COMMITTER_DATE='1530000000 +0100' 599s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 599s ++ GIT_AUTHOR_DATE='1530000000 +0100' 599s ++ export LC_CTYPE=C.UTF-8 599s ++ LC_CTYPE=C.UTF-8 599s ++ unset CDPATH 599s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 599s ++ FILTER_BRANCH_SQUELCH_WARNING=1 599s +++ pwd 599s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 599s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ testname=gdr-merge-conflicts 599s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ bpd=.. 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 599s ++ '[' x '!=' x ']' 599s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s +++ pwd 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ t-set-using-tmp 599s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ export 'DEBFULLNAME=dgit test git user' 599s ++ DEBFULLNAME='dgit test git user' 599s ++ git config --global user.email dgit-test@debian.example.net 599s ++ git config --global user.name 'dgit test git user' 599s ++ git config --global protocol.ext.allow always 599s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 599s ++ env -0 599s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 599s ++ export DEBCHANGE_VENDOR=dpkg 599s ++ DEBCHANGE_VENDOR=dpkg 599s ++ unset VISUAL 599s ++ unset GIT_EDITOR 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 599s ++ cat 599s ++ schroot=build 599s ++ : aq 599s ++ : archive/test-dummy 599s ++ : sid:unstable 599s ++ t-git-config dgit.default.old-dsc-distro test-dummy 599s ++ git config --global dgit.default.old-dsc-distro test-dummy 599s + t-dependencies NO-DGIT GDR quilt 599s + : 'Hopefully installed: NO-DGIT GDR quilt' 599s + t-tstunt-parsechangelog 599s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PATH 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PATH" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PATH="$tstunt" ;; 599s *) PATH="$tstunt:$PATH" ;; 599s esac 599s export PATH 599s ' 599s ++ case "$PATH" in 599s ++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ export PATH 599s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PERLLIB 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PERLLIB" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PERLLIB="$tstunt" ;; 599s *) PERLLIB="$tstunt:$PERLLIB" ;; 599s esac 599s export PERLLIB 599s ' 599s ++ case "$PERLLIB" in 599s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ export PERLLIB 599s + local f 599s + for f in "$@" 599s + t-tstunt--save-real dpkg-parsechangelog 599s + local f=dpkg-parsechangelog 599s + case "$f" in 599s + local rc 599s + local real 599s + set +e 599s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ type -p dpkg-parsechangelog 599s + real=/usr/bin/dpkg-parsechangelog 599s + rc=0 599s + set -e 599s + case $rc in 599s + local varname=dpkg_parsechangelog 599s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s + eval ' 599s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 599s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s ' 599s ++ : /usr/bin/dpkg-parsechangelog 599s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s + f=./dpkg-parsechangelog 599s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 599s + for f in "$@" 599s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 599s + local f=Dpkg/Changelog/Parse.pm 599s + case "$f" in 599s + return 599s + f=./Dpkg/Changelog/Parse.pm 599s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 599s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 599s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 599s + t-tstunt debchange 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PATH 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PATH" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PATH="$tstunt" ;; 599s *) PATH="$tstunt:$PATH" ;; 599s esac 599s export PATH 599s ' 599s ++ case "$PATH" in 599s ++ export PATH 599s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PERLLIB 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PERLLIB" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PERLLIB="$tstunt" ;; 599s *) PERLLIB="$tstunt:$PERLLIB" ;; 599s esac 599s export PERLLIB 599s ' 599s ++ case "$PERLLIB" in 599s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ export PERLLIB 599s + local f 599s + for f in "$@" 599s + t-tstunt--save-real debchange 599s + local f=debchange 599s + case "$f" in 599s + local rc 599s + local real 599s + set +e 599s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ type -p debchange 599s + real=/usr/bin/debchange 599s + rc=0 599s + set -e 599s + case $rc in 599s + local varname=debchange 599s + varname=DGIT_TEST_REAL_DEBCHANGE 599s + eval ' 599s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 599s export DGIT_TEST_REAL_DEBCHANGE 599s ' 599s ++ : /usr/bin/debchange 599s ++ export DGIT_TEST_REAL_DEBCHANGE 599s + f=./debchange 599s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 599s + t-setup-import gdr-convert-gbp-noarchive 599s + local setupname=gdr-convert-gbp-noarchive 599s + local setupsrc 599s + local lock 599s + '[' x = x ']' 599s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 599s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 599s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 599s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 599s cd "$1"; shift 599s setupname="$1"; shift 599s simport="$1"; shift 599s if [ -e "$simport" ]; then exit 0; fi 599s env - "$@" \ 599s "tests/setup/$setupname" 599s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gdr-convert-gbp-noarchive /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 599s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 599s + shift 599s + setupname=gdr-convert-gbp-noarchive 599s + shift 599s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 599s + shift 599s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 599s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-merge-conflicts -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-merge-conflicts' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 599s ++ set -o pipefail 599s ++ . tests/lib-core 599s ++ . tests/lib-restricts 599s ++ trap ' 599s rc=$? 599s set +x 599s test $rc = 0 || echo " 599s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 599s 599s Most relevant logs are just before assignment rc=$rc 599s Will now do cleanup etc. 599s " 599s set -x 599s set +e 599s pwd 599s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 599s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 599s set -e 599s test $rc = 0 || t-report-failure 599s ' EXIT 599s ++ t-filter-out-git-hyphen-dir 599s ++ local pathent 599s +++ type -p git-rev-parse 599s +++ : 599s ++ pathent= 599s ++ case "$pathent" in 599s ++ return 599s ++ t-set-intree 599s ++ '[' x = x ']' 599s ++ return 599s ++ : -D 599s ++ export DGIT_TEST_DEBUG 599s ++ : x 599s ++ export DGIT_TEST_DEBPUSH_DEBUG 599s ++ : 599s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 599s ++ GIT_COMMITTER_DATE='1530000000 +0100' 599s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 599s ++ GIT_AUTHOR_DATE='1530000000 +0100' 599s ++ export LC_CTYPE=C.UTF-8 599s ++ LC_CTYPE=C.UTF-8 599s ++ unset CDPATH 599s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 599s ++ FILTER_BRANCH_SQUELCH_WARNING=1 599s +++ pwd 599s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 599s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ testname=gdr-convert-gbp-noarchive 599s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ bpd=.. 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 599s ++ '[' x '!=' x ']' 599s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s +++ pwd 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ t-set-using-tmp 599s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ export 'DEBFULLNAME=dgit test git user' 599s ++ DEBFULLNAME='dgit test git user' 599s ++ git config --global user.email dgit-test@debian.example.net 599s ++ git config --global user.name 'dgit test git user' 599s ++ git config --global protocol.ext.allow always 599s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 599s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 599s ++ export DEBCHANGE_VENDOR=dpkg 599s ++ DEBCHANGE_VENDOR=dpkg 599s ++ unset VISUAL 599s ++ unset GIT_EDITOR 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 599s ++ cat 599s ++ schroot=build 599s ++ : aq 599s ++ : archive/test-dummy 599s ++ : sid:unstable 599s ++ t-git-config dgit.default.old-dsc-distro test-dummy 599s ++ git config --global dgit.default.old-dsc-distro test-dummy 599s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 599s ++ : -D 599s ++ export GDR_TEST_DEBUG 599s ++ t-tstunt debchange 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ local var=PATH 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ eval ' 599s case "$PATH" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PATH="$tstunt" ;; 599s *) PATH="$tstunt:$PATH" ;; 599s esac 599s export PATH 599s ' 599s +++ case "$PATH" in 599s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ export PATH 599s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ local var=PERLLIB 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ eval ' 599s case "$PERLLIB" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PERLLIB="$tstunt" ;; 599s *) PERLLIB="$tstunt:$PERLLIB" ;; 599s esac 599s export PERLLIB 599s ' 599s +++ case "$PERLLIB" in 599s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s +++ export PERLLIB 599s ++ local f 599s ++ for f in "$@" 599s ++ t-tstunt--save-real debchange 599s ++ local f=debchange 599s ++ case "$f" in 599s ++ local rc 599s ++ local real 599s ++ set +e 599s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ type -p debchange 599s ++ real=/usr/bin/debchange 599s ++ rc=0 599s ++ set -e 599s ++ case $rc in 599s ++ local varname=debchange 599s ++ varname=DGIT_TEST_REAL_DEBCHANGE 599s ++ eval ' 599s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 599s export DGIT_TEST_REAL_DEBCHANGE 599s ' 599s +++ : /usr/bin/debchange 599s +++ export DGIT_TEST_REAL_DEBCHANGE 599s ++ f=./debchange 599s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 599s + t-dependencies GDR 599s + : 'Hopefully installed: GDR' 599s + export ifarchive=: 599s + ifarchive=: 599s + t-chain-test gdr-convert-gbp 599s + t-chain-test-somehow 599s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 599s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 599s + export DGIT_TEST_TMPBASE= 599s + DGIT_TEST_TMPBASE= 599s + export ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s + ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s + local ct=gdr-convert-gbp 599s + local d=tests/setup 599s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 599s + exec tests/setup/gdr-convert-gbp 599s ++ set -o pipefail 599s ++ . tests/lib-core 599s ++ . tests/lib-restricts 599s ++ trap ' 599s rc=$? 599s set +x 599s test $rc = 0 || echo " 599s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 599s 599s Most relevant logs are just before assignment rc=$rc 599s Will now do cleanup etc. 599s " 599s set -x 599s set +e 599s pwd 599s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 599s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 599s set -e 599s test $rc = 0 || t-report-failure 599s ' EXIT 599s ++ t-filter-out-git-hyphen-dir 599s ++ local pathent 599s +++ type -p git-rev-parse 599s +++ : 599s ++ pathent= 599s ++ case "$pathent" in 599s ++ return 599s ++ t-set-intree 599s ++ '[' x = x ']' 599s ++ return 599s ++ : -D 599s ++ export DGIT_TEST_DEBUG 599s ++ : x 599s ++ export DGIT_TEST_DEBPUSH_DEBUG 599s ++ : 599s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 599s ++ GIT_COMMITTER_DATE='1530000000 +0100' 599s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 599s ++ GIT_AUTHOR_DATE='1530000000 +0100' 599s ++ export LC_CTYPE=C.UTF-8 599s ++ LC_CTYPE=C.UTF-8 599s ++ unset CDPATH 599s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 599s ++ FILTER_BRANCH_SQUELCH_WARNING=1 599s +++ pwd 599s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 599s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ testname=gdr-convert-gbp-noarchive 599s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 599s ++ bpd=.. 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 599s ++ '[' x '!=' x ']' 599s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s +++ pwd 599s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ t-set-using-tmp 599s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 599s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 599s ++ export 'DEBFULLNAME=dgit test git user' 599s ++ DEBFULLNAME='dgit test git user' 599s ++ git config --global user.email dgit-test@debian.example.net 599s ++ git config --global user.name 'dgit test git user' 599s ++ git config --global protocol.ext.allow always 599s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 599s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 599s ++ export DEBCHANGE_VENDOR=dpkg 599s ++ DEBCHANGE_VENDOR=dpkg 599s ++ unset VISUAL 599s ++ unset GIT_EDITOR 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 599s ++ cat 599s ++ schroot=build 599s ++ : aq 599s ++ : archive/test-dummy 599s ++ : sid:unstable 599s ++ t-git-config dgit.default.old-dsc-distro test-dummy 599s ++ git config --global dgit.default.old-dsc-distro test-dummy 599s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 599s ++ : -D 599s ++ export GDR_TEST_DEBUG 599s ++ t-tstunt debchange 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ local var=PATH 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ eval ' 599s case "$PATH" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PATH="$tstunt" ;; 599s *) PATH="$tstunt:$PATH" ;; 599s esac 599s export PATH 599s ' 599s +++ case "$PATH" in 599s +++ export PATH 599s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ local var=PERLLIB 599s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s ++ eval ' 599s case "$PERLLIB" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PERLLIB="$tstunt" ;; 599s *) PERLLIB="$tstunt:$PERLLIB" ;; 599s esac 599s export PERLLIB 599s ' 599s +++ case "$PERLLIB" in 599s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s +++ export PERLLIB 599s ++ local f 599s ++ for f in "$@" 599s ++ t-tstunt--save-real debchange 599s ++ local f=debchange 599s ++ case "$f" in 599s ++ local rc 599s ++ local real 599s ++ set +e 599s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s +++ type -p debchange 599s ++ real=/usr/bin/debchange 599s ++ rc=0 599s ++ set -e 599s ++ case $rc in 599s ++ local varname=debchange 599s ++ varname=DGIT_TEST_REAL_DEBCHANGE 599s ++ eval ' 599s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 599s export DGIT_TEST_REAL_DEBCHANGE 599s ' 599s +++ : /usr/bin/debchange 599s +++ export DGIT_TEST_REAL_DEBCHANGE 599s ++ f=./debchange 599s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 599s + : t-setup-import gnupg 599s + t-dependencies GDR 599s + : 'Hopefully installed: GDR' 599s + t-tstunt-parsechangelog 599s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PATH 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PATH" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PATH="$tstunt" ;; 599s *) PATH="$tstunt:$PATH" ;; 599s esac 599s export PATH 599s ' 599s ++ case "$PATH" in 599s ++ export PATH 599s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + local var=PERLLIB 599s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 599s + eval ' 599s case "$PERLLIB" in 599s "$tstunt:"*) ;; 599s *":$tstunt:"*) ;; 599s "") PERLLIB="$tstunt" ;; 599s *) PERLLIB="$tstunt:$PERLLIB" ;; 599s esac 599s export PERLLIB 599s ' 599s ++ case "$PERLLIB" in 599s ++ export PERLLIB 599s + local f 599s + for f in "$@" 599s + t-tstunt--save-real dpkg-parsechangelog 599s + local f=dpkg-parsechangelog 599s + case "$f" in 599s + local rc 599s + local real 599s + set +e 599s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 599s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 599s ++ type -p dpkg-parsechangelog 599s + real=/usr/bin/dpkg-parsechangelog 599s + rc=0 599s + set -e 599s + case $rc in 599s + local varname=dpkg_parsechangelog 599s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s + eval ' 599s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 599s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s ' 599s ++ : /usr/bin/dpkg-parsechangelog 599s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 599s + f=./dpkg-parsechangelog 599s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 599s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 599s + for f in "$@" 599s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 599s + local f=Dpkg/Changelog/Parse.pm 599s + case "$f" in 599s + return 599s + f=./Dpkg/Changelog/Parse.pm 599s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 599s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 599s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 599s + t-gdr-gbp-import-core-with-queue 599s + t-gdr-gbp-import-core 599s + p=example 599s + t-worktree 1.1 599s + rm -rf example 599s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 599s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 599s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 599s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 599s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 599s + cd example 599s + : 'fake up some kind of upstream' 599s + git checkout -b upstream quilt-tip 599s Switched to a new branch 'upstream' 599s + rm -rf debian 599s + mkdir debian 599s + echo junk 599s + git add debian 599s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 599s [upstream 98d1ef3] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 599s 6 files changed, 1 insertion(+), 36 deletions(-) 599s delete mode 100644 debian/changelog 599s delete mode 100644 debian/compat 599s delete mode 100644 debian/control 599s delete mode 100644 debian/example.install 599s mode change 100755 => 100644 debian/rules 599s delete mode 100644 debian/source/format 599s + git tag v1.0 599s + : 'fake up that our quilt-tip was descended from upstream' 599s + git checkout quilt-tip 599s Switched to branch 'quilt-tip' 599s + git merge --no-edit -s ours upstream 599s Merge made by the 'ours' strategy. 599s + : 'fake up that our quilt-tip had the patch queue in it' 599s + git checkout patch-queue/quilt-tip 599s Switched to branch 'patch-queue/quilt-tip' 599s + gbp pq export 599s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 599s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 599s + git add debian/patches 599s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 599s [quilt-tip 2d660f7] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 599s 4 files changed, 50 insertions(+) 599s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 599s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 599s create mode 100644 debian/patches/series 599s create mode 100644 debian/patches/subdir/addnewups 599s + : 'make branch names more conventional' 599s + git branch -D master 599s Deleted branch master (was 17d67db). 599s + git branch -m quilt-tip master 599s + not-gdr-processable origin 599s + git branch gdr-unprocessable/origin 599s + t-git-debrebase analyse 599s + local gdr=git-debrebase 599s + : ' 599s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 599s + git-debrebase --dgit=dgit -D analyse 599s + grep 'Unknown Unprocessable' 600s git-debrebase *** WALK 2d660f75d860eebc7c1d206b7b36383e1ee4add4 1 *main::STDOUT 600s git-debrebase get_differs 1bc46c9d4678351c17d3f6376286edb58ddee61b bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 600s git-debrebase classify 2d660f75d860eebc7c1d206b7b36383e1ee4add4 $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 1bc46c9d4678351c17d3f6376286edb58ddee61b/0x4 600s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Differs" => 4}],"Msg" => "patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches","CommitId" => "2d660f75d860eebc7c1d206b7b36383e1ee4add4","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 1bc46c9d4678351c17d3f6376286edb58ddee61b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 600s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 600s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 600s git-debrebase classify 1bc46c9d4678351c17d3f6376286edb58ddee61b $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 98d1ef33f97b1baf0e88f735213286f40a2d2980/0x30 600s git-debrebase = Pseudomerge {"Contributor" => {"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},"Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"CommitId" => "98d1ef33f97b1baf0e88f735213286f40a2d2980","Differs" => 48}],"Type" => "Pseudomerge","CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 98d1ef33f97b1baf0e88f735213286f40a2d2980\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]]} 600s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 600s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 600s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Msg" => "Add *.o to .gitignore\n"} 600s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 600s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 600s git-debrebase = Mixed {"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "Mixed","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}]} 600s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 600s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 600s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Type" => "Packaging","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Msg" => "echo EXAMPLE RULES TARGET\n"} 600s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 600s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 600s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 600s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 600s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 600s git-debrebase = Packaging {"Msg" => "WIP\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 600s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 600s git-debrebase ** Unknown 600s git-debrebase *** WALK BOMB unrecognised 600s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 600s ' 600s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 600s + : 'fake up an upstream 2.0' 600s + git branch make-upstream upstream 600s + t-make-new-upstream-tarball 2.0 600s + local uv=2.0 600s + git checkout make-upstream 600s Switched to branch 'make-upstream' 600s + echo 'upstream 2.0' 600s + git commit -a -m 'upstream 2.0 tarball' 600s [make-upstream 19f63cb] upstream 2.0 tarball 600s 1 file changed, 1 insertion(+) 600s + t-make-orig example 2.0 make-upstream 600s + local p=example 600s + local v=2.0 600s + local tag=make-upstream 600s + ust=example_2.0.orig.tar.gz 600s + GZIP=-1 600s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 600s gzip: warning: GZIP environment variable is deprecated; use an alias or script 600s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 600s + git branch -D quilt-tip-2 600s Deleted branch quilt-tip-2 (was 99fcab4). 600s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 600s + git branch -D gitish-only 600s Deleted branch gitish-only (was 2b2ddc8). 600s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 600s + git branch -D quilt-tip-1.1 600s Deleted branch quilt-tip-1.1 (was 7fc34be). 600s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 600s + git branch -D patch-queue/quilt-tip 600s Deleted branch patch-queue/quilt-tip (was d843a68). 600s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 600s + git branch -D indep-arch 600s Deleted branch indep-arch (was e215729). 600s + : 'see what gbp import-orig does' 600s + git checkout master 600s Switched to branch 'master' 600s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 600s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 600s gbp:info: Source package is example 600s gbp:info: Upstream version is 2.0 600s gbp:info: Replacing upstream source on 'master' 600s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 600s + not-gdr-processable merge 600s + git branch gdr-unprocessable/merge 600s + t-git-debrebase analyse 600s + local gdr=git-debrebase 600s + : ' 600s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 600s + git-debrebase --dgit=dgit -D analyse 600s + grep 'Unknown Unprocessable' 600s git-debrebase *** WALK 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 1 *main::STDOUT 600s git-debrebase get_differs 2d660f75d860eebc7c1d206b7b36383e1ee4add4 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 600s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 600s git-debrebase classify 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 2d660f75d860eebc7c1d206b7b36383e1ee4add4/0x2 dcacb606b0a29bcbc1331971222caf97f79a139c/0x34 600s git-debrebase ** Unknown 600s git-debrebase *** WALK BOMB unrecognised 600s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 600s ' 600s 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 Unknown Unprocessable (general two-parent merge) 600s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 600s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 600s + DEBEMAIL=dgit-tests@example.org 600s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 600s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 600s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 600s [master 39a9ae4] dch -v 2.0-1 -m new upstream (did gbp import-orig) 600s 1 file changed, 6 insertions(+) 600s + t-dch-commit-r 600s + t-dch-r-rune t-dch-commit 600s + local cmd=t-dch-commit 600s + shift 600s + local suite=unstable 600s + t-dch-commit -r -D unstable '' 600s + t-debchange -r -D unstable '' 600s + DEBEMAIL=dgit-tests@example.org 600s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 600s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 600s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 600s libdistro-info-perl is not installed, Debian release names are not known. 600s libdistro-info-perl is not installed, Ubuntu release names are not known. 600s + git commit -m 'dch -r -D unstable ' debian/changelog 600s [master c8629cf] dch -r -D unstable 600s 1 file changed, 3 insertions(+), 2 deletions(-) 600s + echo garbage 600s + git add debian/patches/garbage 600s + git commit -m 'add garbage' debian/patches/garbage 600s [master 07528ed] add garbage 600s 1 file changed, 1 insertion(+) 600s create mode 100644 debian/patches/garbage 600s + : t-archive-none example 600s + : t-git-none 600s + : t-dgit -wgf --gbp push-source --new 600s + t-salsa-add-remote 600s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 600s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 600s + set -e 600s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 600s + git init --bare 600s hint: Using 'master' as the name for the initial branch. This default branch name 600s hint: is subject to change. To configure the initial branch name to use in all 600s hint: of your new repositories, which will suppress this warning, call: 600s hint: 600s hint: git config --global init.defaultBranch 600s hint: 600s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 600s hint: 'development'. The just-created branch can be renamed via this command: 600s hint: 600s hint: git branch -m 600s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 600s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 600s + git push --set-upstream origin master 600s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 600s * [new branch] master -> master 600s Branch 'master' set up to track remote branch 'master' from 'origin'. 600s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 600s + local 'mpat=E:identical in upstream files' 600s + shift 600s + set +o pipefail 600s + LC_MESSAGES=C 600s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + LANGUAGE=C 600s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 600s + local gdr=git-debrebase 600s + : ' 600s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 600s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 600s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 600s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x36 600s docs/README | 1 + 600s 1 file changed, 1 insertion(+) 600s 600s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 600s git-debrebase: identical in upstream files. See diffstat above, or run 600s git-debrebase: git diff 98d1ef33f97b1baf0e88f735213286f40a2d2980 HEAD -- :!/debian :/ 600s + local 'ps=255 0' 600s + set -o pipefail 600s + case $ps in 600s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + local 'mpat=E:identical in upstream files' 600s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + local grepper=fgrep 600s + case "$mpat" in 600s + case "$mpat" in 600s + grepper=egrep 600s + mpat='identical in upstream files' 600s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s git-debrebase: identical in upstream files. See diffstat above, or run 600s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 600s + local 'mpat=E:Unused patch file garbage will be discarded' 600s + shift 600s + set +o pipefail 600s + LC_MESSAGES=C 600s + LANGUAGE=C 600s + t-git-debrebase -fupstream-has-debian convert-from-gbp 600s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + local gdr=git-debrebase 600s + : ' 600s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 600s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 600s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 600s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 600s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 600s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 600s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 600s $VAR2 = bless( do{\(my $o = { 600s 'name' => 'debian/changelog, entry no.1', 600s 'fields' => { 600s 'Source' => 'example', 600s 'Version' => '2.0-1', 600s 'Distribution' => 'unstable', 600s 'Urgency' => 'medium', 600s 'Maintainer' => 'dgit test git user ', 600s 'Timestamp' => '1530000000', 600s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 600s 'Changes' => ' 600s example (2.0-1) unstable; urgency=medium 600s 600s [ Ian Jackson ] 600s * new upstream (did gbp import-orig)' 600s }, 600s 'in_order' => [ 600s 'Source', 600s 'Version', 600s 'Distribution', 600s 'Urgency', 600s 'Maintainer', 600s 'Timestamp', 600s 'Date', 600s 'Changes' 600s ], 600s 'allow_duplicate' => 0, 600s 'allow_pgp' => 1, 600s 'is_pgp_signed' => 0, 600s 'drop_empty' => 0, 600s 'keep_duplicate' => 0, 600s 'out_order' => [] 600s })}, 'Dpkg::Control::Hash' ); 600s last finished-looking changelog entry: (2.0-1) unstable 600s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 600s Failed to stitch in dgit view (see messages above). 600s dgit --overwrite will be needed on the first dgit push after conversion. 600s git-debrebase: snags: 1 overriden by individual -f options 600s 600s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 600s + local 'ps=255 0' 600s + set -o pipefail 600s + case $ps in 600s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + local 'mpat=E:Unused patch file garbage will be discarded' 600s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s + local grepper=fgrep 600s + case "$mpat" in 600s + case "$mpat" in 600s + grepper=egrep 600s + mpat='Unused patch file garbage will be discarded' 600s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 600s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 600s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 600s + local gdr=git-debrebase 600s + : ' 600s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 600s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 600s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 600s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 600s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 600s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 601s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 601s $VAR2 = bless( do{\(my $o = { 601s 'allow_duplicate' => 0, 601s 'drop_empty' => 0, 601s 'fields' => { 601s 'Source' => 'example', 601s 'Version' => '2.0-1', 601s 'Distribution' => 'unstable', 601s 'Urgency' => 'medium', 601s 'Maintainer' => 'dgit test git user ', 601s 'Timestamp' => '1530000000', 601s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 601s 'Changes' => ' 601s example (2.0-1) unstable; urgency=medium 601s 601s [ Ian Jackson ] 601s * new upstream (did gbp import-orig)' 601s }, 601s 'keep_duplicate' => 0, 601s 'allow_pgp' => 1, 601s 'out_order' => [], 601s 'is_pgp_signed' => 0, 601s 'in_order' => [ 601s 'Source', 601s 'Version', 601s 'Distribution', 601s 'Urgency', 601s 'Maintainer', 601s 'Timestamp', 601s 'Date', 601s 'Changes' 601s ], 601s 'name' => 'debian/changelog, entry no.1' 601s })}, 'Dpkg::Control::Hash' ); 601s last finished-looking changelog entry: (2.0-1) unstable 601s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 601s Failed to stitch in dgit view (see messages above). 601s dgit --overwrite will be needed on the first dgit push after conversion. 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 601s gbp:info: Trying to apply patches at '07528ed443e7bf250b829b6c1d391c42507ce2b1' 601s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 601s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 601s git-debrebase ffq check_specs * 601s git-debrebase ffq merge master 601s git-debrebase ffq check_remote origin remote fetch/merge branch 601s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 601s OK, you are ahead of refs/remotes/origin/master 601s git-debrebase ffq check_remote undef remote push branch 601s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 601s git-debrebase: snags: 2 overriden by individual -f options 601s git-debrebase >= update refs/debrebase-last/heads/master f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 0000000000000000000000000000000000000000 601s git-debrebase >= update HEAD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 07528ed443e7bf250b829b6c1d391c42507ce2b1 601s git-debrebase >$ 601s HEAD is now at f5ce088 Add another new upstream file 601s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 601s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 601s ' 601s + git branch converted-from-gbp 601s + v=2.0-2 601s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 601s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 601s + DEBEMAIL=dgit-tests@example.org 601s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 601s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 601s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 601s [master f4c946a] dch -v 2.0-2 -m switch to git-debrebase, no other changes 601s 1 file changed, 6 insertions(+) 601s + t-dch-commit-r 601s + t-dch-r-rune t-dch-commit 601s + local cmd=t-dch-commit 601s + shift 601s + local suite=unstable 601s + t-dch-commit -r -D unstable '' 601s + t-debchange -r -D unstable '' 601s + DEBEMAIL=dgit-tests@example.org 601s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 601s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 601s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 601s libdistro-info-perl is not installed, Debian release names are not known. 601s libdistro-info-perl is not installed, Ubuntu release names are not known. 601s + git commit -m 'dch -r -D unstable ' debian/changelog 601s [master 2306c75] dch -r -D unstable 601s 1 file changed, 1 insertion(+), 1 deletion(-) 601s + : t-dgit -wgf push-source --new 601s + git push 601s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 601s 07528ed..2306c75 master -> master 601s + cd .. 601s + : t-archive-process-incoming sid 601s ++ echo example example_2.0.orig.tar.gz 601s ++ : echo git mirror aq 601s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 601s . $troot/lib-gdr 601s t-tstunt-parsechangelog 601s p=example 601s t-git-next-date 601s ' 601s + local savevars= 601s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 601s + local 'importeval= 601s . $troot/lib-gdr 601s t-tstunt-parsechangelog 601s p=example 601s t-git-next-date 601s ' 601s + local import=IMPORT.gdr-convert-gbp-noarchive 601s + exec 601s + local vn 601s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 601s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 601s print STDERR "saving-exporting $vn\n"; 601s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 601s or die $!; 601s } 601s ' 601s saving-exporting DGIT_TEST_REAL_DEBCHANGE 601s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 601s + set -e 601s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 601s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 601s + printf '\n%s\n' ' 601s . $troot/lib-gdr 601s t-tstunt-parsechangelog 601s p=example 601s t-git-next-date 601s ' 601s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 601s + rc=0 601s + set +x 601s + set +e 601s + pwd 601s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 601s + '[' x '!=' x ']' 601s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 601s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 601s + set -e 601s + test 0 = 0 601s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 601s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 601s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 601s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 601s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 601s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 601s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 601s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 601s +++ : -D 601s +++ export GDR_TEST_DEBUG 601s +++ t-tstunt debchange 601s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s +++ local var=PATH 601s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s +++ eval ' 601s case "$PATH" in 601s "$tstunt:"*) ;; 601s *":$tstunt:"*) ;; 601s "") PATH="$tstunt" ;; 601s *) PATH="$tstunt:$PATH" ;; 601s esac 601s export PATH 601s ' 601s ++++ case "$PATH" in 601s ++++ export PATH 601s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s +++ local var=PERLLIB 601s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s +++ eval ' 601s case "$PERLLIB" in 601s "$tstunt:"*) ;; 601s *":$tstunt:"*) ;; 601s "") PERLLIB="$tstunt" ;; 601s *) PERLLIB="$tstunt:$PERLLIB" ;; 601s esac 601s export PERLLIB 601s ' 601s ++++ case "$PERLLIB" in 601s ++++ export PERLLIB 601s +++ local f 601s +++ for f in "$@" 601s +++ t-tstunt--save-real debchange 601s +++ local f=debchange 601s +++ case "$f" in 601s +++ local rc 601s +++ local real 601s +++ set +e 601s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 601s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 601s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s ++++ type -p debchange 601s +++ real=/usr/bin/debchange 601s +++ rc=0 601s +++ set -e 601s +++ case $rc in 601s +++ local varname=debchange 601s +++ varname=DGIT_TEST_REAL_DEBCHANGE 601s +++ eval ' 601s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 601s export DGIT_TEST_REAL_DEBCHANGE 601s ' 601s ++++ : /usr/bin/debchange 601s ++++ export DGIT_TEST_REAL_DEBCHANGE 601s +++ f=./debchange 601s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 601s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 601s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 601s ++ t-tstunt-parsechangelog 601s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 601s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s ++ local var=PATH 601s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s ++ eval ' 601s case "$PATH" in 601s "$tstunt:"*) ;; 601s *":$tstunt:"*) ;; 601s "") PATH="$tstunt" ;; 601s *) PATH="$tstunt:$PATH" ;; 601s esac 601s export PATH 601s ' 601s +++ case "$PATH" in 601s +++ export PATH 601s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s ++ local var=PERLLIB 601s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 601s ++ eval ' 601s case "$PERLLIB" in 601s "$tstunt:"*) ;; 601s *":$tstunt:"*) ;; 601s "") PERLLIB="$tstunt" ;; 601s *) PERLLIB="$tstunt:$PERLLIB" ;; 601s esac 601s export PERLLIB 601s ' 601s +++ case "$PERLLIB" in 601s +++ export PERLLIB 601s ++ local f 601s ++ for f in "$@" 601s ++ t-tstunt--save-real dpkg-parsechangelog 601s ++ local f=dpkg-parsechangelog 601s ++ case "$f" in 601s ++ local rc 601s ++ local real 601s ++ set +e 601s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 601s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 601s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 601s +++ type -p dpkg-parsechangelog 601s ++ real=/usr/bin/dpkg-parsechangelog 601s ++ rc=0 601s ++ set -e 601s ++ case $rc in 601s ++ local varname=dpkg_parsechangelog 601s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 601s ++ eval ' 601s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 601s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 601s ' 601s +++ : /usr/bin/dpkg-parsechangelog 601s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 601s ++ f=./dpkg-parsechangelog 601s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 601s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 601s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 601s ++ for f in "$@" 601s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 601s ++ local f=Dpkg/Changelog/Parse.pm 601s ++ case "$f" in 601s ++ return 601s ++ f=./Dpkg/Changelog/Parse.pm 601s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 601s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 601s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 601s ++ p=example 601s ++ t-git-next-date 601s ++ GIT_COMMITTER_DATE='1530000001 +0100' 601s ++ GIT_AUTHOR_DATE='1530000001 +0100' 601s + t_gdr_xopts+=' --experimental-merge-resolution' 601s + : ----- prepare the baseline ----- 601s + cd example 601s + t-gdr-prep-new-upstream 2.1 601s + uv=2.1 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000002 +0100' 601s + GIT_AUTHOR_DATE='1530000002 +0100' 601s + git checkout make-upstream 601s Switched to branch 'make-upstream' 601s + git reset --hard upstream 601s HEAD is now at dcacb60 New upstream version 2.0 601s + t-make-new-upstream-tarball 2.1 601s + local uv=2.1 601s + git checkout make-upstream 601s Already on 'make-upstream' 601s + echo 'upstream 2.1' 601s + git commit -a -m 'upstream 2.1 tarball' 601s [make-upstream 9638c21] upstream 2.1 tarball 601s 1 file changed, 1 insertion(+) 601s + t-make-orig example 2.1 make-upstream 601s + local p=example 601s + local v=2.1 601s + local tag=make-upstream 601s + ust=example_2.1.orig.tar.gz 601s + GZIP=-1 601s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 601s gzip: warning: GZIP environment variable is deprecated; use an alias or script 601s + git push . make-upstream:upstream 601s To . 601s dcacb60..9638c21 make-upstream -> upstream 601s + git checkout master 601s Switched to branch 'master' 601s Your branch is up to date with 'origin/master'. 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000003 +0100' 601s + GIT_AUTHOR_DATE='1530000003 +0100' 601s + git tag v2.1 upstream 601s + t-some-changes before 601s + local token=before 601s + local which=dum 601s + local fsuffix= 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000004 +0100' 601s + GIT_AUTHOR_DATE='1530000004 +0100' 601s + case "$which" in 601s + echo '// debian before' 601s + git add debian/zorkmid 601s + git commit -m 'DEBIAN add zorkmid (before)' 601s [master 0587219] DEBIAN add zorkmid (before) 601s 1 file changed, 1 insertion(+) 601s create mode 100644 debian/zorkmid 601s + case "$which" in 601s + echo '// upstream before' 601s + git add src.c 601s + git commit -m 'UPSTREAM edit src.c (before)' 601s [master 299a175] UPSTREAM edit src.c (before) 601s 1 file changed, 1 insertion(+) 601s + case "$which" in 601s + for f in debian/zorkmid$fsuffix src$fsuffix.c 601s + echo '// both! before' 601s + git add debian/zorkmid 601s + for f in debian/zorkmid$fsuffix src$fsuffix.c 601s + echo '// both! before' 601s + git add src.c 601s + git commit -m 'MIXED add both() (before)' 601s [master 6edd94b] MIXED add both() (before) 601s 2 files changed, 2 insertions(+) 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000005 +0100' 601s + GIT_AUTHOR_DATE='1530000005 +0100' 601s + t-git-debrebase quick 601s + local gdr=git-debrebase 601s + : ' 601s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 601s + git-debrebase --dgit=dgit -D --experimental-merge-resolution quick 601s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 601s git-debrebase ffq check_specs * 601s git-debrebase ffq merge master 601s git-debrebase ffq check_remote origin remote fetch/merge branch 601s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 601s OK, you are ahead of refs/remotes/origin/master 601s git-debrebase ffq check_remote undef remote push branch 601s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 601s git-debrebase *** WALK 6edd94b52b631f4746ff2c69392544c34fb93858 0 - 601s git-debrebase get_differs 299a175a7921ccba31c38ead9121ac2175ffdd70 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x22 601s git-debrebase classify 6edd94b52b631f4746ff2c69392544c34fb93858 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 299a175a7921ccba31c38ead9121ac2175ffdd70/0x22 601s git-debrebase = Mixed {"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Mixed","Msg" => "MIXED add both() (before)\n","Parents" => [{"Differs" => 34,"CommitId" => "299a175a7921ccba31c38ead9121ac2175ffdd70","Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 299a175a7921ccba31c38ead9121ac2175ffdd70\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n"} 601s git-debrebase get_differs 0587219583bd15627aa416fed7ba35b78462ba0e ccd4a7c462d0e0b559590a43d0b920471105a2a6 = 0x2 601s git-debrebase classify 299a175a7921ccba31c38ead9121ac2175ffdd70 $t=ccd4a7c462d0e0b559590a43d0b920471105a2a6 @p 0587219583bd15627aa416fed7ba35b78462ba0e/0x2 601s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"Differs" => 2,"CommitId" => "0587219583bd15627aa416fed7ba35b78462ba0e","Ix" => 0}],"Hdr" => "tree ccd4a7c462d0e0b559590a43d0b920471105a2a6\nparent 0587219583bd15627aa416fed7ba35b78462ba0e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "299a175a7921ccba31c38ead9121ac2175ffdd70","Tree" => "ccd4a7c462d0e0b559590a43d0b920471105a2a6"} 601s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 86d647b7fb482f29d7d648111f8ab4f4953b3233 = 0x20 601s git-debrebase classify 0587219583bd15627aa416fed7ba35b78462ba0e $t=86d647b7fb482f29d7d648111f8ab4f4953b3233 @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x20 601s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 86d647b7fb482f29d7d648111f8ab4f4953b3233\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "0587219583bd15627aa416fed7ba35b78462ba0e","Tree" => "86d647b7fb482f29d7d648111f8ab4f4953b3233"} 601s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 601s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 601s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"} 601s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 601s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 601s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"}]} 601s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 601s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 601s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 601s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 601s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 601s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"} 601s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 601s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 601s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 601s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 601s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 601s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 601s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 601s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 4 upp 4 proc 9 pm -1 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 601s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 10 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 601s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 601s git-debrebase WALK REWRITING NOW cl=HASH(0x559d4bbf5000) procd=HASH(0x559d4bce5020) 601s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 601s git-debrebase WALK BUILD 0587219583bd15627aa416fed7ba35b78462ba0e Debian (rewriting=1) 601s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 601s git-debrebase WALK BUILD 6edd94b52b631f4746ff2c69392544c34fb93858 Debian (rewriting=1) 601s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 601s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 601s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 601s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 601s git-debrebase WALK BUILD 299a175a7921ccba31c38ead9121ac2175ffdd70 Upstream (rewriting=1) 601s git-debrebase WALK BUILD 6edd94b52b631f4746ff2c69392544c34fb93858 Upstream (rewriting=1) 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 601s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 6edd94b52b631f4746ff2c69392544c34fb93858 = 0 601s git-debrebase *** WALK RETURN 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 601s git-debrebase: laundered (head was 6edd94b52b631f4746ff2c69392544c34fb93858) 601s git-debrebase >= update refs/ffq-prev/heads/master 6edd94b52b631f4746ff2c69392544c34fb93858 0000000000000000000000000000000000000000 601s git-debrebase >= delete refs/debrebase-last/heads/master 601s git-debrebase >= update HEAD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 6edd94b52b631f4746ff2c69392544c34fb93858 601s git-debrebase >$ 601s Recorded previous head for preservation 601s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 601s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 601s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 601s git-debrebase = Upstream {"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3"}],"Type" => "Upstream"} 601s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 601s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 601s git-debrebase = Upstream {"Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (before)\n"} 601s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 601s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 601s git-debrebase = Upstream {"Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 601s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 601s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 601s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0}],"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 601s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 601s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 601s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666"} 601s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 601s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 601s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 601s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 601s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 601s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}]} 601s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 601s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 601s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 601s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 601s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 601s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 601s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 601s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 601s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 601s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 601s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 601s git-debrebase >= delete refs/ffq-prev/heads/master 6edd94b52b631f4746ff2c69392544c34fb93858 601s git-debrebase >= update refs/debrebase-last/heads/master 25b5400e549fae4178ac03009ca007e4d5de00dc 0000000000000000000000000000000000000000 601s git-debrebase >= update HEAD 25b5400e549fae4178ac03009ca007e4d5de00dc 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 601s git-debrebase >$ 601s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 601s ' 601s + : ===== early failure in walk ===== 601s + : ----- prepare other ----- 601s + git checkout -b other 601s Switched to a new branch 'other' 601s + t-some-changes other '' -other 601s + local token=other 601s + local which=dum 601s + local fsuffix=-other 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000006 +0100' 601s + GIT_AUTHOR_DATE='1530000006 +0100' 601s + case "$which" in 601s + echo '// debian other' 601s + git add debian/zorkmid-other 601s + git commit -m 'DEBIAN add zorkmid-other (other)' 601s [other 16fdcfc] DEBIAN add zorkmid-other (other) 601s 1 file changed, 1 insertion(+) 601s create mode 100644 debian/zorkmid-other 601s + case "$which" in 601s + echo '// upstream other' 601s + git add src-other.c 601s + git commit -m 'UPSTREAM edit src-other.c (other)' 601s [other c441f3b] UPSTREAM edit src-other.c (other) 601s 1 file changed, 1 insertion(+) 601s create mode 100644 src-other.c 601s + case "$which" in 601s + for f in debian/zorkmid$fsuffix src$fsuffix.c 601s + echo '// both! other' 601s + git add debian/zorkmid-other 601s + for f in debian/zorkmid$fsuffix src$fsuffix.c 601s + echo '// both! other' 601s + git add src-other.c 601s + git commit -m 'MIXED add both(-other) (other)' 601s [other cef09e1] MIXED add both(-other) (other) 601s 2 files changed, 2 insertions(+) 601s + t-git-next-date 601s + GIT_COMMITTER_DATE='1530000007 +0100' 601s + GIT_AUTHOR_DATE='1530000007 +0100' 601s + git branch other-before-new-upstream 601s + t-git-debrebase new-upstream 2.1 601s + local gdr=git-debrebase 601s + : ' 601s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 601s + git-debrebase --dgit=dgit -D --experimental-merge-resolution new-upstream 2.1 602s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 602s git-debrebase ffq check_specs * 602s git-debrebase *** WALK cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 0 - 602s git-debrebase get_differs c441f3b13985fc4b000fd25c35a60b7026a9d477 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 602s git-debrebase classify cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c441f3b13985fc4b000fd25c35a60b7026a9d477/0x22 602s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Differs" => 34}],"Msg" => "MIXED add both(-other) (other)\n","CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c441f3b13985fc4b000fd25c35a60b7026a9d477\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Type" => "Mixed"} 602s git-debrebase get_differs 16fdcfc4a487589ef6e2aed24a5d717bde301a34 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 602s git-debrebase classify c441f3b13985fc4b000fd25c35a60b7026a9d477 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 16fdcfc4a487589ef6e2aed24a5d717bde301a34/0x2 602s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 16fdcfc4a487589ef6e2aed24a5d717bde301a34\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34"}]} 602s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 602s git-debrebase classify 16fdcfc4a487589ef6e2aed24a5d717bde301a34 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p 25b5400e549fae4178ac03009ca007e4d5de00dc/0x20 602s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"}],"Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","Type" => "Packaging"} 602s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 602s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 602s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 602s git-debrebase = Pseudomerge {"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [{"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Ix" => 1,"Differs" => 0}],"SubType" => "Ambiguous","Contributor" => {"Differs" => 0,"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Ix" => 0},"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 602s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 602s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 602s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3"}]} 602s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 602s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 602s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd"} 602s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 602s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 602s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Type" => "Upstream"} 602s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 602s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 602s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Type" => "Upstream"} 602s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 602s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 602s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}]} 602s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 602s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 602s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 602s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 602s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 602s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n"} 602s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 602s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 602s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}]} 602s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 602s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 602s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}]} 602s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 602s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 602s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 602s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 602s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 6 upp 7 proc 15 pm 0 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 16 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 602s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 602s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 602s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 602s git-debrebase WALK BUILD 16fdcfc4a487589ef6e2aed24a5d717bde301a34 Debian (rewriting=0) 602s git-debrebase WALK REWRITING NOW cl=HASH(0x55c004878bb0) procd=HASH(0x55c004905e50) 602s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 602s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Debian (rewriting=1) 602s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 602s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=1) 602s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=1) 602s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=1) 602s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=1) 602s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=1) 602s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 602s git-debrebase WALK BUILD c441f3b13985fc4b000fd25c35a60b7026a9d477 Upstream (rewriting=1) 602s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Upstream (rewriting=1) 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase get_differs 0de41fef01b06dfb7468bd1f85858cc2d1de4139 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 = 0 602s git-debrebase *** WALK RETURN 0de41fef01b06dfb7468bd1f85858cc2d1de4139 97bc60f079fe0c6c409d8e0a948ea18ce7578807 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 602s git-debrebase get_differs 08d86c26a089ec86b7e81bdaaaf871ce8bedf88b 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 602s git-debrebase classify 97bc60f079fe0c6c409d8e0a948ea18ce7578807 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 08d86c26a089ec86b7e81bdaaaf871ce8bedf88b/0x20 602s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "08d86c26a089ec86b7e81bdaaaf871ce8bedf88b","Differs" => 32}],"Type" => "Packaging","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 08d86c26a089ec86b7e81bdaaaf871ce8bedf88b\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "97bc60f079fe0c6c409d8e0a948ea18ce7578807","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n"} 602s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 602s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 602s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 602s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 602s git-debrebase %pieces = {"" => {"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","New" => "9638c2110033b719cc742997b9527505ffdc1a65","Name" => "","OldIx" => 0,"NewIx" => 0,"Desc" => "upstream (main piece"}} 602s git-debrebase @newpieces = [{"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","New" => "9638c2110033b719cc742997b9527505ffdc1a65","Name" => "","OldIx" => 0,"NewIx" => 0,"Desc" => "upstream (main piece"}] 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s + exec env TZ=UTC faketime -f 2018-06-26 08:00:07 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase: laundered (head was cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0) 602s git-debrebase >= update refs/ffq-prev/heads/other cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 0000000000000000000000000000000000000000 602s git-debrebase >= delete refs/debrebase-last/heads/other 602s git-debrebase >= update HEAD 0de41fef01b06dfb7468bd1f85858cc2d1de4139 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 602s git-debrebase >$ 602s Recorded previous head for preservation 602s Rebasing (1/7) Rebasing (2/7) Rebasing (3/7) Rebasing (4/7) Rebasing (5/7) Rebasing (6/7) Rebasing (7/7) Successfully rebased and updated refs/heads/other. 602s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 602s ' 602s + t-git-next-date 602s + GIT_COMMITTER_DATE='1530000008 +0100' 602s + GIT_AUTHOR_DATE='1530000008 +0100' 602s + : ----- prepare master ----- 602s + git checkout master 602s Switched to branch 'master' 602s Your branch is ahead of 'origin/master' by 13 commits. 602s (use "git push" to publish your local commits) 602s + t-git-debrebase new-upstream 2.1 602s + local gdr=git-debrebase 602s + : ' 602s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 602s + git-debrebase --dgit=dgit -D --experimental-merge-resolution new-upstream 2.1 602s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 602s git-debrebase ffq check_specs * 602s git-debrebase ffq merge master 602s git-debrebase ffq check_remote origin remote fetch/merge branch 602s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 602s OK, you are ahead of refs/remotes/origin/master 602s git-debrebase ffq check_remote undef remote push branch 602s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 602s git-debrebase *** WALK 25b5400e549fae4178ac03009ca007e4d5de00dc 0 - 602s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 602s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 602s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 602s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 0,"Ix" => 1,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Type" => "Pseudomerge","CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136"},$VAR1->{"Overwritten"}[0]],"SubType" => "Ambiguous","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Contributor" => $VAR1->{"Parents"}[0]} 602s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 602s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 602s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Differs" => 2,"Ix" => 0}]} 602s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 602s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 602s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Parents" => [{"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Ix" => 0,"Differs" => 2}],"Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3"} 602s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 602s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 602s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183"} 602s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 602s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 602s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 602s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 602s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 602s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 2,"Ix" => 0}],"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 602s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 602s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 602s git-debrebase = Packaging {"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 602s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 602s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 602s git-debrebase = Packaging {"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n"} 602s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 602s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 602s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 602s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 602s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 602s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 602s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 602s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 602s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 602s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 602s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 12 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 602s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 602s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 602s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 602s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 602s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=0) 602s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=0) 602s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=0) 602s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=0) 602s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=0) 602s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 25b5400e549fae4178ac03009ca007e4d5de00dc = 0 602s git-debrebase *** WALK RETURN 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 602s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 602s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 602s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 602s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 602s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 602s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 602s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 602s git-debrebase %pieces = {"" => {"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","NewIx" => 0,"Desc" => "upstream (main piece","New" => "9638c2110033b719cc742997b9527505ffdc1a65","OldIx" => 0,"Name" => ""}} 602s git-debrebase @newpieces = [{"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","NewIx" => 0,"Desc" => "upstream (main piece","New" => "9638c2110033b719cc742997b9527505ffdc1a65","OldIx" => 0,"Name" => ""}] 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 602s + exec env TZ=UTC faketime -f 2018-06-26 08:00:08 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 602s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 602s git-debrebase: laundered (head was 25b5400e549fae4178ac03009ca007e4d5de00dc) 602s git-debrebase >= update refs/ffq-prev/heads/master 25b5400e549fae4178ac03009ca007e4d5de00dc 0000000000000000000000000000000000000000 602s git-debrebase >= delete refs/debrebase-last/heads/master 602s git-debrebase >= update HEAD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 25b5400e549fae4178ac03009ca007e4d5de00dc 602s git-debrebase >$ 602s Recorded previous head for preservation 602s Rebasing (1/5) Rebasing (2/5) Rebasing (3/5) Rebasing (4/5) Rebasing (5/5) Successfully rebased and updated refs/heads/master. 602s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 602s ' 602s + t-git-next-date 602s + GIT_COMMITTER_DATE='1530000009 +0100' 602s + GIT_AUTHOR_DATE='1530000009 +0100' 602s + git branch master-before-merge 602s + : ----- make the merge ----- 602s + git merge --no-edit -s ours other 602s Merge made by the 'ours' strategy. 602s + t-git-next-date 602s + GIT_COMMITTER_DATE='1530000010 +0100' 602s + GIT_AUTHOR_DATE='1530000010 +0100' 602s + t-debchange -a 'Merge, only conflict was in debian/changelog' 602s + DEBEMAIL=dgit-tests@example.org 602s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -a 'Merge, only conflict was in debian/changelog' 602s + exec env TZ=UTC faketime -f 2018-06-26 08:00:10 env -u TZ /usr/bin/debchange -a Merge, only conflict was in debian/changelog 602s + t-dch-r-rune t-debchange 602s + local cmd=t-debchange 602s + shift 602s + local suite=unstable 602s + t-debchange -r -D unstable '' 602s + DEBEMAIL=dgit-tests@example.org 602s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 602s + exec env TZ=UTC faketime -f 2018-06-26 08:00:10 env -u TZ /usr/bin/debchange -r -D unstable 603s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 603s libdistro-info-perl is not installed, Debian release names are not known. 603s libdistro-info-perl is not installed, Ubuntu release names are not known. 603s + git commit -a --amend --no-edit 603s [master a18eb0f] Merge branch 'other' 603s Date: Tue Jun 26 09:00:09 2018 +0100 603s + wreckage-before 603s + junkref=refs/debrebase/wreckage/junk 603s + git update-ref refs/debrebase/wreckage/junk v2.1 603s + t-expect-fail 'F:divergent anchors' t-git-debrebase 603s + local 'mpat=F:divergent anchors' 603s + shift 603s + set +o pipefail 603s + LC_MESSAGES=C 603s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s + LANGUAGE=C 603s + t-git-debrebase 603s + local gdr=git-debrebase 603s + : ' 603s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 603s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 603s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 603s git-debrebase *** WALK a18eb0fcc623f81073418fca8af36925e50ad95f 0 - 603s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 e3d7677ff411238e7a42355a1a7ad9f00d9f1444 = 0x10 603s git-debrebase get_differs 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 e3d7677ff411238e7a42355a1a7ad9f00d9f1444 = 0x32 603s git-debrebase classify a18eb0fcc623f81073418fca8af36925e50ad95f $t=e3d7677ff411238e7a42355a1a7ad9f00d9f1444 @p 467a69243e82d5769a0b597e988a831c035e0346/0x10 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0/0x32 603s git-debrebase = VanillaMerge {"Msg" => "Merge branch 'other'\n","Type" => "VanillaMerge","Tree" => "e3d7677ff411238e7a42355a1a7ad9f00d9f1444","Parents" => [{"IsDgitImport" => undef,"IsOrigin" => "","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Differs" => 16,"Ix" => 0},{"Ix" => 1,"Differs" => 50,"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "507ff8131693beea35e7bc3f9b9fc7d7c10c79a0"}],"Hdr" => "tree e3d7677ff411238e7a42355a1a7ad9f00d9f1444\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "a18eb0fcc623f81073418fca8af36925e50ad95f"} 603s git-debrebase *** MERGE 603s git-debrebase mwrecknote vanilla-merge a18eb0fcc623f81073418fca8af36925e50ad95f 603s git-debrebase *** WALK 467a69243e82d5769a0b597e988a831c035e0346 0 - 603s git-debrebase get_differs 2b434c87b1d02515dc906fa7640bdea60c79d838 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 603s git-debrebase classify 467a69243e82d5769a0b597e988a831c035e0346 $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p 2b434c87b1d02515dc906fa7640bdea60c79d838/0x2 603s git-debrebase = Upstream {"Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent 2b434c87b1d02515dc906fa7640bdea60c79d838\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Parents" => [{"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Ix" => 0,"Differs" => 2}]} 603s git-debrebase get_differs 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f b572e0b33b388437b34057c7e203744c52d82138 = 0x2 603s git-debrebase classify 2b434c87b1d02515dc906fa7640bdea60c79d838 $t=b572e0b33b388437b34057c7e203744c52d82138 @p 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f/0x2 603s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f","Ix" => 0,"Differs" => 2}],"Tree" => "b572e0b33b388437b34057c7e203744c52d82138","CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 603s git-debrebase get_differs 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 603s git-debrebase classify 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a/0x2 603s git-debrebase = Upstream {"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 603s git-debrebase get_differs af5a52a6968ffe9195debdeba1ad551cfbd331b5 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 603s git-debrebase classify 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p af5a52a6968ffe9195debdeba1ad551cfbd331b5/0x2 603s git-debrebase = Upstream {"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent af5a52a6968ffe9195debdeba1ad551cfbd331b5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a"} 603s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 603s git-debrebase classify af5a52a6968ffe9195debdeba1ad551cfbd331b5 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x2 603s git-debrebase = Upstream {"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Differs" => 2,"Ix" => 0}],"Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a"} 603s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 603s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 603s git-debrebase = Changelog {"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Parents" => [{"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Ix" => 0,"Differs" => 16}],"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 603s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 603s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 603s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 603s git-debrebase = Anchor {"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Type" => "Anchor","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"},{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314"} 603s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp 4 proc 6 pm -1 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase WALK REBUILD 1b928d4b44e70ba8dfce10ff5b94945f972091da 7 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase WALK BUILD ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Debian (rewriting=0) 603s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 603s git-debrebase WALK BUILD af5a52a6968ffe9195debdeba1ad551cfbd331b5 Upstream (rewriting=0) 603s git-debrebase WALK BUILD 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a Upstream (rewriting=0) 603s git-debrebase WALK BUILD 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f Upstream (rewriting=0) 603s git-debrebase WALK BUILD 2b434c87b1d02515dc906fa7640bdea60c79d838 Upstream (rewriting=0) 603s git-debrebase WALK BUILD 467a69243e82d5769a0b597e988a831c035e0346 Upstream (rewriting=0) 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 467a69243e82d5769a0b597e988a831c035e0346 = 0 603s git-debrebase *** WALK RETURN 467a69243e82d5769a0b597e988a831c035e0346 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase mwrecknote left-input 467a69243e82d5769a0b597e988a831c035e0346 603s git-debrebase mwrecknote left-laundered 467a69243e82d5769a0b597e988a831c035e0346 603s git-debrebase mwrecknote left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 603s git-debrebase mwrecknote left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase *** WALK 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 0 - 603s git-debrebase get_differs 015b07ce9f28da2204e7c197b5b3849ae79a053f 95a2c5ea49e78a04f515012e1c38d8edfaf2acc7 = 0x2 603s git-debrebase classify 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 $t=95a2c5ea49e78a04f515012e1c38d8edfaf2acc7 @p 015b07ce9f28da2204e7c197b5b3849ae79a053f/0x2 603s git-debrebase = Upstream {"Tree" => "95a2c5ea49e78a04f515012e1c38d8edfaf2acc7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "015b07ce9f28da2204e7c197b5b3849ae79a053f"}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "507ff8131693beea35e7bc3f9b9fc7d7c10c79a0","Hdr" => "tree 95a2c5ea49e78a04f515012e1c38d8edfaf2acc7\nparent 015b07ce9f28da2204e7c197b5b3849ae79a053f\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs a20afc7d27d2203bf64f75721a77d046d72806ee d9f07db37512afdd980697af61b0e4f454bc466c = 0x2 603s git-debrebase classify 015b07ce9f28da2204e7c197b5b3849ae79a053f $t=d9f07db37512afdd980697af61b0e4f454bc466c @p a20afc7d27d2203bf64f75721a77d046d72806ee/0x2 603s git-debrebase = Upstream {"Tree" => "d9f07db37512afdd980697af61b0e4f454bc466c","Parents" => [{"CommitId" => "a20afc7d27d2203bf64f75721a77d046d72806ee","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src-other.c (other)\n","Type" => "Upstream","CommitId" => "015b07ce9f28da2204e7c197b5b3849ae79a053f","Hdr" => "tree d9f07db37512afdd980697af61b0e4f454bc466c\nparent a20afc7d27d2203bf64f75721a77d046d72806ee\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs 0a95c54d83f58868424320adfcbd6741eec6d7fb fb0d48b7be876925f9f3a5c53cca6c53d8f161fd = 0x2 603s git-debrebase classify a20afc7d27d2203bf64f75721a77d046d72806ee $t=fb0d48b7be876925f9f3a5c53cca6c53d8f161fd @p 0a95c54d83f58868424320adfcbd6741eec6d7fb/0x2 603s git-debrebase = Upstream {"CommitId" => "a20afc7d27d2203bf64f75721a77d046d72806ee","Hdr" => "tree fb0d48b7be876925f9f3a5c53cca6c53d8f161fd\nparent 0a95c54d83f58868424320adfcbd6741eec6d7fb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "0a95c54d83f58868424320adfcbd6741eec6d7fb","Differs" => 2,"Ix" => 0}],"Tree" => "fb0d48b7be876925f9f3a5c53cca6c53d8f161fd"} 603s git-debrebase get_differs 0c0d21f40d4ac48a5de24f4e676aabb25609eeaa 62e2a8fcc9572dc72790d67be9c753469f57babe = 0x2 603s git-debrebase classify 0a95c54d83f58868424320adfcbd6741eec6d7fb $t=62e2a8fcc9572dc72790d67be9c753469f57babe @p 0c0d21f40d4ac48a5de24f4e676aabb25609eeaa/0x2 603s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Tree" => "62e2a8fcc9572dc72790d67be9c753469f57babe","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0c0d21f40d4ac48a5de24f4e676aabb25609eeaa"}],"CommitId" => "0a95c54d83f58868424320adfcbd6741eec6d7fb","Hdr" => "tree 62e2a8fcc9572dc72790d67be9c753469f57babe\nparent 0c0d21f40d4ac48a5de24f4e676aabb25609eeaa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs 5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2 5f989474269c5f9f85e50eb863557e4acc9931f6 = 0x2 603s git-debrebase classify 0c0d21f40d4ac48a5de24f4e676aabb25609eeaa $t=5f989474269c5f9f85e50eb863557e4acc9931f6 @p 5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2/0x2 603s git-debrebase = Upstream {"Tree" => "5f989474269c5f9f85e50eb863557e4acc9931f6","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "0c0d21f40d4ac48a5de24f4e676aabb25609eeaa","Hdr" => "tree 5f989474269c5f9f85e50eb863557e4acc9931f6\nparent 5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs 6ac05f6d6d143a1a7d2257471271c397c8fdca8c b386504eb760ec772dfb42e6c16ccaa06a934c8a = 0x2 603s git-debrebase classify 5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2 $t=b386504eb760ec772dfb42e6c16ccaa06a934c8a @p 6ac05f6d6d143a1a7d2257471271c397c8fdca8c/0x2 603s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ac05f6d6d143a1a7d2257471271c397c8fdca8c","Differs" => 2,"Ix" => 0}],"Tree" => "b386504eb760ec772dfb42e6c16ccaa06a934c8a","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2","Hdr" => "tree b386504eb760ec772dfb42e6c16ccaa06a934c8a\nparent 6ac05f6d6d143a1a7d2257471271c397c8fdca8c\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs 023614651af5ce3827d642870cc1316dd52f8145 9fa84e41ba2d36ad31b92535699efbaf230d6473 = 0x2 603s git-debrebase classify 6ac05f6d6d143a1a7d2257471271c397c8fdca8c $t=9fa84e41ba2d36ad31b92535699efbaf230d6473 @p 023614651af5ce3827d642870cc1316dd52f8145/0x2 603s git-debrebase = Upstream {"Tree" => "9fa84e41ba2d36ad31b92535699efbaf230d6473","Parents" => [{"CommitId" => "023614651af5ce3827d642870cc1316dd52f8145","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "6ac05f6d6d143a1a7d2257471271c397c8fdca8c","Hdr" => "tree 9fa84e41ba2d36ad31b92535699efbaf230d6473\nparent 023614651af5ce3827d642870cc1316dd52f8145\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7 = 0x10 603s git-debrebase classify 023614651af5ce3827d642870cc1316dd52f8145 $t=aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7 @p b0fc5dcc2165bb4fae763a0f55d1e91a6595b185/0x10 603s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Tree" => "aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "b0fc5dcc2165bb4fae763a0f55d1e91a6595b185"}],"CommitId" => "023614651af5ce3827d642870cc1316dd52f8145","Hdr" => "tree aaadb3ecf5045ef6aba52a0fa4dfaad403c070b7\nparent b0fc5dcc2165bb4fae763a0f55d1e91a6595b185\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 603s git-debrebase get_differs 97bc60f079fe0c6c409d8e0a948ea18ce7578807 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 = 0x2 603s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 = 0x30 603s git-debrebase classify b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 $t=16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2 @p 97bc60f079fe0c6c409d8e0a948ea18ce7578807/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 603s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48,"Ix" => 1}],"Hdr" => "tree 16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2\nparent 97bc60f079fe0c6c409d8e0a948ea18ce7578807\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "16ac2b48a5dfedd4cb3f6474f5b1431ae61aa9a2","CommitId" => "b0fc5dcc2165bb4fae763a0f55d1e91a6595b185","Type" => "Anchor","Parents" => [{"CommitId" => "97bc60f079fe0c6c409d8e0a948ea18ce7578807","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]]} 603s git-debrebase *** WALK prep done cur=b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 brw 0 upp 6 proc 8 pm -1 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase WALK REBUILD b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 9 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase WALK BUILD 023614651af5ce3827d642870cc1316dd52f8145 Debian (rewriting=0) 603s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 603s git-debrebase WALK BUILD 6ac05f6d6d143a1a7d2257471271c397c8fdca8c Upstream (rewriting=0) 603s git-debrebase WALK BUILD 5a6f12f89315ff0edb44cae8ce70bcfa6e7cfca2 Upstream (rewriting=0) 603s git-debrebase WALK BUILD 0c0d21f40d4ac48a5de24f4e676aabb25609eeaa Upstream (rewriting=0) 603s git-debrebase WALK BUILD 0a95c54d83f58868424320adfcbd6741eec6d7fb Upstream (rewriting=0) 603s git-debrebase WALK BUILD a20afc7d27d2203bf64f75721a77d046d72806ee Upstream (rewriting=0) 603s git-debrebase WALK BUILD 015b07ce9f28da2204e7c197b5b3849ae79a053f Upstream (rewriting=0) 603s git-debrebase WALK BUILD 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 Upstream (rewriting=0) 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase get_differs 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 = 0 603s git-debrebase *** WALK RETURN 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 023614651af5ce3827d642870cc1316dd52f8145 b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 603s git-debrebase mwrecknote right-input 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 603s git-debrebase mwrecknote right-laundered 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 603s git-debrebase mwrecknote right-breakwater 023614651af5ce3827d642870cc1316dd52f8145 603s git-debrebase mwrecknote right-anchor b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 603s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 603s git-debrebase mwrecknote result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase |> 9638c2110033b719cc742997b9527505ffdc1a65 commit refs/debrebase/wreckage/junk 603s git-debrebase >= delete refs/debrebase/wreckage/junk 603s git-debrebase >$ 603s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge a18eb0fcc623f81073418fca8af36925e50ad95f 603s git-debrebase >= create refs/debrebase/wreckage/right-anchor b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 603s git-debrebase >= create refs/debrebase/wreckage/right-laundered 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 603s git-debrebase >= create refs/debrebase/wreckage/left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 603s git-debrebase >= create refs/debrebase/wreckage/left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase >= create refs/debrebase/wreckage/result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 603s git-debrebase >= create refs/debrebase/wreckage/left-laundered 467a69243e82d5769a0b597e988a831c035e0346 603s git-debrebase >= create refs/debrebase/wreckage/right-input 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 603s git-debrebase >= create refs/debrebase/wreckage/left-input 467a69243e82d5769a0b597e988a831c035e0346 603s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 023614651af5ce3827d642870cc1316dd52f8145 603s git-debrebase >$ 603s 603s git-debrebase: Merge resolution failed: divergent anchors 603s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 603s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 603s + local 'ps=15 0' 603s + set -o pipefail 603s + case $ps in 603s + t-grep-mpat 'F:divergent anchors' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s + local 'mpat=F:divergent anchors' 603s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s + local grepper=fgrep 603s + case "$mpat" in 603s + case "$mpat" in 603s + grepper=fgrep 603s + mpat='divergent anchors' 603s + fgrep -e 'divergent anchors' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s git-debrebase: Merge resolution failed: divergent anchors 603s + wreckage-after 603s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 603s ++ local ref=refs/debrebase/wreckage/junk 603s ++ case "$ref" in 603s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 603s + test '' = '' 603s + git for-each-ref refs/debrebase/wreckage 603s + egrep . 603s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 603s ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 603s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 603s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 603s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 603s b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 commit refs/debrebase/wreckage/right-anchor 603s 023614651af5ce3827d642870cc1316dd52f8145 commit refs/debrebase/wreckage/right-breakwater 603s 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 commit refs/debrebase/wreckage/right-input 603s 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 commit refs/debrebase/wreckage/right-laundered 603s a18eb0fcc623f81073418fca8af36925e50ad95f commit refs/debrebase/wreckage/vanilla-merge 603s + : ===== late failure in apply ===== 603s + git checkout other 603s Switched to branch 'other' 603s + git reset --hard other-before-new-upstream 603s HEAD is now at cef09e1 MIXED add both(-other) (other) 603s + echo other-upstream-confict 603s + git commit -m other-upstream-conflict docs/README 603s [other 18a23e7] other-upstream-conflict 603s 1 file changed, 1 insertion(+) 603s + t-git-debrebase quick 603s + local gdr=git-debrebase 603s + : ' 603s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 603s + git-debrebase --dgit=dgit -D --experimental-merge-resolution quick 603s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 603s git-debrebase *** WALK 18a23e71d5922b9af63898bc4e1bd65813007ca3 0 - 603s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 603s git-debrebase classify 18a23e71d5922b9af63898bc4e1bd65813007ca3 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x2 603s git-debrebase = Upstream {"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","CommitId" => "18a23e71d5922b9af63898bc4e1bd65813007ca3","Msg" => "other-upstream-conflict\n","Parents" => [{"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Differs" => 2,"Ix" => 0}],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 603s git-debrebase get_differs c441f3b13985fc4b000fd25c35a60b7026a9d477 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 603s git-debrebase classify cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c441f3b13985fc4b000fd25c35a60b7026a9d477/0x22 603s git-debrebase = Mixed {"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c441f3b13985fc4b000fd25c35a60b7026a9d477\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Mixed","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Msg" => "MIXED add both(-other) (other)\n","Parents" => [{"CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Ix" => 0,"Differs" => 34}]} 603s git-debrebase get_differs 16fdcfc4a487589ef6e2aed24a5d717bde301a34 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 603s git-debrebase classify c441f3b13985fc4b000fd25c35a60b7026a9d477 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 16fdcfc4a487589ef6e2aed24a5d717bde301a34/0x2 603s git-debrebase = Upstream {"Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Parents" => [{"CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 16fdcfc4a487589ef6e2aed24a5d717bde301a34\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Upstream"} 603s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 603s git-debrebase classify 16fdcfc4a487589ef6e2aed24a5d717bde301a34 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p 25b5400e549fae4178ac03009ca007e4d5de00dc/0x20 603s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"}],"Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Packaging"} 603s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 603s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 603s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 603s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136"},{"Differs" => 0,"Ix" => 1,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858"}],"Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Pseudomerge","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","SubType" => "Ambiguous","Overwritten" => [$VAR1->{"Parents"}[1]]} 603s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 603s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 603s git-debrebase = Upstream {"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Differs" => 2,"Ix" => 0}],"Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136"} 603s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 603s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 603s git-debrebase = Upstream {"Parents" => [{"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Differs" => 2,"Ix" => 0}],"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Type" => "Upstream","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 603s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 603s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 603s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3"} 603s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 603s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 603s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5"}],"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 603s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 603s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 603s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5"} 603s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 603s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 603s git-debrebase = Packaging {"Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 603s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 603s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 603s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging"} 603s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 603s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 603s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n"} 603s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 603s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 603s git-debrebase = Changelog {"Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 603s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 603s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 603s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 603s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 603s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 6 upp 8 proc 16 pm 0 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 603s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 603s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 603s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 603s git-debrebase WALK BUILD 16fdcfc4a487589ef6e2aed24a5d717bde301a34 Debian (rewriting=0) 603s git-debrebase WALK REWRITING NOW cl=HASH(0x55f55c93c0b0) procd=HASH(0x55f55c9dd2b0) 603s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 603s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Debian (rewriting=1) 603s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 603s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=1) 603s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=1) 603s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=1) 603s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=1) 603s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=1) 603s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 603s git-debrebase WALK BUILD c441f3b13985fc4b000fd25c35a60b7026a9d477 Upstream (rewriting=1) 603s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Upstream (rewriting=1) 603s git-debrebase WALK BUILD 18a23e71d5922b9af63898bc4e1bd65813007ca3 Upstream (rewriting=1) 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 18a23e71d5922b9af63898bc4e1bd65813007ca3 = 0 603s git-debrebase *** WALK RETURN bd179e191d494353ea91ab4d4b6cdc467f16d7a8 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 603s git-debrebase: laundered (head was 18a23e71d5922b9af63898bc4e1bd65813007ca3) 603s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 603s git-debrebase |> ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 603s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 603s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 603s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 603s git-debrebase |> b0fc5dcc2165bb4fae763a0f55d1e91a6595b185 commit refs/debrebase/wreckage/right-anchor 603s git-debrebase |> 023614651af5ce3827d642870cc1316dd52f8145 commit refs/debrebase/wreckage/right-breakwater 603s git-debrebase |> 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 commit refs/debrebase/wreckage/right-input 603s git-debrebase |> 507ff8131693beea35e7bc3f9b9fc7d7c10c79a0 commit refs/debrebase/wreckage/right-laundered 603s git-debrebase |> a18eb0fcc623f81073418fca8af36925e50ad95f commit refs/debrebase/wreckage/vanilla-merge 603s git-debrebase >= update HEAD bd179e191d494353ea91ab4d4b6cdc467f16d7a8 18a23e71d5922b9af63898bc4e1bd65813007ca3 603s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 603s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 603s git-debrebase >= delete refs/debrebase/wreckage/left-input 603s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 603s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 603s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 603s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 603s git-debrebase >= delete refs/debrebase/wreckage/right-input 603s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 603s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 603s git-debrebase >$ 603s git-debrebase ffq_prev_branchinfo branch current refs/heads/other 603s git-debrebase get_differs 7f51c163ab51e794d055532606e43df7f0d7dd89 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 603s git-debrebase classify bd179e191d494353ea91ab4d4b6cdc467f16d7a8 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 7f51c163ab51e794d055532606e43df7f0d7dd89/0x2 603s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 7f51c163ab51e794d055532606e43df7f0d7dd89\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Ix" => 0,"Differs" => 2}],"Msg" => "other-upstream-conflict\n","CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91"} 603s git-debrebase get_differs b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 603s git-debrebase classify 7f51c163ab51e794d055532606e43df7f0d7dd89 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6/0x2 603s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Parents" => [{"CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 603s git-debrebase get_differs acbad39d3bee952d3c1e83e02323cd3376e205b7 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 603s git-debrebase classify b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p acbad39d3bee952d3c1e83e02323cd3376e205b7/0x2 603s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Parents" => [{"CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent acbad39d3bee952d3c1e83e02323cd3376e205b7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 603s git-debrebase get_differs fcb37ae5bbf1908498f9e68b5b785a4f2855f575 303c71503c03080bda903ee6582757788559a305 = 0x2 603s git-debrebase classify acbad39d3bee952d3c1e83e02323cd3376e205b7 $t=303c71503c03080bda903ee6582757788559a305 @p fcb37ae5bbf1908498f9e68b5b785a4f2855f575/0x2 603s git-debrebase = Upstream {"Parents" => [{"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Tree" => "303c71503c03080bda903ee6582757788559a305","Type" => "Upstream","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent fcb37ae5bbf1908498f9e68b5b785a4f2855f575\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 603s git-debrebase get_differs 4179c6198fc291aa475cbd4bae0c3ff359125ad7 af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 603s git-debrebase classify fcb37ae5bbf1908498f9e68b5b785a4f2855f575 $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p 4179c6198fc291aa475cbd4bae0c3ff359125ad7/0x2 603s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7"}],"Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent 4179c6198fc291aa475cbd4bae0c3ff359125ad7\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream"} 603s git-debrebase get_differs 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 603s git-debrebase classify 4179c6198fc291aa475cbd4bae0c3ff359125ad7 $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p 3e3ae41bfee8222eb624578f62fe08e0dafd8b00/0x2 603s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent 3e3ae41bfee8222eb624578f62fe08e0dafd8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00"}],"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683"} 603s git-debrebase get_differs 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 603s git-debrebase classify 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055/0x2 603s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055"}],"Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 603s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 603s git-debrebase classify 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x2 603s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d"}],"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","Type" => "Upstream","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 603s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 603s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 603s git-debrebase = Packaging {"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 603s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 603s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 603s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Msg" => "DEBIAN add zorkmid-other (other)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging"} 603s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 603s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 603s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging"} 603s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 603s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 603s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 603s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 603s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 603s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 603s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 603s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 603s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 603s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 603s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 603s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 603s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor"} 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 603s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 603s git-debrebase >= delete refs/ffq-prev/heads/other cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 603s git-debrebase >= update refs/debrebase-last/heads/other 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 0000000000000000000000000000000000000000 603s git-debrebase >= update HEAD 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 bd179e191d494353ea91ab4d4b6cdc467f16d7a8 603s git-debrebase >$ 603s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 603s ' 603s + no-wreckage 603s + git for-each-ref refs/debrebase/wreckage 603s + egrep . 603s + : ----- make the merge ----- 603s + git checkout master 603s Switched to branch 'master' 603s Your branch and 'origin/master' have diverged, 603s and have 24 and 5 different commits each, respectively. 603s (use "git pull" to merge the remote branch into yours) 603s + git reset --hard master-before-merge 603s HEAD is now at 467a692 MIXED add both() (before) 603s + t-merge-conflicted-stripping-conflict-markers other docs/README 603s + local otherbranch=other 603s + local file=docs/README 603s + t-expect-fail 'F:Merge conflict in docs/README' git merge other 603s + local 'mpat=F:Merge conflict in docs/README' 603s + shift 603s + set +o pipefail 603s + LC_MESSAGES=C 603s + LANGUAGE=C 603s + git merge other 603s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s Auto-merging docs/README 603s CONFLICT (content): Merge conflict in docs/README 603s Automatic merge failed; fix conflicts and then commit the result. 603s + local 'ps=1 0' 603s + set -o pipefail 603s + case $ps in 603s + t-grep-mpat 'F:Merge conflict in docs/README' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s + local 'mpat=F:Merge conflict in docs/README' 603s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s + local grepper=fgrep 603s + case "$mpat" in 603s + case "$mpat" in 603s + grepper=fgrep 603s + mpat='Merge conflict in docs/README' 603s + fgrep -e 'Merge conflict in docs/README' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 603s CONFLICT (content): Merge conflict in docs/README 603s + perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' docs/README 603s + git add docs/README 603s + git commit --no-edit 603s [master 79e5fb1] Merge branch 'other' 603s + t-git-debrebase stitch 603s + local gdr=git-debrebase 603s + : ' 603s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 603s + git-debrebase --dgit=dgit -D --experimental-merge-resolution stitch 603s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 604s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 604s git-debrebase get_differs 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 604s git-debrebase classify 79e5fb135acf901c0f51d5233a8abe7d2dfce654 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 467a69243e82d5769a0b597e988a831c035e0346/0x22 5954d5919ea862b2bf22bcfd1a474be4d70c15a6/0x12 604s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Parents" => [{"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Ix" => 0,"IsDgitImport" => undef,"IsOrigin" => "","Differs" => 34},{"IsOrigin" => "","Differs" => 18,"IsDgitImport" => undef,"Ix" => 1,"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6"}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase >= delete refs/ffq-prev/heads/master 25b5400e549fae4178ac03009ca007e4d5de00dc 604s git-debrebase >= update refs/debrebase-last/heads/master af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0000000000000000000000000000000000000000 604s git-debrebase >= update HEAD af2ef87bf0e79ccd76f5aa1d589f1debd036f168 79e5fb135acf901c0f51d5233a8abe7d2dfce654 604s git-debrebase >$ 604s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 604s ' 604s + : ----- expect failure ----- 604s + wreckage-before 604s + junkref=refs/debrebase/wreckage/junk 604s + git update-ref refs/debrebase/wreckage/junk v2.1 604s + t-expect-fail F:docs/README t-git-debrebase 604s + local mpat=F:docs/README 604s + shift 604s + set +o pipefail 604s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 604s + LC_MESSAGES=C 604s + LANGUAGE=C 604s + t-git-debrebase 604s + local gdr=git-debrebase 604s + : ' 604s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 604s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 604s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 604s git-debrebase ffq check_specs * 604s git-debrebase ffq merge master 604s git-debrebase ffq check_remote origin remote fetch/merge branch 604s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 604s OK, you are ahead of refs/remotes/origin/master 604s git-debrebase ffq check_remote undef remote push branch 604s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 604s git-debrebase *** WALK af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0 - 604s git-debrebase get_differs 79e5fb135acf901c0f51d5233a8abe7d2dfce654 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 604s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 604s git-debrebase classify af2ef87bf0e79ccd76f5aa1d589f1debd036f168 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 79e5fb135acf901c0f51d5233a8abe7d2dfce654/0 25b5400e549fae4178ac03009ca007e4d5de00dc/0x32 604s git-debrebase = Pseudomerge {"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Type" => "Pseudomerge","Contributor" => {"Differs" => 0,"CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Ix" => 0},"Overwritten" => [{"Differs" => 50,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Ix" => 1}],"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 79e5fb135acf901c0f51d5233a8abe7d2dfce654\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "af2ef87bf0e79ccd76f5aa1d589f1debd036f168","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 604s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 604s git-debrebase get_differs 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 604s git-debrebase classify 79e5fb135acf901c0f51d5233a8abe7d2dfce654 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 467a69243e82d5769a0b597e988a831c035e0346/0x22 5954d5919ea862b2bf22bcfd1a474be4d70c15a6/0x12 604s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Parents" => [{"Ix" => 0,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","IsOrigin" => "","IsDgitImport" => undef,"Differs" => 34},{"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Ix" => 1,"Differs" => 18,"IsOrigin" => "","IsDgitImport" => undef}]} 604s git-debrebase *** MERGE 604s git-debrebase mwrecknote vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 604s git-debrebase *** WALK 467a69243e82d5769a0b597e988a831c035e0346 0 - 604s git-debrebase get_differs 2b434c87b1d02515dc906fa7640bdea60c79d838 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 604s git-debrebase classify 467a69243e82d5769a0b597e988a831c035e0346 $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p 2b434c87b1d02515dc906fa7640bdea60c79d838/0x2 604s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Differs" => 2}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent 2b434c87b1d02515dc906fa7640bdea60c79d838\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9"} 604s git-debrebase get_differs 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f b572e0b33b388437b34057c7e203744c52d82138 = 0x2 604s git-debrebase classify 2b434c87b1d02515dc906fa7640bdea60c79d838 $t=b572e0b33b388437b34057c7e203744c52d82138 @p 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f/0x2 604s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"}]} 604s git-debrebase get_differs 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 604s git-debrebase classify 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a/0x2 604s git-debrebase = Upstream {"Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f","Type" => "Upstream","Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882"} 604s git-debrebase get_differs af5a52a6968ffe9195debdeba1ad551cfbd331b5 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 604s git-debrebase classify 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p af5a52a6968ffe9195debdeba1ad551cfbd331b5/0x2 604s git-debrebase = Upstream {"Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent af5a52a6968ffe9195debdeba1ad551cfbd331b5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Ix" => 0,"Differs" => 2}],"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Type" => "Upstream"} 604s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 604s git-debrebase classify af5a52a6968ffe9195debdeba1ad551cfbd331b5 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x2 604s git-debrebase = Upstream {"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Parents" => [{"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a"} 604s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 604s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 604s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Parents" => [{"Differs" => 16,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Ix" => 0}],"Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","Tree" => "9d383022823105715207a03601780dbceeb8ee4d"} 604s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 604s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 604s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 604s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","OrigParents" => [{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 604s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp 4 proc 6 pm -1 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase WALK REBUILD 1b928d4b44e70ba8dfce10ff5b94945f972091da 7 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase WALK BUILD ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Debian (rewriting=0) 604s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 604s git-debrebase WALK BUILD af5a52a6968ffe9195debdeba1ad551cfbd331b5 Upstream (rewriting=0) 604s git-debrebase WALK BUILD 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a Upstream (rewriting=0) 604s git-debrebase WALK BUILD 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f Upstream (rewriting=0) 604s git-debrebase WALK BUILD 2b434c87b1d02515dc906fa7640bdea60c79d838 Upstream (rewriting=0) 604s git-debrebase WALK BUILD 467a69243e82d5769a0b597e988a831c035e0346 Upstream (rewriting=0) 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 467a69243e82d5769a0b597e988a831c035e0346 = 0 604s git-debrebase *** WALK RETURN 467a69243e82d5769a0b597e988a831c035e0346 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1b928d4b44e70ba8dfce10ff5b94945f972091da 604s git-debrebase mwrecknote left-input 467a69243e82d5769a0b597e988a831c035e0346 604s git-debrebase mwrecknote left-laundered 467a69243e82d5769a0b597e988a831c035e0346 604s git-debrebase mwrecknote left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 604s git-debrebase mwrecknote left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 604s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1b928d4b44e70ba8dfce10ff5b94945f972091da 604s git-debrebase *** WALK 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 0 - 604s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 604s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 604s git-debrebase classify 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p bd179e191d494353ea91ab4d4b6cdc467f16d7a8/0 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x2 604s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Ix" => 1,"Differs" => 2}],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent bd179e191d494353ea91ab4d4b6cdc467f16d7a8\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8"},$VAR1->{"Overwritten"}[0]],"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0]} 604s git-debrebase get_differs 7f51c163ab51e794d055532606e43df7f0d7dd89 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 604s git-debrebase classify bd179e191d494353ea91ab4d4b6cdc467f16d7a8 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 7f51c163ab51e794d055532606e43df7f0d7dd89/0x2 604s git-debrebase = Upstream {"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Type" => "Upstream","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 7f51c163ab51e794d055532606e43df7f0d7dd89\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8","Msg" => "other-upstream-conflict\n","Parents" => [{"CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Ix" => 0,"Differs" => 2}]} 604s git-debrebase get_differs b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 604s git-debrebase classify 7f51c163ab51e794d055532606e43df7f0d7dd89 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6/0x2 604s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6"}],"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 604s git-debrebase get_differs acbad39d3bee952d3c1e83e02323cd3376e205b7 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 604s git-debrebase classify b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p acbad39d3bee952d3c1e83e02323cd3376e205b7/0x2 604s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Differs" => 2}],"Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent acbad39d3bee952d3c1e83e02323cd3376e205b7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975"} 604s git-debrebase get_differs fcb37ae5bbf1908498f9e68b5b785a4f2855f575 303c71503c03080bda903ee6582757788559a305 = 0x2 604s git-debrebase classify acbad39d3bee952d3c1e83e02323cd3376e205b7 $t=303c71503c03080bda903ee6582757788559a305 @p fcb37ae5bbf1908498f9e68b5b785a4f2855f575/0x2 604s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent fcb37ae5bbf1908498f9e68b5b785a4f2855f575\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "303c71503c03080bda903ee6582757788559a305"} 604s git-debrebase get_differs 4179c6198fc291aa475cbd4bae0c3ff359125ad7 af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 604s git-debrebase classify fcb37ae5bbf1908498f9e68b5b785a4f2855f575 $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p 4179c6198fc291aa475cbd4bae0c3ff359125ad7/0x2 604s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7"}],"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent 4179c6198fc291aa475cbd4bae0c3ff359125ad7\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Type" => "Upstream"} 604s git-debrebase get_differs 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 604s git-debrebase classify 4179c6198fc291aa475cbd4bae0c3ff359125ad7 $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p 3e3ae41bfee8222eb624578f62fe08e0dafd8b00/0x2 604s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7","Parents" => [{"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Ix" => 0,"Differs" => 2}],"Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent 3e3ae41bfee8222eb624578f62fe08e0dafd8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 604s git-debrebase get_differs 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 604s git-debrebase classify 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055/0x2 604s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Parents" => [{"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n"} 604s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 604s git-debrebase classify 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x2 604s git-debrebase = Upstream {"Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Parents" => [{"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b"} 604s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 604s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 604s git-debrebase = Packaging {"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Type" => "Packaging","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Ix" => 0,"Differs" => 32}],"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n"} 604s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 604s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 604s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}],"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 604s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 604s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 604s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 604s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 604s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 604s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging"} 604s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 604s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 604s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}],"Msg" => "dch -r -D unstable\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 604s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 604s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 604s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 604s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 604s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 604s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 604s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 604s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 5 upp 8 proc 16 pm 0 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 604s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 604s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 604s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 604s git-debrebase WALK BUILD 031a9344309867022099bf265d1410cd72fa8d3d Debian (rewriting=0) 604s git-debrebase WALK BUILD 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d Debian (rewriting=0) 604s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 604s git-debrebase WALK BUILD 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 Upstream (rewriting=0) 604s git-debrebase WALK BUILD 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 Upstream (rewriting=0) 604s git-debrebase WALK BUILD 4179c6198fc291aa475cbd4bae0c3ff359125ad7 Upstream (rewriting=0) 604s git-debrebase WALK BUILD fcb37ae5bbf1908498f9e68b5b785a4f2855f575 Upstream (rewriting=0) 604s git-debrebase WALK BUILD acbad39d3bee952d3c1e83e02323cd3376e205b7 Upstream (rewriting=0) 604s git-debrebase WALK BUILD b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 Upstream (rewriting=0) 604s git-debrebase WALK BUILD 7f51c163ab51e794d055532606e43df7f0d7dd89 Upstream (rewriting=0) 604s git-debrebase WALK BUILD bd179e191d494353ea91ab4d4b6cdc467f16d7a8 Upstream (rewriting=0) 604s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 = 0 604s git-debrebase *** WALK RETURN bd179e191d494353ea91ab4d4b6cdc467f16d7a8 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 604s git-debrebase mwrecknote right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 604s git-debrebase mwrecknote right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 604s git-debrebase mwrecknote right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 604s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 604s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 604s git-debrebase mwrecknote result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 604s git-debrebase mwrecknote interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 604s git-debrebase *** WALK 075ef1bebca2f99591cafd47f62fb9ceb67c6317 0 - 604s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 604s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 604s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 604s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 604s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 604s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging"} 604s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 604s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 604s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16}],"Msg" => "dch -r -D unstable\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 604s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 604s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 604s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 604s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 604s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 604s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 604s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 604s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp -1 proc 4 pm -1 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 604s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 604s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 604s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 604s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 0 604s git-debrebase *** WALK RETURN 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 604s git-debrebase mwrecknote mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 604s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 604s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 604s git-debrebase *** WALK prep done cur=79e5fb135acf901c0f51d5233a8abe7d2dfce654 brw 0 upp 1 proc 2 pm 0 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase WALK REBUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 3 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 604s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeCreateMergedBreakwaters (rewriting=0) 604s Found a general merge, will try to tidy it up. 604s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 604s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeMergeSeries (rewriting=1) 604s git-debrebase >(no reflog) 604s Running merge resolution for 79e5fb135acf901c0f51d5233a8abe7d2dfce654... 604s git-debrebase mwrecknote new-base dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 604s git-debrebase merge_series newbase=dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 604s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 604s git-debrebase gbp_pq_export p-base 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 604s git-debrebase merge_series pec 32ad18c186179cccfeba5b5c76acf6615e6ed4bf pec' e53db5897f3e70efea4fb29fd4421bb620a52d31 604s git-debrebase mwrecknote mergebase-patchqueue e53db5897f3e70efea4fb29fd4421bb620a52d31 604s git-debrebase gbp_pq_export p-1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d bd179e191d494353ea91ab4d4b6cdc467f16d7a8 604s git-debrebase merge_series pec 852b87318dc979550927510c6df308180cdfb726 pec' 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 604s git-debrebase mwrecknote right-patchqueue 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 604s git-debrebase gbp_pq_export p-0 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 467a69243e82d5769a0b597e988a831c035e0346 605s git-debrebase merge_series pec 3ff16004a8aa38e20d64f56be668549b69a55aa2 pec' 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 605s git-debrebase mwrecknote left-patchqueue 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 605s git-debrebase merge_series merging... 605s git-debrebase merge_series merge ok, series... 605s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 605s merge_series patch 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 605s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 605s merge_series patch 0005-MIXED-add-both-before.patch keep 605s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 605s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 605s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 605s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 605s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 605s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 605s merge_series patch 0007-MIXED-add-both-other-other.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 605s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 605s merge_series patch 0008-other-upstream-conflict.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0002-Edit-the-.c-file.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0005-MIXED-add-both-before.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> 0007-MIXED-add-both-other-other.patch keep 605s merge_series prereq 0008-other-upstream-conflict.patch -> subdir/addnewups keep 605s merge_series patch subdir/addnewups keep 605s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 605s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 605s merge_series series next 0001-Add-a-new-upstream-file.patch 605s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 605s git-debrebase merge_series series next subdir/addnewups 605s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 605s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 605s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 605s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 605s git-debrebase merge_series series next 0008-other-upstream-conflict.patch 605s git-debrebase mwrecknote merged-patchqueue 3840368931deddda0a8ca19bda2fdb89b527d878 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 605s git-debrebase merge_series series gbp pq import 605s gbp:info: Trying to apply patches at '3840368931deddda0a8ca19bda2fdb89b527d878' 605s gbp:warning: Patch 0008-other-upstream-conflict.patch failed to apply, retrying with whitespace fixup 605s gbp:error: Failed to apply '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 605s error: docs/README: patch does not apply 605s gbp:error: Couldn't apply patches 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 605s git-debrebase |> 9638c2110033b719cc742997b9527505ffdc1a65 commit refs/debrebase/wreckage/junk 605s git-debrebase >= delete refs/debrebase/wreckage/junk 605s git-debrebase >$ 605s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 605s git-debrebase >= create refs/debrebase/wreckage/merged-patchqueue 3840368931deddda0a8ca19bda2fdb89b527d878 605s git-debrebase >= create refs/debrebase/wreckage/left-patchqueue 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 605s git-debrebase >= create refs/debrebase/wreckage/left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 605s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 605s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 605s git-debrebase >= create refs/debrebase/wreckage/mergebase-patchqueue e53db5897f3e70efea4fb29fd4421bb620a52d31 605s git-debrebase >= create refs/debrebase/wreckage/left-input 467a69243e82d5769a0b597e988a831c035e0346 605s git-debrebase >= create refs/debrebase/wreckage/right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 605s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 605s git-debrebase >= create refs/debrebase/wreckage/left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 605s git-debrebase >= create refs/debrebase/wreckage/left-laundered 467a69243e82d5769a0b597e988a831c035e0346 605s git-debrebase >= create refs/debrebase/wreckage/right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 605s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 605s git-debrebase >= create refs/debrebase/wreckage/new-base dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 605s git-debrebase >= create refs/debrebase/wreckage/right-patchqueue 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 605s git-debrebase >= create refs/debrebase/wreckage/right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 605s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 605s git-debrebase >= create refs/debrebase/wreckage/result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 605s git-debrebase >$ 605s 605s git-debrebase: Merge resolution failed: subprocess failed with error exit status 1 605s git-debrebase: failed command: gbp pq import 605s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 605s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 605s + local 'ps=15 0' 605s + set -o pipefail 605s + case $ps in 605s + t-grep-mpat F:docs/README /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 605s + local mpat=F:docs/README 605s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 605s + local grepper=fgrep 605s + case "$mpat" in 605s + case "$mpat" in 605s + grepper=fgrep 605s + mpat=docs/README 605s + fgrep -e docs/README /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 605s git-debrebase = VanillaMerge {"Type" => "VanillaMerge","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Parents" => [{"Ix" => 0,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","IsOrigin" => "","IsDgitImport" => undef,"Differs" => 34},{"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Ix" => 1,"Differs" => 18,"IsOrigin" => "","IsDgitImport" => undef}]} 605s gbp:error: Failed to apply '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 605s error: docs/README: patch does not apply 605s + wreckage-after 605s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 605s ++ local ref=refs/debrebase/wreckage/junk 605s ++ case "$ref" in 605s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 605s + test '' = '' 605s + git for-each-ref refs/debrebase/wreckage 605s + egrep . 605s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 605s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 605s ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 605s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 605s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 605s 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 commit refs/debrebase/wreckage/left-patchqueue 605s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/mergebase-anchor 605s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-breakwater 605s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-laundered 605s e53db5897f3e70efea4fb29fd4421bb620a52d31 commit refs/debrebase/wreckage/mergebase-patchqueue 605s 3840368931deddda0a8ca19bda2fdb89b527d878 commit refs/debrebase/wreckage/merged-patchqueue 605s dca9d4a9e078da5f3297cb5b1fbe181facc58b6f commit refs/debrebase/wreckage/new-base 605s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 605s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/right-anchor 605s 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d commit refs/debrebase/wreckage/right-breakwater 605s 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 commit refs/debrebase/wreckage/right-input 605s bd179e191d494353ea91ab4d4b6cdc467f16d7a8 commit refs/debrebase/wreckage/right-laundered 605s 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd commit refs/debrebase/wreckage/right-patchqueue 605s 79e5fb135acf901c0f51d5233a8abe7d2dfce654 commit refs/debrebase/wreckage/vanilla-merge 605s + : ===== resolve the conflict ===== 605s + : ----- badly ----- 605s + quilt_faff_before 1 605s + git checkout -b fix1 debrebase/wreckage/merged-patchqueue 605s Switched to a new branch 'fix1' 605s + QUILT_PATCHES=debian/patches 605s + quilt push -a 605s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 605s patching file new-upstream-file 605s 605s Applying patch debian/patches/0002-Edit-the-.c-file.patch 605s patching file src.c 605s 605s Applying patch debian/patches/subdir/addnewups 605s patching file lib.c 605s 605s Applying patch debian/patches/0004-UPSTREAM-edit-src.c-before.patch 605s patching file src.c 605s 605s Applying patch debian/patches/0005-MIXED-add-both-before.patch 605s patching file src.c 605s 605s Applying patch debian/patches/0006-UPSTREAM-edit-src-other.c-other.patch 605s patching file src-other.c 605s 605s Applying patch debian/patches/0007-MIXED-add-both-other-other.patch 605s patching file src-other.c 605s 605s Applying patch debian/patches/0008-other-upstream-conflict.patch 605s patching file docs/README 605s Hunk #1 succeeded at 1 with fuzz 2. 605s 605s Now at patch debian/patches/0008-other-upstream-conflict.patch 605s + quilt_faff_after 605s + QUILT_PATCHES=debian/patches 605s + quilt refresh 605s Refreshed patch debian/patches/0008-other-upstream-conflict.patch 605s + git add debian/patches 605s + git commit -m FIX 605s [fix1 e52c477] FIX 605s 1 file changed, 6 insertions(+), 5 deletions(-) 605s + git reset --hard 605s HEAD is now at e52c477 FIX 605s + git clean -xdff 605s Removing .pc/ 605s Removing debian/patches/0008-other-upstream-conflict.patch~ 605s Removing docs/README~ 605s Removing lib.c 605s Removing new-upstream-file 605s Removing src-other.c 605s + t-git-debrebase record-resolved-merge 605s + local gdr=git-debrebase 605s + : ' 605s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 605s + git-debrebase --dgit=dgit -D --experimental-merge-resolution record-resolved-merge 605s Checking how you have resolved the merge problem 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 605s Seems to be vanilla-merge patchqueue. 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 605s git-debrebase merge_series series gbp pq import 605s gbp:info: Trying to apply patches at 'e52c477995943c97091f3f621f3f69ce8e2e61a0' 605s gbp:info: 8 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 605s git-debrebase merge_series series ok, building... 605s git-debrebase merge_series series ok, building 6b012e264dd7aef38cea7bd91fd87d60dac0cab9 605s git-debrebase merge_series series ok, building 5d3258656f8b3fe02eee65fe560caf37a8b6e352 605s git-debrebase merge_series series ok, building 0d54f2d565e1108e3de03555dfa29fb771abd689 605s git-debrebase merge_series series ok, building 8fa81c268a12715f84f61988b22e7ddbd9c4530a 605s git-debrebase merge_series series ok, building 8fe1f617db8f62f3679e0f5c760637e49d326fbc 605s git-debrebase merge_series series ok, building f7878df37e4672d7f5ad944095083bdefa3bba2f 605s git-debrebase merge_series series ok, building 83e17e617c47ce91d4fd23832acb13295a93bbda 605s git-debrebase merge_series series ok, building ede6131a6dc537ee413953d7be44668bdf613e35 605s git-debrebase mwrecknote merged-result a30adac81160c29ee9cd94e1730b00d2b8479c3c 605s git-debrebase merge_series done debug=9dca330d5222391a31773fe4d252367a7c062227 605s git-debrebase mwrecknote merged-debug 9dca330d5222391a31773fe4d252367a7c062227 605s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 605s git-debrebase merge_series returns a30adac81160c29ee9cd94e1730b00d2b8479c3c 605s OK. You can switch branches and try git-debrebase again. 605s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 605s ' 605s + git checkout master 605s Switched to branch 'master' 605s Your branch is ahead of 'origin/master' by 37 commits. 605s (use "git push" to publish your local commits) 605s + t-expect-fail 'E:upstream files are not the same' t-git-debrebase 605s + local 'mpat=E:upstream files are not the same' 605s + shift 605s + set +o pipefail 605s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 605s + LC_MESSAGES=C 605s + LANGUAGE=C 605s + t-git-debrebase 605s + local gdr=git-debrebase 605s + : ' 605s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 605s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 606s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 606s git-debrebase ffq check_specs * 606s git-debrebase ffq merge master 606s git-debrebase ffq check_remote origin remote fetch/merge branch 606s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 606s OK, you are ahead of refs/remotes/origin/master 606s git-debrebase ffq check_remote undef remote push branch 606s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 606s git-debrebase *** WALK af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0 - 606s git-debrebase get_differs 79e5fb135acf901c0f51d5233a8abe7d2dfce654 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 606s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 606s git-debrebase classify af2ef87bf0e79ccd76f5aa1d589f1debd036f168 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 79e5fb135acf901c0f51d5233a8abe7d2dfce654/0 25b5400e549fae4178ac03009ca007e4d5de00dc/0x32 606s git-debrebase = Pseudomerge {"CommitId" => "af2ef87bf0e79ccd76f5aa1d589f1debd036f168","Overwritten" => [{"Differs" => 50,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Ix" => 1}],"Type" => "Pseudomerge","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Contributor" => {"CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 79e5fb135acf901c0f51d5233a8abe7d2dfce654\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 606s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 606s git-debrebase get_differs 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 606s git-debrebase classify 79e5fb135acf901c0f51d5233a8abe7d2dfce654 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 467a69243e82d5769a0b597e988a831c035e0346/0x22 5954d5919ea862b2bf22bcfd1a474be4d70c15a6/0x12 606s git-debrebase = VanillaMerge {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 34,"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346"},{"Ix" => 1,"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","IsDgitImport" => undef,"IsOrigin" => "","Differs" => 18}],"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Type" => "VanillaMerge","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654"} 606s git-debrebase *** MERGE 606s git-debrebase mwrecknote vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 606s git-debrebase *** WALK 467a69243e82d5769a0b597e988a831c035e0346 0 - 606s git-debrebase get_differs 2b434c87b1d02515dc906fa7640bdea60c79d838 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 606s git-debrebase classify 467a69243e82d5769a0b597e988a831c035e0346 $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p 2b434c87b1d02515dc906fa7640bdea60c79d838/0x2 606s git-debrebase = Upstream {"Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Ix" => 0}],"Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent 2b434c87b1d02515dc906fa7640bdea60c79d838\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 606s git-debrebase get_differs 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f b572e0b33b388437b34057c7e203744c52d82138 = 0x2 606s git-debrebase classify 2b434c87b1d02515dc906fa7640bdea60c79d838 $t=b572e0b33b388437b34057c7e203744c52d82138 @p 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f/0x2 606s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"}],"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Type" => "Upstream","Tree" => "b572e0b33b388437b34057c7e203744c52d82138"} 606s git-debrebase get_differs 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 606s git-debrebase classify 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a/0x2 606s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a","Ix" => 0}],"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Type" => "Upstream","CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 606s git-debrebase get_differs af5a52a6968ffe9195debdeba1ad551cfbd331b5 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 606s git-debrebase classify 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p af5a52a6968ffe9195debdeba1ad551cfbd331b5/0x2 606s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent af5a52a6968ffe9195debdeba1ad551cfbd331b5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Ix" => 0}],"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Type" => "Upstream","CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a"} 606s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 606s git-debrebase classify af5a52a6968ffe9195debdeba1ad551cfbd331b5 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x2 606s git-debrebase = Upstream {"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Ix" => 0}]} 606s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 606s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 606s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Ix" => 0}],"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 606s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 606s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 606s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 606s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 2},$VAR1->{"OrigParents"}[0]]} 606s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp 4 proc 6 pm -1 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 1b928d4b44e70ba8dfce10ff5b94945f972091da 7 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Debian (rewriting=0) 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 606s git-debrebase WALK BUILD af5a52a6968ffe9195debdeba1ad551cfbd331b5 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a Upstream (rewriting=0) 606s git-debrebase WALK BUILD 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f Upstream (rewriting=0) 606s git-debrebase WALK BUILD 2b434c87b1d02515dc906fa7640bdea60c79d838 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 467a69243e82d5769a0b597e988a831c035e0346 Upstream (rewriting=0) 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 467a69243e82d5769a0b597e988a831c035e0346 = 0 606s git-debrebase *** WALK RETURN 467a69243e82d5769a0b597e988a831c035e0346 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase mwrecknote left-input 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase mwrecknote left-laundered 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase mwrecknote left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 606s git-debrebase mwrecknote left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase *** WALK 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 0 - 606s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 606s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 606s git-debrebase classify 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p bd179e191d494353ea91ab4d4b6cdc467f16d7a8/0 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x2 606s git-debrebase = Pseudomerge {"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent bd179e191d494353ea91ab4d4b6cdc467f16d7a8\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8"},"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Overwritten" => [{"Differs" => 2,"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Ix" => 1}],"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 606s git-debrebase get_differs 7f51c163ab51e794d055532606e43df7f0d7dd89 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 606s git-debrebase classify bd179e191d494353ea91ab4d4b6cdc467f16d7a8 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 7f51c163ab51e794d055532606e43df7f0d7dd89/0x2 606s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Parents" => [{"CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Differs" => 2,"Ix" => 0}],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 7f51c163ab51e794d055532606e43df7f0d7dd89\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "other-upstream-conflict\n"} 606s git-debrebase get_differs b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 606s git-debrebase classify 7f51c163ab51e794d055532606e43df7f0d7dd89 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6/0x2 606s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Differs" => 2}],"Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Type" => "Upstream","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 606s git-debrebase get_differs acbad39d3bee952d3c1e83e02323cd3376e205b7 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 606s git-debrebase classify b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p acbad39d3bee952d3c1e83e02323cd3376e205b7/0x2 606s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Ix" => 0}],"Type" => "Upstream","CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","Msg" => "UPSTREAM edit src-other.c (other)\n","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent acbad39d3bee952d3c1e83e02323cd3376e205b7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 606s git-debrebase get_differs fcb37ae5bbf1908498f9e68b5b785a4f2855f575 303c71503c03080bda903ee6582757788559a305 = 0x2 606s git-debrebase classify acbad39d3bee952d3c1e83e02323cd3376e205b7 $t=303c71503c03080bda903ee6582757788559a305 @p fcb37ae5bbf1908498f9e68b5b785a4f2855f575/0x2 606s git-debrebase = Upstream {"Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent fcb37ae5bbf1908498f9e68b5b785a4f2855f575\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Tree" => "303c71503c03080bda903ee6582757788559a305","Parents" => [{"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Differs" => 2,"Ix" => 0}]} 606s git-debrebase get_differs 4179c6198fc291aa475cbd4bae0c3ff359125ad7 af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 606s git-debrebase classify fcb37ae5bbf1908498f9e68b5b785a4f2855f575 $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p 4179c6198fc291aa475cbd4bae0c3ff359125ad7/0x2 606s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7"}],"Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent 4179c6198fc291aa475cbd4bae0c3ff359125ad7\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 606s git-debrebase get_differs 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 606s git-debrebase classify 4179c6198fc291aa475cbd4bae0c3ff359125ad7 $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p 3e3ae41bfee8222eb624578f62fe08e0dafd8b00/0x2 606s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Ix" => 0}],"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7","Type" => "Upstream","Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent 3e3ae41bfee8222eb624578f62fe08e0dafd8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 606s git-debrebase get_differs 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 606s git-debrebase classify 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055/0x2 606s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Type" => "Upstream","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Parents" => [{"Differs" => 2,"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Ix" => 0}]} 606s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 606s git-debrebase classify 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x2 606s git-debrebase = Upstream {"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Type" => "Upstream","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","Parents" => [{"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 606s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 606s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 606s git-debrebase = Packaging {"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Type" => "Packaging","CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Differs" => 32,"Ix" => 0}]} 606s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 606s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 606s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32,"Ix" => 0}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Type" => "Packaging"} 606s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 606s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 606s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Type" => "Packaging","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 606s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 606s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 606s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Type" => "Packaging"} 606s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 606s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 606s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 606s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 606s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 606s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 606s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 606s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 606s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 606s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 606s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 5 upp 8 proc 16 pm 0 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 606s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 606s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 606s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 606s git-debrebase WALK BUILD 031a9344309867022099bf265d1410cd72fa8d3d Debian (rewriting=0) 606s git-debrebase WALK BUILD 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d Debian (rewriting=0) 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 606s git-debrebase WALK BUILD 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 4179c6198fc291aa475cbd4bae0c3ff359125ad7 Upstream (rewriting=0) 606s git-debrebase WALK BUILD fcb37ae5bbf1908498f9e68b5b785a4f2855f575 Upstream (rewriting=0) 606s git-debrebase WALK BUILD acbad39d3bee952d3c1e83e02323cd3376e205b7 Upstream (rewriting=0) 606s git-debrebase WALK BUILD b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 7f51c163ab51e794d055532606e43df7f0d7dd89 Upstream (rewriting=0) 606s git-debrebase WALK BUILD bd179e191d494353ea91ab4d4b6cdc467f16d7a8 Upstream (rewriting=0) 606s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 = 0 606s git-debrebase *** WALK RETURN bd179e191d494353ea91ab4d4b6cdc467f16d7a8 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase mwrecknote right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 606s git-debrebase mwrecknote right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 606s git-debrebase mwrecknote right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 606s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase mwrecknote result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase mwrecknote interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase *** WALK 075ef1bebca2f99591cafd47f62fb9ceb67c6317 0 - 606s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 606s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 606s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0}]} 606s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 606s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 606s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 606s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 606s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 606s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 606s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 606s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 606s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 606s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 606s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 606s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 606s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 606s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp -1 proc 4 pm -1 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 606s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 606s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 606s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 0 606s git-debrebase *** WALK RETURN 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase mwrecknote mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase *** WALK prep done cur=79e5fb135acf901c0f51d5233a8abe7d2dfce654 brw 0 upp 1 proc 2 pm 0 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 3 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeCreateMergedBreakwaters (rewriting=0) 606s Found a general merge, will try to tidy it up. 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 606s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeMergeSeries (rewriting=1) 606s Using supplied resolution for 79e5fb135acf901c0f51d5233a8abe7d2dfce654... 606s git-debrebase mwrecknote cached-resolution a30adac81160c29ee9cd94e1730b00d2b8479c3c 606s git-debrebase get_differs a30adac81160c29ee9cd94e1730b00d2b8479c3c af2ef87bf0e79ccd76f5aa1d589f1debd036f168 = 0x2 606s git-debrebase get_differs a30adac81160c29ee9cd94e1730b00d2b8479c3c 79e5fb135acf901c0f51d5233a8abe7d2dfce654 = 0x2 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 606s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 606s git-debrebase |> ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 606s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 606s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 606s git-debrebase |> 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 commit refs/debrebase/wreckage/left-patchqueue 606s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/mergebase-anchor 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-breakwater 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-laundered 606s git-debrebase |> e53db5897f3e70efea4fb29fd4421bb620a52d31 commit refs/debrebase/wreckage/mergebase-patchqueue 606s git-debrebase |> 3840368931deddda0a8ca19bda2fdb89b527d878 commit refs/debrebase/wreckage/merged-patchqueue 606s git-debrebase |> dca9d4a9e078da5f3297cb5b1fbe181facc58b6f commit refs/debrebase/wreckage/new-base 606s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 606s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/right-anchor 606s git-debrebase |> 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d commit refs/debrebase/wreckage/right-breakwater 606s git-debrebase |> 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 commit refs/debrebase/wreckage/right-input 606s git-debrebase |> bd179e191d494353ea91ab4d4b6cdc467f16d7a8 commit refs/debrebase/wreckage/right-laundered 606s git-debrebase |> 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd commit refs/debrebase/wreckage/right-patchqueue 606s git-debrebase |> 79e5fb135acf901c0f51d5233a8abe7d2dfce654 commit refs/debrebase/wreckage/vanilla-merge 606s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 606s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/left-input 606s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/left-patchqueue 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-patchqueue 606s git-debrebase >= delete refs/debrebase/wreckage/merged-patchqueue 606s git-debrebase >= delete refs/debrebase/wreckage/new-base 606s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/right-input 606s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/right-patchqueue 606s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 606s git-debrebase >$ 606s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase >= create refs/debrebase/wreckage/right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 606s git-debrebase >= create refs/debrebase/wreckage/cached-resolution a30adac81160c29ee9cd94e1730b00d2b8479c3c 606s git-debrebase >= create refs/debrebase/wreckage/left-laundered 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 606s git-debrebase >= create refs/debrebase/wreckage/result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase >= create refs/debrebase/wreckage/left-input 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase >= create refs/debrebase/wreckage/left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase >= create refs/debrebase/wreckage/right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 606s git-debrebase >= create refs/debrebase/wreckage/right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 606s git-debrebase >= create refs/debrebase/wreckage/left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 606s git-debrebase >$ 606s 606s git-debrebase: Merge resolution failed: merge misresolved: upstream files are not the same (79e5fb135acf901c0f51d5233a8abe7d2dfce654 a30adac81160c29ee9cd94e1730b00d2b8479c3c d.0x2) 606s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 606s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 606s + local 'ps=15 0' 606s + set -o pipefail 606s + case $ps in 606s + t-grep-mpat 'E:upstream files are not the same' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 606s + local 'mpat=E:upstream files are not the same' 606s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 606s + local grepper=fgrep 606s + case "$mpat" in 606s + case "$mpat" in 606s + grepper=egrep 606s + mpat='upstream files are not the same' 606s + egrep -e 'upstream files are not the same' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 606s git-debrebase: Merge resolution failed: merge misresolved: upstream files are not the same (79e5fb135acf901c0f51d5233a8abe7d2dfce654 a30adac81160c29ee9cd94e1730b00d2b8479c3c d.0x2) 606s + t-git-debrebase scrap 606s + local gdr=git-debrebase 606s + : ' 606s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 606s + git-debrebase --dgit=dgit -D --experimental-merge-resolution scrap 606s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 606s git-debrebase |> a30adac81160c29ee9cd94e1730b00d2b8479c3c commit refs/debrebase/wreckage/cached-resolution 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 606s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 606s git-debrebase |> ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 606s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 606s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 606s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/mergebase-anchor 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-breakwater 606s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-laundered 606s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 606s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/right-anchor 606s git-debrebase |> 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d commit refs/debrebase/wreckage/right-breakwater 606s git-debrebase |> 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 commit refs/debrebase/wreckage/right-input 606s git-debrebase |> bd179e191d494353ea91ab4d4b6cdc467f16d7a8 commit refs/debrebase/wreckage/right-laundered 606s git-debrebase |> 79e5fb135acf901c0f51d5233a8abe7d2dfce654 commit refs/debrebase/wreckage/vanilla-merge 606s git-debrebase >= delete refs/debrebase/merge-resolutions 606s git-debrebase >= delete refs/debrebase/wreckage/cached-resolution 606s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 606s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/left-input 606s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 606s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 606s git-debrebase >= delete refs/debrebase/wreckage/right-input 606s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 606s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 606s git-debrebase >$ 606s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 606s ' 606s + no-wreckage 606s + git for-each-ref refs/debrebase/wreckage 606s + egrep . 606s + : ----- well ----- 606s + t-expect-fail F:docs/README t-git-debrebase 606s + local mpat=F:docs/README 606s + shift 606s + set +o pipefail 606s + LC_MESSAGES=C 606s + LANGUAGE=C 606s + t-git-debrebase 606s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 606s + local gdr=git-debrebase 606s + : ' 606s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 606s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 606s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 606s git-debrebase ffq check_specs * 606s git-debrebase ffq merge master 606s git-debrebase ffq check_remote origin remote fetch/merge branch 606s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 606s OK, you are ahead of refs/remotes/origin/master 606s git-debrebase ffq check_remote undef remote push branch 606s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 606s git-debrebase *** WALK af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0 - 606s git-debrebase get_differs 79e5fb135acf901c0f51d5233a8abe7d2dfce654 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 606s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 606s git-debrebase classify af2ef87bf0e79ccd76f5aa1d589f1debd036f168 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 79e5fb135acf901c0f51d5233a8abe7d2dfce654/0 25b5400e549fae4178ac03009ca007e4d5de00dc/0x32 606s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 50,"Ix" => 1,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"}],"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654"},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","CommitId" => "af2ef87bf0e79ccd76f5aa1d589f1debd036f168","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 79e5fb135acf901c0f51d5233a8abe7d2dfce654\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 606s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 606s git-debrebase get_differs 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 606s git-debrebase classify 79e5fb135acf901c0f51d5233a8abe7d2dfce654 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 467a69243e82d5769a0b597e988a831c035e0346/0x22 5954d5919ea862b2bf22bcfd1a474be4d70c15a6/0x12 606s git-debrebase = VanillaMerge {"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"IsDgitImport" => undef,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Differs" => 34,"IsOrigin" => "","Ix" => 0},{"IsDgitImport" => undef,"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Differs" => 18,"IsOrigin" => "","Ix" => 1}],"Type" => "VanillaMerge","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654"} 606s git-debrebase *** MERGE 606s git-debrebase mwrecknote vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 606s git-debrebase *** WALK 467a69243e82d5769a0b597e988a831c035e0346 0 - 606s git-debrebase get_differs 2b434c87b1d02515dc906fa7640bdea60c79d838 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 606s git-debrebase classify 467a69243e82d5769a0b597e988a831c035e0346 $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p 2b434c87b1d02515dc906fa7640bdea60c79d838/0x2 606s git-debrebase = Upstream {"Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent 2b434c87b1d02515dc906fa7640bdea60c79d838\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Parents" => [{"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Differs" => 2,"Ix" => 0}]} 606s git-debrebase get_differs 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f b572e0b33b388437b34057c7e203744c52d82138 = 0x2 606s git-debrebase classify 2b434c87b1d02515dc906fa7640bdea60c79d838 $t=b572e0b33b388437b34057c7e203744c52d82138 @p 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f/0x2 606s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"}],"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Type" => "Upstream","Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "b572e0b33b388437b34057c7e203744c52d82138"} 606s git-debrebase get_differs 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 606s git-debrebase classify 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a/0x2 606s git-debrebase = Upstream {"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a"}],"Type" => "Upstream","CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"} 606s git-debrebase get_differs af5a52a6968ffe9195debdeba1ad551cfbd331b5 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 606s git-debrebase classify 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p af5a52a6968ffe9195debdeba1ad551cfbd331b5/0x2 606s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5"}],"Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent af5a52a6968ffe9195debdeba1ad551cfbd331b5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6"} 606s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 606s git-debrebase classify af5a52a6968ffe9195debdeba1ad551cfbd331b5 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x2 606s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1"}],"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Type" => "Upstream","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 606s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 606s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 606s git-debrebase = Changelog {"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"}],"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 606s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 606s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 606s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 606s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"},$VAR1->{"OrigParents"}[0]]} 606s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp 4 proc 6 pm -1 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 1b928d4b44e70ba8dfce10ff5b94945f972091da 7 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Debian (rewriting=0) 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 606s git-debrebase WALK BUILD af5a52a6968ffe9195debdeba1ad551cfbd331b5 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a Upstream (rewriting=0) 606s git-debrebase WALK BUILD 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f Upstream (rewriting=0) 606s git-debrebase WALK BUILD 2b434c87b1d02515dc906fa7640bdea60c79d838 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 467a69243e82d5769a0b597e988a831c035e0346 Upstream (rewriting=0) 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 467a69243e82d5769a0b597e988a831c035e0346 = 0 606s git-debrebase *** WALK RETURN 467a69243e82d5769a0b597e988a831c035e0346 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase mwrecknote left-input 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase mwrecknote left-laundered 467a69243e82d5769a0b597e988a831c035e0346 606s git-debrebase mwrecknote left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 606s git-debrebase mwrecknote left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase *** WALK 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 0 - 606s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 606s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 606s git-debrebase classify 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p bd179e191d494353ea91ab4d4b6cdc467f16d7a8/0 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x2 606s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent bd179e191d494353ea91ab4d4b6cdc467f16d7a8\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Type" => "Pseudomerge","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8"},{"Differs" => 2,"Ix" => 1,"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0"}],"Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]]} 606s git-debrebase get_differs 7f51c163ab51e794d055532606e43df7f0d7dd89 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 606s git-debrebase classify bd179e191d494353ea91ab4d4b6cdc467f16d7a8 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 7f51c163ab51e794d055532606e43df7f0d7dd89/0x2 606s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89"}],"Type" => "Upstream","CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8","Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Msg" => "other-upstream-conflict\n","Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 7f51c163ab51e794d055532606e43df7f0d7dd89\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 606s git-debrebase get_differs b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 606s git-debrebase classify 7f51c163ab51e794d055532606e43df7f0d7dd89 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6/0x2 606s git-debrebase = Upstream {"Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6"}]} 606s git-debrebase get_differs acbad39d3bee952d3c1e83e02323cd3376e205b7 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 606s git-debrebase classify b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p acbad39d3bee952d3c1e83e02323cd3376e205b7/0x2 606s git-debrebase = Upstream {"Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent acbad39d3bee952d3c1e83e02323cd3376e205b7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Type" => "Upstream","Parents" => [{"CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Differs" => 2,"Ix" => 0}]} 606s git-debrebase get_differs fcb37ae5bbf1908498f9e68b5b785a4f2855f575 303c71503c03080bda903ee6582757788559a305 = 0x2 606s git-debrebase classify acbad39d3bee952d3c1e83e02323cd3376e205b7 $t=303c71503c03080bda903ee6582757788559a305 @p fcb37ae5bbf1908498f9e68b5b785a4f2855f575/0x2 606s git-debrebase = Upstream {"Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent fcb37ae5bbf1908498f9e68b5b785a4f2855f575\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "303c71503c03080bda903ee6582757788559a305","CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7","Type" => "Upstream","Parents" => [{"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Differs" => 2,"Ix" => 0}]} 606s git-debrebase get_differs 4179c6198fc291aa475cbd4bae0c3ff359125ad7 af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 606s git-debrebase classify fcb37ae5bbf1908498f9e68b5b785a4f2855f575 $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p 4179c6198fc291aa475cbd4bae0c3ff359125ad7/0x2 606s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7"}],"Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent 4179c6198fc291aa475cbd4bae0c3ff359125ad7\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24"} 606s git-debrebase get_differs 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 606s git-debrebase classify 4179c6198fc291aa475cbd4bae0c3ff359125ad7 $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p 3e3ae41bfee8222eb624578f62fe08e0dafd8b00/0x2 606s git-debrebase = Upstream {"Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent 3e3ae41bfee8222eb624578f62fe08e0dafd8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7","Parents" => [{"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Ix" => 0,"Differs" => 2}]} 606s git-debrebase get_differs 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 606s git-debrebase classify 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055/0x2 606s git-debrebase = Upstream {"Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055"}],"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Type" => "Upstream"} 606s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 606s git-debrebase classify 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x2 606s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d"}],"Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 606s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 606s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 606s git-debrebase = Packaging {"Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Differs" => 32,"Ix" => 0}],"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 606s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 606s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 606s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32,"Ix" => 0}],"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Type" => "Packaging"} 606s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 606s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 606s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 606s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 606s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 606s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0,"Differs" => 32}]} 606s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 606s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 606s git-debrebase = Changelog {"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Type" => "Changelog","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 606s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 606s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 606s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Type" => "Changelog","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 606s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 606s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 606s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 606s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 606s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 5 upp 8 proc 16 pm 0 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 606s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 606s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 606s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 606s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 606s git-debrebase WALK BUILD 031a9344309867022099bf265d1410cd72fa8d3d Debian (rewriting=0) 606s git-debrebase WALK BUILD 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d Debian (rewriting=0) 606s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 606s git-debrebase WALK BUILD 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 4179c6198fc291aa475cbd4bae0c3ff359125ad7 Upstream (rewriting=0) 606s git-debrebase WALK BUILD fcb37ae5bbf1908498f9e68b5b785a4f2855f575 Upstream (rewriting=0) 606s git-debrebase WALK BUILD acbad39d3bee952d3c1e83e02323cd3376e205b7 Upstream (rewriting=0) 606s git-debrebase WALK BUILD b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 Upstream (rewriting=0) 606s git-debrebase WALK BUILD 7f51c163ab51e794d055532606e43df7f0d7dd89 Upstream (rewriting=0) 606s git-debrebase WALK BUILD bd179e191d494353ea91ab4d4b6cdc467f16d7a8 Upstream (rewriting=0) 606s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 606s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 606s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 = 0 606s git-debrebase *** WALK RETURN bd179e191d494353ea91ab4d4b6cdc467f16d7a8 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase mwrecknote right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 606s git-debrebase mwrecknote right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 606s git-debrebase mwrecknote right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 606s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 606s git-debrebase mwrecknote result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 606s git-debrebase mwrecknote interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 606s git-debrebase *** WALK 075ef1bebca2f99591cafd47f62fb9ceb67c6317 0 - 606s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 606s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 606s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Type" => "Packaging","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 606s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 606s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 607s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Type" => "Packaging","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32,"Ix" => 0}]} 607s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 607s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 607s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Type" => "Changelog"} 607s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 607s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 607s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 607s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 607s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 607s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 607s git-debrebase = Anchor {"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 607s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp -1 proc 4 pm -1 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 607s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 607s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 607s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 607s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 607s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 0 607s git-debrebase *** WALK RETURN 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 607s git-debrebase mwrecknote mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 607s git-debrebase *** WALK prep done cur=79e5fb135acf901c0f51d5233a8abe7d2dfce654 brw 0 upp 1 proc 2 pm 0 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase WALK REBUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 3 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 607s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeCreateMergedBreakwaters (rewriting=0) 607s Found a general merge, will try to tidy it up. 607s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 607s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeMergeSeries (rewriting=1) 607s git-debrebase >(no reflog) 607s Running merge resolution for 79e5fb135acf901c0f51d5233a8abe7d2dfce654... 607s git-debrebase mwrecknote new-base dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 607s git-debrebase merge_series newbase=dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 607s git-debrebase gbp_pq_export p-base 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase merge_series pec 32ad18c186179cccfeba5b5c76acf6615e6ed4bf pec' e53db5897f3e70efea4fb29fd4421bb620a52d31 607s git-debrebase mwrecknote mergebase-patchqueue e53db5897f3e70efea4fb29fd4421bb620a52d31 607s git-debrebase gbp_pq_export p-1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d bd179e191d494353ea91ab4d4b6cdc467f16d7a8 607s git-debrebase merge_series pec 852b87318dc979550927510c6df308180cdfb726 pec' 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 607s git-debrebase mwrecknote right-patchqueue 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 607s git-debrebase gbp_pq_export p-0 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 467a69243e82d5769a0b597e988a831c035e0346 607s git-debrebase merge_series pec 3ff16004a8aa38e20d64f56be668549b69a55aa2 pec' 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 607s git-debrebase mwrecknote left-patchqueue 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 607s git-debrebase merge_series merging... 607s git-debrebase merge_series merge ok, series... 607s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 607s merge_series patch 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 607s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 607s merge_series patch 0005-MIXED-add-both-before.patch keep 607s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 607s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 607s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 607s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 607s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 607s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 607s merge_series patch 0007-MIXED-add-both-other-other.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 607s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 607s merge_series patch 0008-other-upstream-conflict.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0002-Edit-the-.c-file.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0005-MIXED-add-both-before.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> 0007-MIXED-add-both-other-other.patch keep 607s merge_series prereq 0008-other-upstream-conflict.patch -> subdir/addnewups keep 607s merge_series patch subdir/addnewups keep 607s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 607s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 607s merge_series series next 0001-Add-a-new-upstream-file.patch 607s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 607s git-debrebase merge_series series next subdir/addnewups 607s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 607s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 607s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 607s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 607s git-debrebase merge_series series next 0008-other-upstream-conflict.patch 607s git-debrebase mwrecknote merged-patchqueue 3840368931deddda0a8ca19bda2fdb89b527d878 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 607s git-debrebase merge_series series gbp pq import 607s gbp:info: Trying to apply patches at '3840368931deddda0a8ca19bda2fdb89b527d878' 607s gbp:warning: Patch 0008-other-upstream-conflict.patch failed to apply, retrying with whitespace fixup 607s gbp:error: Failed to apply '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 607s error: docs/README: patch does not apply 607s gbp:error: Couldn't apply patches 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 607s git-debrebase >$ 607s git-debrebase >= create refs/debrebase/wreckage/new-base dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 607s git-debrebase >= create refs/debrebase/wreckage/mergebase-patchqueue e53db5897f3e70efea4fb29fd4421bb620a52d31 607s git-debrebase >= create refs/debrebase/wreckage/mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase >= create refs/debrebase/wreckage/left-patchqueue 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 607s git-debrebase >= create refs/debrebase/wreckage/left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 607s git-debrebase >= create refs/debrebase/wreckage/interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase >= create refs/debrebase/wreckage/right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 607s git-debrebase >= create refs/debrebase/wreckage/result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 607s git-debrebase >= create refs/debrebase/wreckage/right-patchqueue 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd 607s git-debrebase >= create refs/debrebase/wreckage/right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 607s git-debrebase >= create refs/debrebase/wreckage/right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 607s git-debrebase >= create refs/debrebase/wreckage/merged-patchqueue 3840368931deddda0a8ca19bda2fdb89b527d878 607s git-debrebase >= create refs/debrebase/wreckage/mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 607s git-debrebase >= create refs/debrebase/wreckage/left-input 467a69243e82d5769a0b597e988a831c035e0346 607s git-debrebase >= create refs/debrebase/wreckage/left-laundered 467a69243e82d5769a0b597e988a831c035e0346 607s git-debrebase >= create refs/debrebase/wreckage/mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 607s git-debrebase >= create refs/debrebase/wreckage/vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 607s git-debrebase >= create refs/debrebase/wreckage/left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 607s git-debrebase >= create refs/debrebase/wreckage/right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 607s git-debrebase >$ 607s 607s git-debrebase: Merge resolution failed: subprocess failed with error exit status 1 607s git-debrebase: failed command: gbp pq import 607s git-debrebase: Wreckage left in refs/debrebase/wreckage/*. 607s git-debrebase: See git-debrebase(1) section FAILED MERGES for suggestions. 607s + local 'ps=15 0' 607s + set -o pipefail 607s + case $ps in 607s + t-grep-mpat F:docs/README /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 607s + local mpat=F:docs/README 607s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 607s + local grepper=fgrep 607s + case "$mpat" in 607s + case "$mpat" in 607s + grepper=fgrep 607s + mpat=docs/README 607s + fgrep -e docs/README /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 607s git-debrebase = VanillaMerge {"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"IsDgitImport" => undef,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","Differs" => 34,"IsOrigin" => "","Ix" => 0},{"IsDgitImport" => undef,"CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Differs" => 18,"IsOrigin" => "","Ix" => 1}],"Type" => "VanillaMerge","CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654"} 607s gbp:error: Failed to apply '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge/debian/patches/0008-other-upstream-conflict.patch': Error running git apply: error: patch failed: docs/README:1 607s error: docs/README: patch does not apply 607s + wreckage-after 607s ++ t-git-get-ref-exact refs/debrebase/wreckage/junk 607s ++ local ref=refs/debrebase/wreckage/junk 607s ++ case "$ref" in 607s ++ git for-each-ref '--format=%(objectname)' '[r]efs/debrebase/wreckage/junk' 607s + test '' = '' 607s + git for-each-ref refs/debrebase/wreckage 607s + egrep . 607s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 607s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 607s ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 607s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 607s 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 607s 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 commit refs/debrebase/wreckage/left-patchqueue 607s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/mergebase-anchor 607s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-breakwater 607s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-laundered 607s e53db5897f3e70efea4fb29fd4421bb620a52d31 commit refs/debrebase/wreckage/mergebase-patchqueue 607s 3840368931deddda0a8ca19bda2fdb89b527d878 commit refs/debrebase/wreckage/merged-patchqueue 607s dca9d4a9e078da5f3297cb5b1fbe181facc58b6f commit refs/debrebase/wreckage/new-base 607s 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 607s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/right-anchor 607s 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d commit refs/debrebase/wreckage/right-breakwater 607s 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 commit refs/debrebase/wreckage/right-input 607s bd179e191d494353ea91ab4d4b6cdc467f16d7a8 commit refs/debrebase/wreckage/right-laundered 607s 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd commit refs/debrebase/wreckage/right-patchqueue 607s 79e5fb135acf901c0f51d5233a8abe7d2dfce654 commit refs/debrebase/wreckage/vanilla-merge 607s + quilt_faff_before 2 607s + git checkout -b fix2 debrebase/wreckage/merged-patchqueue 607s Switched to a new branch 'fix2' 607s + QUILT_PATCHES=debian/patches 607s + quilt push -a 607s Applying patch debian/patches/0001-Add-a-new-upstream-file.patch 607s patching file new-upstream-file 607s 607s Applying patch debian/patches/0002-Edit-the-.c-file.patch 607s patching file src.c 607s 607s Applying patch debian/patches/subdir/addnewups 607s patching file lib.c 607s 607s Applying patch debian/patches/0004-UPSTREAM-edit-src.c-before.patch 607s patching file src.c 607s 607s Applying patch debian/patches/0005-MIXED-add-both-before.patch 607s patching file src.c 607s 607s Applying patch debian/patches/0006-UPSTREAM-edit-src-other.c-other.patch 607s patching file src-other.c 607s 607s Applying patch debian/patches/0007-MIXED-add-both-other-other.patch 607s patching file src-other.c 607s 607s Applying patch debian/patches/0008-other-upstream-conflict.patch 607s patching file docs/README 607s Hunk #1 succeeded at 1 with fuzz 2. 607s 607s Now at patch debian/patches/0008-other-upstream-conflict.patch 607s + git checkout master docs/README 607s Updated 1 path from a426141 607s + git reset docs/README 607s Unstaged changes after reset: 607s M docs/README 607s M src.c 607s + quilt_faff_after 607s + QUILT_PATCHES=debian/patches 607s + quilt refresh 607s Refreshed patch debian/patches/0008-other-upstream-conflict.patch 607s + git add debian/patches 607s + git commit -m FIX 607s [fix2 0276dc4] FIX 607s 1 file changed, 6 insertions(+), 5 deletions(-) 607s + git reset --hard 607s HEAD is now at 0276dc4 FIX 607s + git clean -xdff 607s Removing .pc/ 607s Removing debian/patches/0008-other-upstream-conflict.patch~ 607s Removing lib.c 607s Removing new-upstream-file 607s Removing src-other.c 607s + t-git-debrebase record-resolved-merge 607s + local gdr=git-debrebase 607s + : ' 607s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 607s + git-debrebase --dgit=dgit -D --experimental-merge-resolution record-resolved-merge 607s Checking how you have resolved the merge problem 607s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s Seems to be vanilla-merge patchqueue. 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 608s git-debrebase merge_series series gbp pq import 608s gbp:info: Trying to apply patches at '0276dc4d861be209ad49aa0f76849a841ccb60cc' 608s gbp:info: 8 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 608s git-debrebase merge_series series ok, building... 608s git-debrebase merge_series series ok, building 2dfffdbc2f0e22c03735ee9258ec50f17ad51f8f 608s git-debrebase merge_series series ok, building 713647027b246822962571de985d70d525c832a2 608s git-debrebase merge_series series ok, building fa5256d22567c1374940ea790630f85a8a0ee7ec 608s git-debrebase merge_series series ok, building bcdecb30040dd49ad20b8a1aa06f2a43b4c6926a 608s git-debrebase merge_series series ok, building 0d55ff077d6bc292933ca0f58d1744722b3a234f 608s git-debrebase merge_series series ok, building 8839acea0d215b56706d14277e788b6ecc561005 608s git-debrebase merge_series series ok, building 68e6b4b5b2a525af9416660744b6f49544404c62 608s git-debrebase merge_series series ok, building 4fcebcc0a5d367817dcdbb52bb7e7762e03f0fda 608s git-debrebase mwrecknote merged-result 32a38e30134484c0dc4850435722191a3f559d89 608s git-debrebase merge_series done debug=db1aa56b25dee7203c345f443e6985b23aa77b4d 608s git-debrebase mwrecknote merged-debug db1aa56b25dee7203c345f443e6985b23aa77b4d 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase merge_series returns 32a38e30134484c0dc4850435722191a3f559d89 608s OK. You can switch branches and try git-debrebase again. 608s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 608s ' 608s + git checkout master 608s Switched to branch 'master' 608s Your branch is ahead of 'origin/master' by 37 commits. 608s (use "git push" to publish your local commits) 608s + t-git-debrebase 608s + local gdr=git-debrebase 608s + : ' 608s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 608s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 608s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 608s git-debrebase ffq check_specs * 608s git-debrebase ffq merge master 608s git-debrebase ffq check_remote origin remote fetch/merge branch 608s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 608s OK, you are ahead of refs/remotes/origin/master 608s git-debrebase ffq check_remote undef remote push branch 608s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 608s git-debrebase *** WALK af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0 - 608s git-debrebase get_differs 79e5fb135acf901c0f51d5233a8abe7d2dfce654 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0 608s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x32 608s git-debrebase classify af2ef87bf0e79ccd76f5aa1d589f1debd036f168 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 79e5fb135acf901c0f51d5233a8abe7d2dfce654/0 25b5400e549fae4178ac03009ca007e4d5de00dc/0x32 608s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654"},"Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 79e5fb135acf901c0f51d5233a8abe7d2dfce654\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Overwritten" => [{"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Differs" => 50,"Ix" => 1}],"CommitId" => "af2ef87bf0e79ccd76f5aa1d589f1debd036f168","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge"} 608s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x22 608s git-debrebase get_differs 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x12 608s git-debrebase classify 79e5fb135acf901c0f51d5233a8abe7d2dfce654 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 467a69243e82d5769a0b597e988a831c035e0346/0x22 5954d5919ea862b2bf22bcfd1a474be4d70c15a6/0x12 608s git-debrebase = VanillaMerge {"CommitId" => "79e5fb135acf901c0f51d5233a8abe7d2dfce654","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 467a69243e82d5769a0b597e988a831c035e0346\nparent 5954d5919ea862b2bf22bcfd1a474be4d70c15a6\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "467a69243e82d5769a0b597e988a831c035e0346","IsOrigin" => "","IsDgitImport" => undef},{"IsDgitImport" => undef,"Differs" => 18,"Ix" => 1,"IsOrigin" => "","CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6"}],"Type" => "VanillaMerge","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345"} 608s git-debrebase *** MERGE 608s git-debrebase mwrecknote vanilla-merge 79e5fb135acf901c0f51d5233a8abe7d2dfce654 608s git-debrebase *** WALK 467a69243e82d5769a0b597e988a831c035e0346 0 - 608s git-debrebase get_differs 2b434c87b1d02515dc906fa7640bdea60c79d838 b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 = 0x2 608s git-debrebase classify 467a69243e82d5769a0b597e988a831c035e0346 $t=b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9 @p 2b434c87b1d02515dc906fa7640bdea60c79d838/0x2 608s git-debrebase = Upstream {"Tree" => "b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838","Differs" => 2,"Ix" => 0}],"Hdr" => "tree b5305e6e9ee6edea6feb322ecc8479dc6d5b0bc9\nparent 2b434c87b1d02515dc906fa7640bdea60c79d838\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "467a69243e82d5769a0b597e988a831c035e0346"} 608s git-debrebase get_differs 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f b572e0b33b388437b34057c7e203744c52d82138 = 0x2 608s git-debrebase classify 2b434c87b1d02515dc906fa7640bdea60c79d838 $t=b572e0b33b388437b34057c7e203744c52d82138 @p 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f/0x2 608s git-debrebase = Upstream {"Tree" => "b572e0b33b388437b34057c7e203744c52d82138","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"}],"Hdr" => "tree b572e0b33b388437b34057c7e203744c52d82138\nparent 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "2b434c87b1d02515dc906fa7640bdea60c79d838"} 608s git-debrebase get_differs 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a c26f8635f5a3d239ca949aa666feee09ab57e882 = 0x2 608s git-debrebase classify 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f $t=c26f8635f5a3d239ca949aa666feee09ab57e882 @p 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a/0x2 608s git-debrebase = Upstream {"Tree" => "c26f8635f5a3d239ca949aa666feee09ab57e882","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a"}],"Hdr" => "tree c26f8635f5a3d239ca949aa666feee09ab57e882\nparent 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f"} 608s git-debrebase get_differs af5a52a6968ffe9195debdeba1ad551cfbd331b5 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 = 0x2 608s git-debrebase classify 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a $t=2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6 @p af5a52a6968ffe9195debdeba1ad551cfbd331b5/0x2 608s git-debrebase = Upstream {"CommitId" => "68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a","Hdr" => "tree 2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6\nparent af5a52a6968ffe9195debdeba1ad551cfbd331b5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5"}],"Tree" => "2ac9ced4b6abb429c927a0b6e10aa5e7db8131f6","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 608s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 ced8034e4d13234deefc682b3523b0a9657f4e2a = 0x2 608s git-debrebase classify af5a52a6968ffe9195debdeba1ad551cfbd331b5 $t=ced8034e4d13234deefc682b3523b0a9657f4e2a @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x2 608s git-debrebase = Upstream {"Hdr" => "tree ced8034e4d13234deefc682b3523b0a9657f4e2a\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "af5a52a6968ffe9195debdeba1ad551cfbd331b5","Tree" => "ced8034e4d13234deefc682b3523b0a9657f4e2a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Ix" => 0,"Differs" => 2}]} 608s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 608s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 608s git-debrebase = Changelog {"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"}],"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 608s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 608s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 608s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 608s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"},$VAR1->{"OrigParents"}[0]]} 608s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp 4 proc 6 pm -1 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase WALK REBUILD 1b928d4b44e70ba8dfce10ff5b94945f972091da 7 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase WALK BUILD ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Debian (rewriting=0) 608s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 608s git-debrebase WALK BUILD af5a52a6968ffe9195debdeba1ad551cfbd331b5 Upstream (rewriting=0) 608s git-debrebase WALK BUILD 68fdb8ddcbfa7eba4cc31fcdad859bb6f347313a Upstream (rewriting=0) 608s git-debrebase WALK BUILD 2937f8ea160ed19a9bcaa0de9c9841e8c7a7bb8f Upstream (rewriting=0) 608s git-debrebase WALK BUILD 2b434c87b1d02515dc906fa7640bdea60c79d838 Upstream (rewriting=0) 608s git-debrebase WALK BUILD 467a69243e82d5769a0b597e988a831c035e0346 Upstream (rewriting=0) 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase get_differs 467a69243e82d5769a0b597e988a831c035e0346 467a69243e82d5769a0b597e988a831c035e0346 = 0 608s git-debrebase *** WALK RETURN 467a69243e82d5769a0b597e988a831c035e0346 ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1b928d4b44e70ba8dfce10ff5b94945f972091da 608s git-debrebase mwrecknote left-input 467a69243e82d5769a0b597e988a831c035e0346 608s git-debrebase mwrecknote left-laundered 467a69243e82d5769a0b597e988a831c035e0346 608s git-debrebase mwrecknote left-breakwater ddf13630dfac6908ad32a0f19dd27a19b12f10b1 608s git-debrebase mwrecknote left-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 608s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1b928d4b44e70ba8dfce10ff5b94945f972091da 608s git-debrebase *** WALK 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 0 - 608s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0 608s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 608s git-debrebase classify 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p bd179e191d494353ea91ab4d4b6cdc467f16d7a8/0 cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x2 608s git-debrebase = Pseudomerge {"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Contributor" => {"CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8","Differs" => 0,"Ix" => 0},"Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},{"Differs" => 2,"Ix" => 1,"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","CommitId" => "5954d5919ea862b2bf22bcfd1a474be4d70c15a6","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent bd179e191d494353ea91ab4d4b6cdc467f16d7a8\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 608s git-debrebase get_differs 7f51c163ab51e794d055532606e43df7f0d7dd89 f1f5ddd704fadb0e255d443956e40ddf3b957c91 = 0x2 608s git-debrebase classify bd179e191d494353ea91ab4d4b6cdc467f16d7a8 $t=f1f5ddd704fadb0e255d443956e40ddf3b957c91 @p 7f51c163ab51e794d055532606e43df7f0d7dd89/0x2 608s git-debrebase = Upstream {"Tree" => "f1f5ddd704fadb0e255d443956e40ddf3b957c91","Msg" => "other-upstream-conflict\n","Type" => "Upstream","Parents" => [{"CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Ix" => 0,"Differs" => 2}],"Hdr" => "tree f1f5ddd704fadb0e255d443956e40ddf3b957c91\nparent 7f51c163ab51e794d055532606e43df7f0d7dd89\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "bd179e191d494353ea91ab4d4b6cdc467f16d7a8"} 608s git-debrebase get_differs b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x2 608s git-debrebase classify 7f51c163ab51e794d055532606e43df7f0d7dd89 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6/0x2 608s git-debrebase = Upstream {"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "7f51c163ab51e794d055532606e43df7f0d7dd89","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Ix" => 0,"Differs" => 2}]} 608s git-debrebase get_differs acbad39d3bee952d3c1e83e02323cd3376e205b7 42e8d18d3457ca5a51861bc7222aeb912c254975 = 0x2 608s git-debrebase classify b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 $t=42e8d18d3457ca5a51861bc7222aeb912c254975 @p acbad39d3bee952d3c1e83e02323cd3376e205b7/0x2 608s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7"}],"Type" => "Upstream","Msg" => "UPSTREAM edit src-other.c (other)\n","Tree" => "42e8d18d3457ca5a51861bc7222aeb912c254975","CommitId" => "b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6","Hdr" => "tree 42e8d18d3457ca5a51861bc7222aeb912c254975\nparent acbad39d3bee952d3c1e83e02323cd3376e205b7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 608s git-debrebase get_differs fcb37ae5bbf1908498f9e68b5b785a4f2855f575 303c71503c03080bda903ee6582757788559a305 = 0x2 608s git-debrebase classify acbad39d3bee952d3c1e83e02323cd3376e205b7 $t=303c71503c03080bda903ee6582757788559a305 @p fcb37ae5bbf1908498f9e68b5b785a4f2855f575/0x2 608s git-debrebase = Upstream {"Tree" => "303c71503c03080bda903ee6582757788559a305","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575"}],"Hdr" => "tree 303c71503c03080bda903ee6582757788559a305\nparent fcb37ae5bbf1908498f9e68b5b785a4f2855f575\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "acbad39d3bee952d3c1e83e02323cd3376e205b7"} 608s git-debrebase get_differs 4179c6198fc291aa475cbd4bae0c3ff359125ad7 af1d4b6b4512b3d286fe984aa34588e889c1ab24 = 0x2 608s git-debrebase classify fcb37ae5bbf1908498f9e68b5b785a4f2855f575 $t=af1d4b6b4512b3d286fe984aa34588e889c1ab24 @p 4179c6198fc291aa475cbd4bae0c3ff359125ad7/0x2 608s git-debrebase = Upstream {"Tree" => "af1d4b6b4512b3d286fe984aa34588e889c1ab24","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7"}],"Hdr" => "tree af1d4b6b4512b3d286fe984aa34588e889c1ab24\nparent 4179c6198fc291aa475cbd4bae0c3ff359125ad7\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "fcb37ae5bbf1908498f9e68b5b785a4f2855f575"} 608s git-debrebase get_differs 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 ab36d5c8cc32b63c9defc9547dd01c490ca95683 = 0x2 608s git-debrebase classify 4179c6198fc291aa475cbd4bae0c3ff359125ad7 $t=ab36d5c8cc32b63c9defc9547dd01c490ca95683 @p 3e3ae41bfee8222eb624578f62fe08e0dafd8b00/0x2 608s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Ix" => 0,"Differs" => 2}],"Tree" => "ab36d5c8cc32b63c9defc9547dd01c490ca95683","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "4179c6198fc291aa475cbd4bae0c3ff359125ad7","Hdr" => "tree ab36d5c8cc32b63c9defc9547dd01c490ca95683\nparent 3e3ae41bfee8222eb624578f62fe08e0dafd8b00\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 608s git-debrebase get_differs 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 464d5b09357dd0b145bbecc8ee74810993c6b39e = 0x2 608s git-debrebase classify 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 $t=464d5b09357dd0b145bbecc8ee74810993c6b39e @p 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055/0x2 608s git-debrebase = Upstream {"Hdr" => "tree 464d5b09357dd0b145bbecc8ee74810993c6b39e\nparent 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "3e3ae41bfee8222eb624578f62fe08e0dafd8b00","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "464d5b09357dd0b145bbecc8ee74810993c6b39e","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055"}],"Type" => "Upstream"} 608s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 8a6447a3fd229137f4a5385df6b80b9f96829b0b = 0x2 608s git-debrebase classify 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 $t=8a6447a3fd229137f4a5385df6b80b9f96829b0b @p 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x2 608s git-debrebase = Upstream {"CommitId" => "2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055","Hdr" => "tree 8a6447a3fd229137f4a5385df6b80b9f96829b0b\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "8a6447a3fd229137f4a5385df6b80b9f96829b0b"} 608s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 608s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 608s git-debrebase = Packaging {"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 608s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 608s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 608s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d"} 608s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 608s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 608s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Type" => "Packaging"} 608s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 608s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 608s git-debrebase = Packaging {"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 608s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 608s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 608s git-debrebase = Changelog {"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 608s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 608s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 608s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 608s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 608s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 608s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 608s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 608s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 5 upp 8 proc 16 pm 0 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 608s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 608s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 608s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 608s git-debrebase WALK BUILD 031a9344309867022099bf265d1410cd72fa8d3d Debian (rewriting=0) 608s git-debrebase WALK BUILD 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d Debian (rewriting=0) 608s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 608s git-debrebase WALK BUILD 2683d4e5bfd7f51bafd2de97e10cde1c5b0f3055 Upstream (rewriting=0) 608s git-debrebase WALK BUILD 3e3ae41bfee8222eb624578f62fe08e0dafd8b00 Upstream (rewriting=0) 608s git-debrebase WALK BUILD 4179c6198fc291aa475cbd4bae0c3ff359125ad7 Upstream (rewriting=0) 608s git-debrebase WALK BUILD fcb37ae5bbf1908498f9e68b5b785a4f2855f575 Upstream (rewriting=0) 608s git-debrebase WALK BUILD acbad39d3bee952d3c1e83e02323cd3376e205b7 Upstream (rewriting=0) 608s git-debrebase WALK BUILD b264ef9c41e33e9d4879a209cd01e22fd8c1eaa6 Upstream (rewriting=0) 608s git-debrebase WALK BUILD 7f51c163ab51e794d055532606e43df7f0d7dd89 Upstream (rewriting=0) 608s git-debrebase WALK BUILD bd179e191d494353ea91ab4d4b6cdc467f16d7a8 Upstream (rewriting=0) 608s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase get_differs bd179e191d494353ea91ab4d4b6cdc467f16d7a8 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 = 0 608s git-debrebase *** WALK RETURN bd179e191d494353ea91ab4d4b6cdc467f16d7a8 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 608s git-debrebase mwrecknote right-input 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 608s git-debrebase mwrecknote right-laundered bd179e191d494353ea91ab4d4b6cdc467f16d7a8 608s git-debrebase mwrecknote right-breakwater 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 608s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 608s git-debrebase MERGE BA best=1b928d4b44e70ba8dfce10ff5b94945f972091da p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 608s git-debrebase mwrecknote result-anchor 1b928d4b44e70ba8dfce10ff5b94945f972091da 608s git-debrebase mwrecknote interchange-mbcand-ok-0 075ef1bebca2f99591cafd47f62fb9ceb67c6317 608s git-debrebase *** WALK 075ef1bebca2f99591cafd47f62fb9ceb67c6317 0 - 608s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 608s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 608s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 608s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 608s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 608s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"} 608s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 608s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 608s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}],"Type" => "Changelog"} 608s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 608s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 608s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16,"Ix" => 0}]} 608s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 608s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 608s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 608s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 608s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp -1 proc 4 pm -1 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 608s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 608s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 608s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 608s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 0 608s git-debrebase *** WALK RETURN 075ef1bebca2f99591cafd47f62fb9ceb67c6317 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 608s git-debrebase mwrecknote mergebase-laundered 075ef1bebca2f99591cafd47f62fb9ceb67c6317 608s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 608s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 608s git-debrebase *** WALK prep done cur=79e5fb135acf901c0f51d5233a8abe7d2dfce654 brw 0 upp 1 proc 2 pm 0 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase WALK REBUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 3 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 608s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeCreateMergedBreakwaters (rewriting=0) 608s Found a general merge, will try to tidy it up. 608s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 608s git-debrebase WALK BUILD 79e5fb135acf901c0f51d5233a8abe7d2dfce654 MergeMergeSeries (rewriting=1) 608s Using supplied resolution for 79e5fb135acf901c0f51d5233a8abe7d2dfce654... 608s git-debrebase mwrecknote cached-resolution 32a38e30134484c0dc4850435722191a3f559d89 608s git-debrebase get_differs 32a38e30134484c0dc4850435722191a3f559d89 af2ef87bf0e79ccd76f5aa1d589f1debd036f168 = 0 608s git-debrebase get_differs 32a38e30134484c0dc4850435722191a3f559d89 79e5fb135acf901c0f51d5233a8abe7d2dfce654 = 0 608s Merge resolution successful. 608s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 608s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 608s git-debrebase get_differs 32a38e30134484c0dc4850435722191a3f559d89 af2ef87bf0e79ccd76f5aa1d589f1debd036f168 = 0 608s git-debrebase *** WALK RETURN 32a38e30134484c0dc4850435722191a3f559d89 dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 1b928d4b44e70ba8dfce10ff5b94945f972091da 608s git-debrebase: laundered (head was af2ef87bf0e79ccd76f5aa1d589f1debd036f168) 608s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/interchange-mbcand-ok-0 608s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/left-anchor 608s git-debrebase |> ddf13630dfac6908ad32a0f19dd27a19b12f10b1 commit refs/debrebase/wreckage/left-breakwater 608s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-input 608s git-debrebase |> 467a69243e82d5769a0b597e988a831c035e0346 commit refs/debrebase/wreckage/left-laundered 608s git-debrebase |> 9d62fc9bb79d0bf5a578e5f1c61da9fecb927361 commit refs/debrebase/wreckage/left-patchqueue 608s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/mergebase-anchor 608s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-breakwater 608s git-debrebase |> 075ef1bebca2f99591cafd47f62fb9ceb67c6317 commit refs/debrebase/wreckage/mergebase-laundered 608s git-debrebase |> e53db5897f3e70efea4fb29fd4421bb620a52d31 commit refs/debrebase/wreckage/mergebase-patchqueue 608s git-debrebase |> 3840368931deddda0a8ca19bda2fdb89b527d878 commit refs/debrebase/wreckage/merged-patchqueue 608s git-debrebase |> dca9d4a9e078da5f3297cb5b1fbe181facc58b6f commit refs/debrebase/wreckage/new-base 608s git-debrebase |> 1b928d4b44e70ba8dfce10ff5b94945f972091da commit refs/debrebase/wreckage/result-anchor 608s git-debrebase |> 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 commit refs/debrebase/wreckage/right-anchor 608s git-debrebase |> 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d commit refs/debrebase/wreckage/right-breakwater 608s git-debrebase |> 5954d5919ea862b2bf22bcfd1a474be4d70c15a6 commit refs/debrebase/wreckage/right-input 608s git-debrebase |> bd179e191d494353ea91ab4d4b6cdc467f16d7a8 commit refs/debrebase/wreckage/right-laundered 608s git-debrebase |> 811bac27c5596aebd6cc36cb7b02c7e7b69dd8fd commit refs/debrebase/wreckage/right-patchqueue 608s git-debrebase |> 79e5fb135acf901c0f51d5233a8abe7d2dfce654 commit refs/debrebase/wreckage/vanilla-merge 608s git-debrebase >= update refs/ffq-prev/heads/master af2ef87bf0e79ccd76f5aa1d589f1debd036f168 0000000000000000000000000000000000000000 608s git-debrebase >= delete refs/debrebase-last/heads/master 608s git-debrebase >= update HEAD 32a38e30134484c0dc4850435722191a3f559d89 af2ef87bf0e79ccd76f5aa1d589f1debd036f168 608s git-debrebase >= delete refs/debrebase/wreckage/interchange-mbcand-ok-0 608s git-debrebase >= delete refs/debrebase/wreckage/left-anchor 608s git-debrebase >= delete refs/debrebase/wreckage/left-breakwater 608s git-debrebase >= delete refs/debrebase/wreckage/left-input 608s git-debrebase >= delete refs/debrebase/wreckage/left-laundered 608s git-debrebase >= delete refs/debrebase/wreckage/left-patchqueue 608s git-debrebase >= delete refs/debrebase/wreckage/mergebase-anchor 608s git-debrebase >= delete refs/debrebase/wreckage/mergebase-breakwater 608s git-debrebase >= delete refs/debrebase/wreckage/mergebase-laundered 608s git-debrebase >= delete refs/debrebase/wreckage/mergebase-patchqueue 608s git-debrebase >= delete refs/debrebase/wreckage/merged-patchqueue 608s git-debrebase >= delete refs/debrebase/wreckage/new-base 608s git-debrebase >= delete refs/debrebase/wreckage/result-anchor 608s git-debrebase >= delete refs/debrebase/wreckage/right-anchor 608s git-debrebase >= delete refs/debrebase/wreckage/right-breakwater 608s git-debrebase >= delete refs/debrebase/wreckage/right-input 608s git-debrebase >= delete refs/debrebase/wreckage/right-laundered 608s git-debrebase >= delete refs/debrebase/wreckage/right-patchqueue 608s git-debrebase >= delete refs/debrebase/wreckage/vanilla-merge 608s git-debrebase >$ 608s Recorded previous head for preservation 608s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 608s ' 608s + t-gdr-good laundered 608s + local state=laundered 608s + local beforetag= 608s + case $state in 608s + git diff --quiet -- :. ':!debian/patches' 608s + LC_MESSAGES=C 608s + t-git-debrebase status 608s + local gdr=git-debrebase 608s + : ' 608s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 608s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 608s git-debrebase get_differs 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 608s git-debrebase classify 32a38e30134484c0dc4850435722191a3f559d89 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd/0x2 608s git-debrebase = Upstream {"Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd"}],"Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "32a38e30134484c0dc4850435722191a3f559d89","Type" => "Upstream","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345"} 608s git-debrebase get_differs cd99febf99da0eef1eb26919874bc5d31c1f4ba7 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 608s git-debrebase classify 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p cd99febf99da0eef1eb26919874bc5d31c1f4ba7/0x2 608s git-debrebase = Upstream {"Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent cd99febf99da0eef1eb26919874bc5d31c1f4ba7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd","Parents" => [{"CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32","Type" => "Upstream"} 608s git-debrebase get_differs 4455c07072ec240c5daae910496027a5939c7514 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 608s git-debrebase classify cd99febf99da0eef1eb26919874bc5d31c1f4ba7 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 4455c07072ec240c5daae910496027a5939c7514/0x2 608s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4455c07072ec240c5daae910496027a5939c7514"}],"CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 4455c07072ec240c5daae910496027a5939c7514\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143"} 608s git-debrebase get_differs 15d6e6b198051efbe5d7e117b88c5e8faefa3fca ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 608s git-debrebase classify 4455c07072ec240c5daae910496027a5939c7514 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 15d6e6b198051efbe5d7e117b88c5e8faefa3fca/0x2 608s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Parents" => [{"Ix" => 0,"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca","Differs" => 2}],"CommitId" => "4455c07072ec240c5daae910496027a5939c7514","Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 15d6e6b198051efbe5d7e117b88c5e8faefa3fca\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f"} 608s git-debrebase get_differs 9a6794d2a4551d335468aa98a3fe23887bb85d1d acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 608s git-debrebase classify 15d6e6b198051efbe5d7e117b88c5e8faefa3fca $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 9a6794d2a4551d335468aa98a3fe23887bb85d1d/0x2 608s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Parents" => [{"Differs" => 2,"CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Ix" => 0}],"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 9a6794d2a4551d335468aa98a3fe23887bb85d1d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 608s git-debrebase get_differs fd4dcde030d308aa4b66f67034700236ffb2117d 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 608s git-debrebase classify 9a6794d2a4551d335468aa98a3fe23887bb85d1d $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p fd4dcde030d308aa4b66f67034700236ffb2117d/0x2 608s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent fd4dcde030d308aa4b66f67034700236ffb2117d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Parents" => [{"CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d","Ix" => 0,"Differs" => 2}]} 609s git-debrebase get_differs 81827e3901584310111ced6892dfdee839c0ea86 cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 609s git-debrebase classify fd4dcde030d308aa4b66f67034700236ffb2117d $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 81827e3901584310111ced6892dfdee839c0ea86/0x2 609s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 81827e3901584310111ced6892dfdee839c0ea86\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "81827e3901584310111ced6892dfdee839c0ea86"}],"Type" => "Upstream","Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93"} 609s git-debrebase get_differs dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 609s git-debrebase classify 81827e3901584310111ced6892dfdee839c0ea86 $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p dca9d4a9e078da5f3297cb5b1fbe181facc58b6f/0x2 609s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "81827e3901584310111ced6892dfdee839c0ea86","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent dca9d4a9e078da5f3297cb5b1fbe181facc58b6f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Differs" => 2}]} 609s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 609s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 609s git-debrebase classify dca9d4a9e078da5f3297cb5b1fbe181facc58b6f $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x20 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x12 609s git-debrebase = MergedBreakwaters {"Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f","Type" => "MergedBreakwaters","CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","IsDgitImport" => undef,"IsOrigin" => "","Ix" => 0,"Differs" => 32},{"Differs" => 18,"Ix" => 1,"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d"}],"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n"} 609s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 609s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 609s git-debrebase = Changelog {"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Type" => "Changelog","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Parents" => [{"Ix" => 0,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Differs" => 16}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 609s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 609s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 609s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"},$VAR1->{"OrigParents"}[0]],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 609s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 609s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 609s git-debrebase = Packaging {"Parents" => [{"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Type" => "Packaging"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 609s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 609s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c"} 609s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 609s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 609s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 609s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 609s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 609s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 609s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 609s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 609s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 609s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 609s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 609s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 609s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 609s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 609s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 609s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 609s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 609s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 609s ' 609s + case $state in 609s + egrep '^ *branch is laundered' ../status.check 609s branch is laundered 609s + t-gdr-good-analyse HEAD laundered 609s + local head=HEAD 609s + local state=laundered 609s + local wsfx= 609s + local etypes bwtip 609s + case $state in 609s + etypes=Upstream 609s ++ t-git-debrebase breakwater 609s ++ local gdr=git-debrebase 609s ++ : ' 609s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 609s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 609s git-debrebase get_differs 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 609s git-debrebase classify 32a38e30134484c0dc4850435722191a3f559d89 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd/0x2 609s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd"}],"CommitId" => "32a38e30134484c0dc4850435722191a3f559d89","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","Type" => "Upstream","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch"} 609s git-debrebase get_differs cd99febf99da0eef1eb26919874bc5d31c1f4ba7 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 609s git-debrebase classify 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p cd99febf99da0eef1eb26919874bc5d31c1f4ba7/0x2 609s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent cd99febf99da0eef1eb26919874bc5d31c1f4ba7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32","CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd","Parents" => [{"Differs" => 2,"CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Ix" => 0}]} 609s git-debrebase get_differs 4455c07072ec240c5daae910496027a5939c7514 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 609s git-debrebase classify cd99febf99da0eef1eb26919874bc5d31c1f4ba7 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 4455c07072ec240c5daae910496027a5939c7514/0x2 609s git-debrebase = Upstream {"CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4455c07072ec240c5daae910496027a5939c7514"}],"Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143","Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 4455c07072ec240c5daae910496027a5939c7514\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Type" => "Upstream"} 609s git-debrebase get_differs 15d6e6b198051efbe5d7e117b88c5e8faefa3fca ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 609s git-debrebase classify 4455c07072ec240c5daae910496027a5939c7514 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 15d6e6b198051efbe5d7e117b88c5e8faefa3fca/0x2 609s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 15d6e6b198051efbe5d7e117b88c5e8faefa3fca\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f","CommitId" => "4455c07072ec240c5daae910496027a5939c7514","Parents" => [{"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca","Ix" => 0,"Differs" => 2}]} 609s git-debrebase get_differs 9a6794d2a4551d335468aa98a3fe23887bb85d1d acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 609s git-debrebase classify 15d6e6b198051efbe5d7e117b88c5e8faefa3fca $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 9a6794d2a4551d335468aa98a3fe23887bb85d1d/0x2 609s git-debrebase = Upstream {"Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6","Type" => "Upstream","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 9a6794d2a4551d335468aa98a3fe23887bb85d1d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Parents" => [{"CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Ix" => 0,"Differs" => 2}],"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca"} 609s git-debrebase get_differs fd4dcde030d308aa4b66f67034700236ffb2117d 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 609s git-debrebase classify 9a6794d2a4551d335468aa98a3fe23887bb85d1d $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p fd4dcde030d308aa4b66f67034700236ffb2117d/0x2 609s git-debrebase = Upstream {"Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent fd4dcde030d308aa4b66f67034700236ffb2117d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Upstream","CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Parents" => [{"Ix" => 0,"CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d","Differs" => 2}]} 609s git-debrebase get_differs 81827e3901584310111ced6892dfdee839c0ea86 cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 609s git-debrebase classify fd4dcde030d308aa4b66f67034700236ffb2117d $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 81827e3901584310111ced6892dfdee839c0ea86/0x2 609s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "81827e3901584310111ced6892dfdee839c0ea86"}],"CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 81827e3901584310111ced6892dfdee839c0ea86\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93"} 609s git-debrebase get_differs dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 609s git-debrebase classify 81827e3901584310111ced6892dfdee839c0ea86 $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p dca9d4a9e078da5f3297cb5b1fbe181facc58b6f/0x2 609s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Ix" => 0}],"CommitId" => "81827e3901584310111ced6892dfdee839c0ea86","Type" => "Upstream","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent dca9d4a9e078da5f3297cb5b1fbe181facc58b6f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20"} 609s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 609s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 609s git-debrebase classify dca9d4a9e078da5f3297cb5b1fbe181facc58b6f $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x20 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x12 609s git-debrebase = MergedBreakwaters {"CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Parents" => [{"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Ix" => 0,"IsDgitImport" => undef,"IsOrigin" => "","Differs" => 32},{"Differs" => 18,"IsOrigin" => "","Ix" => 1,"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","IsDgitImport" => undef}],"Type" => "MergedBreakwaters","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f"} 609s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 609s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 609s git-debrebase = Changelog {"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"}],"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 609s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 609s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 609s git-debrebase = Anchor {"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0},{"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 609s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 609s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 609s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Differs" => 32}],"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 609s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 609s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}]} 609s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 609s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 609s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}]} 609s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 609s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 609s git-debrebase = Packaging {"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0,"Differs" => 32}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging"} 609s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 609s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 609s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 609s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 609s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 609s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 609s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 609s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 609s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 609s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]]} 609s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 609s ' 609s + bwtip=Y:dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + anal=../anal 609s + t-git-debrebase analyse HEAD 609s + local gdr=git-debrebase 609s + : ' 609s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 609s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 609s git-debrebase *** WALK 32a38e30134484c0dc4850435722191a3f559d89 1 *main::STDOUT 609s git-debrebase get_differs 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd a4261417e138e01b5f9f01dc501b68029dc5e345 = 0x2 609s git-debrebase classify 32a38e30134484c0dc4850435722191a3f559d89 $t=a4261417e138e01b5f9f01dc501b68029dc5e345 @p 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd/0x2 609s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "a4261417e138e01b5f9f01dc501b68029dc5e345","CommitId" => "32a38e30134484c0dc4850435722191a3f559d89","Hdr" => "tree a4261417e138e01b5f9f01dc501b68029dc5e345\nparent 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd","Differs" => 2}],"Msg" => "other-upstream-conflict\n\n\nGbp-Pq: Name 0008-other-upstream-conflict.patch"} 609s git-debrebase get_differs cd99febf99da0eef1eb26919874bc5d31c1f4ba7 e74d768e2fd245b6e9eb2d67f913521fda692f32 = 0x2 609s git-debrebase classify 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd $t=e74d768e2fd245b6e9eb2d67f913521fda692f32 @p cd99febf99da0eef1eb26919874bc5d31c1f4ba7/0x2 609s git-debrebase = Upstream {"Tree" => "e74d768e2fd245b6e9eb2d67f913521fda692f32","Type" => "Upstream","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Hdr" => "tree e74d768e2fd245b6e9eb2d67f913521fda692f32\nparent cd99febf99da0eef1eb26919874bc5d31c1f4ba7\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Ix" => 0}],"CommitId" => "0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd"} 609s git-debrebase get_differs 4455c07072ec240c5daae910496027a5939c7514 9fae2fead150e86c052c8bca251cd3cbce6c3143 = 0x2 609s git-debrebase classify cd99febf99da0eef1eb26919874bc5d31c1f4ba7 $t=9fae2fead150e86c052c8bca251cd3cbce6c3143 @p 4455c07072ec240c5daae910496027a5939c7514/0x2 609s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "9fae2fead150e86c052c8bca251cd3cbce6c3143","CommitId" => "cd99febf99da0eef1eb26919874bc5d31c1f4ba7","Parents" => [{"Differs" => 2,"CommitId" => "4455c07072ec240c5daae910496027a5939c7514","Ix" => 0}],"Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Hdr" => "tree 9fae2fead150e86c052c8bca251cd3cbce6c3143\nparent 4455c07072ec240c5daae910496027a5939c7514\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 609s git-debrebase get_differs 15d6e6b198051efbe5d7e117b88c5e8faefa3fca ab66256bb5fcabec3f3366cc8f26948f314c7b4f = 0x2 609s git-debrebase classify 4455c07072ec240c5daae910496027a5939c7514 $t=ab66256bb5fcabec3f3366cc8f26948f314c7b4f @p 15d6e6b198051efbe5d7e117b88c5e8faefa3fca/0x2 609s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "ab66256bb5fcabec3f3366cc8f26948f314c7b4f","CommitId" => "4455c07072ec240c5daae910496027a5939c7514","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Hdr" => "tree ab66256bb5fcabec3f3366cc8f26948f314c7b4f\nparent 15d6e6b198051efbe5d7e117b88c5e8faefa3fca\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca","Differs" => 2}]} 609s git-debrebase get_differs 9a6794d2a4551d335468aa98a3fe23887bb85d1d acda5093779293801e00d8395f1bc1e4dbdf8ac6 = 0x2 609s git-debrebase classify 15d6e6b198051efbe5d7e117b88c5e8faefa3fca $t=acda5093779293801e00d8395f1bc1e4dbdf8ac6 @p 9a6794d2a4551d335468aa98a3fe23887bb85d1d/0x2 609s git-debrebase = Upstream {"CommitId" => "15d6e6b198051efbe5d7e117b88c5e8faefa3fca","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree acda5093779293801e00d8395f1bc1e4dbdf8ac6\nparent 9a6794d2a4551d335468aa98a3fe23887bb85d1d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "acda5093779293801e00d8395f1bc1e4dbdf8ac6"} 609s git-debrebase get_differs fd4dcde030d308aa4b66f67034700236ffb2117d 5190ac16a0511ad70c1228457fe154cb28d0eb3a = 0x2 609s git-debrebase classify 9a6794d2a4551d335468aa98a3fe23887bb85d1d $t=5190ac16a0511ad70c1228457fe154cb28d0eb3a @p fd4dcde030d308aa4b66f67034700236ffb2117d/0x2 609s git-debrebase = Upstream {"Hdr" => "tree 5190ac16a0511ad70c1228457fe154cb28d0eb3a\nparent fd4dcde030d308aa4b66f67034700236ffb2117d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d"}],"CommitId" => "9a6794d2a4551d335468aa98a3fe23887bb85d1d","Tree" => "5190ac16a0511ad70c1228457fe154cb28d0eb3a","Type" => "Upstream"} 609s git-debrebase get_differs 81827e3901584310111ced6892dfdee839c0ea86 cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 = 0x2 609s git-debrebase classify fd4dcde030d308aa4b66f67034700236ffb2117d $t=cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93 @p 81827e3901584310111ced6892dfdee839c0ea86/0x2 609s git-debrebase = Upstream {"CommitId" => "fd4dcde030d308aa4b66f67034700236ffb2117d","Hdr" => "tree cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93\nparent 81827e3901584310111ced6892dfdee839c0ea86\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "81827e3901584310111ced6892dfdee839c0ea86"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "cbf7d6565a0baddf1cfafb80524ebdf6d48c6e93"} 609s git-debrebase get_differs dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 1e3c72379ce937e21ac991edbaef98058a509e20 = 0x2 609s git-debrebase classify 81827e3901584310111ced6892dfdee839c0ea86 $t=1e3c72379ce937e21ac991edbaef98058a509e20 @p dca9d4a9e078da5f3297cb5b1fbe181facc58b6f/0x2 609s git-debrebase = Upstream {"Tree" => "1e3c72379ce937e21ac991edbaef98058a509e20","Type" => "Upstream","Hdr" => "tree 1e3c72379ce937e21ac991edbaef98058a509e20\nparent dca9d4a9e078da5f3297cb5b1fbe181facc58b6f\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "81827e3901584310111ced6892dfdee839c0ea86"} 609s git-debrebase get_differs ddf13630dfac6908ad32a0f19dd27a19b12f10b1 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x20 609s git-debrebase get_differs 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 19be1dc2921e8842dafec024eb89b0268a9a988f = 0x12 609s git-debrebase classify dca9d4a9e078da5f3297cb5b1fbe181facc58b6f $t=19be1dc2921e8842dafec024eb89b0268a9a988f @p ddf13630dfac6908ad32a0f19dd27a19b12f10b1/0x20 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d/0x12 609s git-debrebase = MergedBreakwaters {"CommitId" => "dca9d4a9e078da5f3297cb5b1fbe181facc58b6f","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdocs/README\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Hdr" => "tree 19be1dc2921e8842dafec024eb89b0268a9a988f\nparent ddf13630dfac6908ad32a0f19dd27a19b12f10b1\nparent 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"IsOrigin" => "","Ix" => 0,"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Differs" => 32,"IsDgitImport" => undef},{"Differs" => 18,"IsDgitImport" => undef,"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","IsOrigin" => "","Ix" => 1}],"Type" => "MergedBreakwaters","Tree" => "19be1dc2921e8842dafec024eb89b0268a9a988f"} 609s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 609s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 609s git-debrebase = Changelog {"CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"}],"Type" => "Changelog","Tree" => "9d383022823105715207a03601780dbceeb8ee4d"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 609s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 609s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 609s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"},{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"} 609s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 609s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 609s git-debrebase = Packaging {"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d"}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 609s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 609s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}],"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d"} 609s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 609s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 609s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging"} 609s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 609s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 609s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"} 609s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 609s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 609s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}]} 609s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 609s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 609s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 609s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 609s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 609s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 609s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 609s git-debrebase *** WALK prep done cur=dca9d4a9e078da5f3297cb5b1fbe181facc58b6f brw -1 upp 7 proc 8 pm -1 609s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 609s ' 609s ++ git rev-parse HEAD 609s + expect=32a38e30134484c0dc4850435722191a3f559d89 609s + exec 609s + local cid ctype info nparents 609s + read cid ctype info 609s + : ===== 32a38e30134484c0dc4850435722191a3f559d89 Upstream ===== 609s + test 32a38e30134484c0dc4850435722191a3f559d89 = 32a38e30134484c0dc4850435722191a3f559d89 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 32a38e30134484c0dc4850435722191a3f559d89 609s + local parents=0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s + expect=0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s + enparents=1 609s + : Upstream/SAME 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd Upstream ===== 609s + test 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd = 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 0ea12ee4f71c2ac6fcb24198a6c459a920c92ddd 609s + local parents=cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s + expect=cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s + enparents=1 609s + : Upstream/SAME cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== cd99febf99da0eef1eb26919874bc5d31c1f4ba7 Upstream ===== 609s + test cd99febf99da0eef1eb26919874bc5d31c1f4ba7 = cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P cd99febf99da0eef1eb26919874bc5d31c1f4ba7 609s + local parents=4455c07072ec240c5daae910496027a5939c7514 609s + expect=4455c07072ec240c5daae910496027a5939c7514 609s + enparents=1 609s + : Upstream/SAME 4455c07072ec240c5daae910496027a5939c7514 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s 4455c07072ec240c5daae910496027a5939c7514 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 4455c07072ec240c5daae910496027a5939c7514 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 4455c07072ec240c5daae910496027a5939c7514 Upstream ===== 609s + test 4455c07072ec240c5daae910496027a5939c7514 = 4455c07072ec240c5daae910496027a5939c7514 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 4455c07072ec240c5daae910496027a5939c7514 609s + local parents=15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s + expect=15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s + enparents=1 609s + : Upstream/SAME 15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s 15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 15d6e6b198051efbe5d7e117b88c5e8faefa3fca Upstream ===== 609s + test 15d6e6b198051efbe5d7e117b88c5e8faefa3fca = 15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 15d6e6b198051efbe5d7e117b88c5e8faefa3fca 609s + local parents=9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s + expect=9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s + enparents=1 609s + : Upstream/SAME 9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s 9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 9a6794d2a4551d335468aa98a3fe23887bb85d1d Upstream ===== 609s + test 9a6794d2a4551d335468aa98a3fe23887bb85d1d = 9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 9a6794d2a4551d335468aa98a3fe23887bb85d1d 609s + local parents=fd4dcde030d308aa4b66f67034700236ffb2117d 609s + expect=fd4dcde030d308aa4b66f67034700236ffb2117d 609s + enparents=1 609s + : Upstream/SAME fd4dcde030d308aa4b66f67034700236ffb2117d 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s fd4dcde030d308aa4b66f67034700236ffb2117d 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo fd4dcde030d308aa4b66f67034700236ffb2117d 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== fd4dcde030d308aa4b66f67034700236ffb2117d Upstream ===== 609s + test fd4dcde030d308aa4b66f67034700236ffb2117d = fd4dcde030d308aa4b66f67034700236ffb2117d 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P fd4dcde030d308aa4b66f67034700236ffb2117d 609s + local parents=81827e3901584310111ced6892dfdee839c0ea86 609s + expect=81827e3901584310111ced6892dfdee839c0ea86 609s + enparents=1 609s + : Upstream/SAME 81827e3901584310111ced6892dfdee839c0ea86 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s 81827e3901584310111ced6892dfdee839c0ea86 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 81827e3901584310111ced6892dfdee839c0ea86 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 81827e3901584310111ced6892dfdee839c0ea86 Upstream ===== 609s + test 81827e3901584310111ced6892dfdee839c0ea86 = 81827e3901584310111ced6892dfdee839c0ea86 609s + local cetype=Upstream 609s + '[' xUpstream = xUpstream ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 81827e3901584310111ced6892dfdee839c0ea86 609s + local parents=dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + expect=dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + enparents=1 609s + : Upstream/SAME dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s ++ printf %s dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== dca9d4a9e078da5f3297cb5b1fbe181facc58b6f MergedBreakwaters ===== 609s + test dca9d4a9e078da5f3297cb5b1fbe181facc58b6f = dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + local cetype=Upstream 609s + '[' xMergedBreakwaters = xUpstream ']' 609s ++ git log -n1 --pretty=format:%P dca9d4a9e078da5f3297cb5b1fbe181facc58b6f 609s + local 'parents=ddf13630dfac6908ad32a0f19dd27a19b12f10b1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d' 609s + expect='ddf13630dfac6908ad32a0f19dd27a19b12f10b1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d' 609s + enparents=1 609s + : MergedBreakwaters/Upstream 'ddf13630dfac6908ad32a0f19dd27a19b12f10b1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d' 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + enparents=2 609s ++ printf %s 'ddf13630dfac6908ad32a0f19dd27a19b12f10b1 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d' 609s ++ wc -w 609s + local cnparents=2 609s + test 2 = 2 609s ++ for f in $parents 609s ++ echo ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s ++ for f in $parents 609s ++ echo 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=2 609s + test 2 = 2 609s + case "$parents" in 609s + case "$ctype" in 609s + local f 609s + local parent_ix=0 609s + for f in $parents 609s + t-gdr-good-analyse ddf13630dfac6908ad32a0f19dd27a19b12f10b1 breakwater -mp0 609s + local head=ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + local state=breakwater 609s + local wsfx=-mp0 609s + local etypes bwtip 609s + case $state in 609s + etypes=Packaging 609s + anal=../anal-mp0 609s + t-git-debrebase analyse ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + local gdr=git-debrebase 609s + : ' 609s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 609s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s git-debrebase *** WALK ddf13630dfac6908ad32a0f19dd27a19b12f10b1 1 *main::STDOUT 609s git-debrebase get_differs 1b928d4b44e70ba8dfce10ff5b94945f972091da 9d383022823105715207a03601780dbceeb8ee4d = 0x10 609s git-debrebase classify ddf13630dfac6908ad32a0f19dd27a19b12f10b1 $t=9d383022823105715207a03601780dbceeb8ee4d @p 1b928d4b44e70ba8dfce10ff5b94945f972091da/0x10 609s git-debrebase = Changelog {"Tree" => "9d383022823105715207a03601780dbceeb8ee4d","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da"}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 9d383022823105715207a03601780dbceeb8ee4d\nparent 1b928d4b44e70ba8dfce10ff5b94945f972091da\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "ddf13630dfac6908ad32a0f19dd27a19b12f10b1","Type" => "Changelog"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x2 609s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 c39ef911d5f793934542a9f688f29ffa6dae6314 = 0x30 609s git-debrebase classify 1b928d4b44e70ba8dfce10ff5b94945f972091da $t=c39ef911d5f793934542a9f688f29ffa6dae6314 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 609s git-debrebase = Anchor {"Hdr" => "tree c39ef911d5f793934542a9f688f29ffa6dae6314\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "1b928d4b44e70ba8dfce10ff5b94945f972091da","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Tree" => "c39ef911d5f793934542a9f688f29ffa6dae6314","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 609s git-debrebase *** WALK prep done cur=1b928d4b44e70ba8dfce10ff5b94945f972091da brw 0 upp -1 proc 1 pm -1 609s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 609s ' 609s ++ git rev-parse ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + expect=ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + exec 609s + local cid ctype info nparents 609s + read cid ctype info 609s + : ===== ddf13630dfac6908ad32a0f19dd27a19b12f10b1 Changelog ===== 609s + test ddf13630dfac6908ad32a0f19dd27a19b12f10b1 = ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + local cetype=Packaging 609s + '[' xChangelog = xPackaging ']' 609s ++ git log -n1 --pretty=format:%P ddf13630dfac6908ad32a0f19dd27a19b12f10b1 609s + local parents=1b928d4b44e70ba8dfce10ff5b94945f972091da 609s + expect=1b928d4b44e70ba8dfce10ff5b94945f972091da 609s + enparents=1 609s + : Changelog/Packaging 1b928d4b44e70ba8dfce10ff5b94945f972091da 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet 1b928d4b44e70ba8dfce10ff5b94945f972091da..ddf13630dfac6908ad32a0f19dd27a19b12f10b1 -- :. ':!debian/changelog' 609s + etypes=Packaging 609s ++ printf %s 1b928d4b44e70ba8dfce10ff5b94945f972091da 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 1b928d4b44e70ba8dfce10ff5b94945f972091da 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 1b928d4b44e70ba8dfce10ff5b94945f972091da Anchor ===== 609s + test 1b928d4b44e70ba8dfce10ff5b94945f972091da = 1b928d4b44e70ba8dfce10ff5b94945f972091da 609s + local cetype=Packaging 609s + '[' xAnchor = xPackaging ']' 609s ++ git log -n1 --pretty=format:%P 1b928d4b44e70ba8dfce10ff5b94945f972091da 609s + local 'parents=075ef1bebca2f99591cafd47f62fb9ceb67c6317 9638c2110033b719cc742997b9527505ffdc1a65' 609s + expect='075ef1bebca2f99591cafd47f62fb9ceb67c6317 9638c2110033b719cc742997b9527505ffdc1a65' 609s + enparents=1 609s + : Anchor/Packaging '075ef1bebca2f99591cafd47f62fb9ceb67c6317 9638c2110033b719cc742997b9527505ffdc1a65' 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + break 609s + parent_ix=1 609s + for f in $parents 609s + t-gdr-good-analyse 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d breakwater -mp1 609s + local head=6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + local state=breakwater 609s + local wsfx=-mp1 609s + local etypes bwtip 609s + case $state in 609s + etypes=Packaging 609s + anal=../anal-mp1 609s + t-git-debrebase analyse 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + local gdr=git-debrebase 609s + : ' 609s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 609s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s git-debrebase *** WALK 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 1 *main::STDOUT 609s git-debrebase get_differs 031a9344309867022099bf265d1410cd72fa8d3d 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 609s git-debrebase classify 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 031a9344309867022099bf265d1410cd72fa8d3d/0x20 609s git-debrebase = Packaging {"CommitId" => "6c6025a14343e6237e62d77c3b6eb3ef01ffb88d","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 031a9344309867022099bf265d1410cd72fa8d3d\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Ix" => 0}],"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 609s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 609s git-debrebase classify 031a9344309867022099bf265d1410cd72fa8d3d $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 609s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","CommitId" => "031a9344309867022099bf265d1410cd72fa8d3d","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 609s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 609s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 609s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 609s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 609s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 609s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 609s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 609s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 609s git-debrebase = Changelog {"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 609s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 609s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 609s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 609s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 609s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 609s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 609s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 609s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 5 upp -1 proc 6 pm -1 609s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 609s ' 609s ++ git rev-parse 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + expect=6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + exec 609s + local cid ctype info nparents 609s + read cid ctype info 609s + : ===== 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d Packaging ===== 609s + test 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d = 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + local cetype=Packaging 609s + '[' xPackaging = xPackaging ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 6c6025a14343e6237e62d77c3b6eb3ef01ffb88d 609s + local parents=031a9344309867022099bf265d1410cd72fa8d3d 609s + expect=031a9344309867022099bf265d1410cd72fa8d3d 609s + enparents=1 609s + : Packaging/SAME 031a9344309867022099bf265d1410cd72fa8d3d 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet 031a9344309867022099bf265d1410cd72fa8d3d..6c6025a14343e6237e62d77c3b6eb3ef01ffb88d -- :. ':!debian' 609s + git diff --quiet 031a9344309867022099bf265d1410cd72fa8d3d..6c6025a14343e6237e62d77c3b6eb3ef01ffb88d -- :debian/patches 609s + etypes=Packaging 609s ++ printf %s 031a9344309867022099bf265d1410cd72fa8d3d 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 031a9344309867022099bf265d1410cd72fa8d3d 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 031a9344309867022099bf265d1410cd72fa8d3d Packaging ===== 609s + test 031a9344309867022099bf265d1410cd72fa8d3d = 031a9344309867022099bf265d1410cd72fa8d3d 609s + local cetype=Packaging 609s + '[' xPackaging = xPackaging ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 031a9344309867022099bf265d1410cd72fa8d3d 609s + local parents=075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s + expect=075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s + enparents=1 609s + : Packaging/SAME 075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..031a9344309867022099bf265d1410cd72fa8d3d -- :. ':!debian' 609s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..031a9344309867022099bf265d1410cd72fa8d3d -- :debian/patches 609s + etypes=Packaging 609s ++ printf %s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Packaging ===== 609s + test 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s + local cetype=Packaging 609s + '[' xPackaging = xPackaging ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P 075ef1bebca2f99591cafd47f62fb9ceb67c6317 609s + local parents=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s + expect=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s + enparents=1 609s + : Packaging/SAME bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :. ':!debian' 609s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :debian/patches 609s + etypes=Packaging 609s ++ printf %s bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Packaging ===== 609s + test bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa = bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s + local cetype=Packaging 609s + '[' xPackaging = xPackaging ']' 609s + cetype=SAME 609s ++ git log -n1 --pretty=format:%P bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 609s + local parents=fc9b56489e07bdd371d3da847892acc46dfd58a8 609s + expect=fc9b56489e07bdd371d3da847892acc46dfd58a8 609s + enparents=1 609s + : Packaging/SAME fc9b56489e07bdd371d3da847892acc46dfd58a8 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :. ':!debian' 609s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :debian/patches 609s + etypes=Packaging 609s ++ printf %s fc9b56489e07bdd371d3da847892acc46dfd58a8 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo fc9b56489e07bdd371d3da847892acc46dfd58a8 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== fc9b56489e07bdd371d3da847892acc46dfd58a8 Changelog ===== 609s + test fc9b56489e07bdd371d3da847892acc46dfd58a8 = fc9b56489e07bdd371d3da847892acc46dfd58a8 609s + local cetype=Packaging 609s + '[' xChangelog = xPackaging ']' 609s ++ git log -n1 --pretty=format:%P fc9b56489e07bdd371d3da847892acc46dfd58a8 609s + local parents=5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s + expect=5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s + enparents=1 609s + : Changelog/Packaging 5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet 5402b11174c7526744a60cd1accfa3aeecbc7e5d..fc9b56489e07bdd371d3da847892acc46dfd58a8 -- :. ':!debian/changelog' 609s + etypes=Packaging 609s ++ printf %s 5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 5402b11174c7526744a60cd1accfa3aeecbc7e5d Changelog ===== 609s + test 5402b11174c7526744a60cd1accfa3aeecbc7e5d = 5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s + local cetype=Packaging 609s + '[' xChangelog = xPackaging ']' 609s ++ git log -n1 --pretty=format:%P 5402b11174c7526744a60cd1accfa3aeecbc7e5d 609s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s + enparents=1 609s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..5402b11174c7526744a60cd1accfa3aeecbc7e5d -- :. ':!debian/changelog' 609s + etypes=Packaging 609s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s ++ wc -w 609s + local cnparents=1 609s + test 1 = 1 609s ++ for f in $parents 609s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s ++ wc -w 609s ++ t-sort -u 609s ++ LC_COLLATE=C 609s ++ sort -u 609s + local cndparents=1 609s + test 1 = 1 609s + case "$parents" in 609s + case "$ctype" in 609s + read cid ctype info 609s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 609s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s + local cetype=Packaging 609s + '[' xAnchor = xPackaging ']' 609s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 609s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 609s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 609s + enparents=1 609s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 609s + case "$ctype/$cetype" in 609s + case "$ctype/$etypes" in 609s + case "$cetype" in 609s + case "$ctype" in 609s + break 609s + parent_ix=2 609s + return 609s + t-ok 609s + : ======================================== 609s + t-check-only-bpd 609s + '[' .. = .. ']' 609s + return 609s + t-fscks 609s + shopt -s nullglob 609s + for d in $tmp/*/.git $tmp/git/*.git 609s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 609s + t-git-fsck 609s ++ git rev-parse --git-dir 609s + local fsckerrs=.git/dgit-test-fsck.errs 609s + set +e 609s + LC_MESSAGES=C 609s + git fsck --no-dangling --strict 609s + tee .git/dgit-test-fsck.errs 609s + ps='0 0' 609s + set -e 609s + local pats 609s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 609s + test '0 0' = '0 0' 609s + pats+=(-e 'notice: HEAD points to an unborn branch') 609s + pats+=(-e 'notice: No default references') 609s + set +e 609s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 609s + rc=1 609s + set -e 609s + case $rc in 609s + t-save-artifacts 609s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts 609s + '[' x/tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts = x ']' 609s + '[' xtmp = x ']' 609s + GZIP=-1v 609s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-merge-conflicts-artifacts/gdr-merge-conflicts.tar.gz '--exclude=*.tar' . 609s gzip: warning: GZIP environment variable is deprecated; use an alias or script 609s 81.7% 609s + echo ok. 609s ok. 609s + rc=0 609s + set +x 609s + set +e 609s + pwd 609s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 609s + '[' x '!=' x ']' 609s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 609s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 609s + set -e 609s + test 0 = 0 610s autopkgtest [12:28:24]: test gdr-merge-conflicts: -----------------------] 610s gdr-merge-conflicts PASS 610s autopkgtest [12:28:24]: test gdr-merge-conflicts: - - - - - - - - - - results - - - - - - - - - - 610s autopkgtest [12:28:24]: test gdr-diverge-nmu: preparing testbed 672s autopkgtest [12:29:26]: testbed dpkg architecture: amd64 672s autopkgtest [12:29:26]: testbed apt version: 2.4.13 672s autopkgtest [12:29:26]: @@@@@@@@@@@@@@@@@@@@ test bed setup 672s autopkgtest [12:29:26]: testbed release detected to be: jammy 672s autopkgtest [12:29:26]: updating testbed package index (apt update) 672s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 672s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 672s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 672s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 672s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 672s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 672s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 672s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 672s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 672s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 672s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 672s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 672s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 672s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 672s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 672s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 672s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 676s Fetched 1719 kB in 1s (3098 kB/s) 677s Reading package lists... 677s autopkgtest [12:29:31]: upgrading testbed (apt dist-upgrade and autopurge) 677s Reading package lists... 677s Building dependency tree... 677s Reading state information... 677s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 677s Starting 2 pkgProblemResolver with broken count: 0 677s Done 678s Entering ResolveByKeep 678s 678s The following packages will be upgraded: 678s apt apt-utils libapt-pkg6.0 678s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 678s Need to get 2486 kB of archives. 678s After this operation, 0 B of additional disk space will be used. 678s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 678s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 678s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 679s Fetched 2486 kB in 0s (50.7 MB/s) 679s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 679s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 679s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 679s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 679s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 679s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 679s Unpacking apt (2.4.14) over (2.4.13) ... 679s Setting up apt (2.4.14) ... 680s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 680s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 680s Unpacking apt-utils (2.4.14) over (2.4.13) ... 680s Setting up apt-utils (2.4.14) ... 680s Processing triggers for man-db (2.10.2-1) ... 680s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 681s Reading package lists... 681s Building dependency tree... 681s Reading state information... 682s Starting pkgProblemResolver with broken count: 0 682s Starting 2 pkgProblemResolver with broken count: 0 682s Done 682s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 682s autopkgtest [12:29:36]: rebooting testbed after setup commands that affected boot 695s Reading package lists... 695s Building dependency tree... 695s Reading state information... 695s Starting pkgProblemResolver with broken count: 0 695s Starting 2 pkgProblemResolver with broken count: 0 695s Done 696s The following NEW packages will be installed: 696s autoconf automake autopoint autotools-dev bc build-essential 696s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 696s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 696s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 696s git-debrebase git-man intltool-debian libarchive-zip-perl libasan6 696s libatomic1 libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 696s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 696s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 696s libdynaloader-functions-perl libencode-locale-perl liberror-perl 696s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 696s libfile-fnmatch-perl libfile-homedir-perl libfile-listing-perl 696s libfile-stripnondeterminism-perl libfile-touch-perl libfile-which-perl 696s libgcc-11-dev libgomp1 libhtml-parser-perl libhtml-tagset-perl 696s libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 696s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 696s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 696s libisl23 libitm1 libjson-perl liblist-moreutils-perl 696s liblist-moreutils-xs-perl liblsan0 liblwp-mediatypes-perl 696s liblwp-protocol-https-perl libmodule-runtime-perl libmoo-perl libmpc3 696s libnet-http-perl libnet-ssleay-perl libnsl-dev libparams-classify-perl 696s libquadmath0 librole-tiny-perl libstdc++-11-dev libsub-override-perl 696s libsub-quote-perl libtext-csv-perl libtext-glob-perl libtimedate-perl 696s libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 liburi-perl 696s libwww-curl-perl libwww-perl libwww-robotrules-perl linux-libc-dev m4 696s patchutils perl-openssl-defaults po-debconf python3-dateutil python3-debian 696s python3-gpg rpcsvc-proto sqlite3 wdiff 696s 0 upgraded, 115 newly installed, 0 to remove and 0 not upgraded. 696s Need to get 72.9 MB of archives. 696s After this operation, 247 MB of additional disk space will be used. 696s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 696s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 696s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 696s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 696s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 696s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 696s Get:7 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 696s Get:8 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 696s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 696s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 696s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 696s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 696s Get:13 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 696s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 696s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 696s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 696s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 696s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 696s Get:19 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 696s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 696s Get:21 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 696s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 696s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 696s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 696s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 696s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 696s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 696s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 696s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 696s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 696s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 696s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 696s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 696s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 696s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 696s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 696s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 696s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 696s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 696s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 696s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 696s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 696s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 696s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 696s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 696s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 696s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 696s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 696s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 696s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 696s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 696s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 696s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 696s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 696s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 696s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 696s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 696s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 696s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 696s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 696s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 696s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 696s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 696s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 696s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 696s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 696s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 696s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 696s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 696s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 696s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 696s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 696s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 696s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 696s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 696s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 696s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 696s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 696s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 696s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 696s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 696s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 696s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 696s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 696s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 696s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 696s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 696s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 696s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 696s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 696s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 696s Get:92 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 696s Get:93 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 696s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 696s Get:95 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 696s Get:96 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 696s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 696s Get:98 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 696s Get:99 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 696s Get:100 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 696s Get:101 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 696s Get:102 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 696s Get:103 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 696s Get:104 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 696s Get:105 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 696s Get:106 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 696s Get:107 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-fnmatch-perl amd64 0.02-2build8 [10.5 kB] 696s Get:108 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-debrebase all 9.15 [67.5 kB] 696s Get:109 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 696s Get:110 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 696s Get:111 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 696s Get:112 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 696s Get:113 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 696s Get:114 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 696s Get:115 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 697s Fetched 72.9 MB in 1s (108 MB/s) 697s Selecting previously unselected package m4. 697s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 697s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 697s Unpacking m4 (1.4.18-5ubuntu2) ... 697s Selecting previously unselected package autoconf. 697s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 697s Unpacking autoconf (2.71-2) ... 697s Selecting previously unselected package autotools-dev. 697s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 697s Unpacking autotools-dev (20220109.1) ... 697s Selecting previously unselected package automake. 697s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 697s Unpacking automake (1:1.16.5-1.3) ... 697s Selecting previously unselected package autopoint. 697s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 697s Unpacking autopoint (0.21-4ubuntu4) ... 697s Selecting previously unselected package bc. 697s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 697s Unpacking bc (1.07.1-3build1) ... 697s Selecting previously unselected package libc-dev-bin. 697s Preparing to unpack .../006-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 697s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 697s Selecting previously unselected package linux-libc-dev:amd64. 697s Preparing to unpack .../007-linux-libc-dev_5.15.0-135.146_amd64.deb ... 697s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 698s Selecting previously unselected package libcrypt-dev:amd64. 698s Preparing to unpack .../008-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 698s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 698s Selecting previously unselected package rpcsvc-proto. 698s Preparing to unpack .../009-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 698s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 698s Selecting previously unselected package libtirpc-dev:amd64. 698s Preparing to unpack .../010-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 698s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 698s Selecting previously unselected package libnsl-dev:amd64. 698s Preparing to unpack .../011-libnsl-dev_1.3.0-2build2_amd64.deb ... 698s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 698s Selecting previously unselected package libc6-dev:amd64. 698s Preparing to unpack .../012-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 698s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 698s Selecting previously unselected package gcc-11-base:amd64. 698s Preparing to unpack .../013-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libisl23:amd64. 698s Preparing to unpack .../014-libisl23_0.24-2build1_amd64.deb ... 698s Unpacking libisl23:amd64 (0.24-2build1) ... 698s Selecting previously unselected package libmpc3:amd64. 698s Preparing to unpack .../015-libmpc3_1.2.1-2build1_amd64.deb ... 698s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 698s Selecting previously unselected package cpp-11. 698s Preparing to unpack .../016-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package cpp. 698s Preparing to unpack .../017-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 698s Unpacking cpp (4:11.2.0-1ubuntu1) ... 698s Selecting previously unselected package libcc1-0:amd64. 698s Preparing to unpack .../018-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libgomp1:amd64. 698s Preparing to unpack .../019-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libitm1:amd64. 698s Preparing to unpack .../020-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libatomic1:amd64. 698s Preparing to unpack .../021-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libasan6:amd64. 698s Preparing to unpack .../022-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package liblsan0:amd64. 698s Preparing to unpack .../023-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libtsan0:amd64. 698s Preparing to unpack .../024-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libubsan1:amd64. 698s Preparing to unpack .../025-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libquadmath0:amd64. 698s Preparing to unpack .../026-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package libgcc-11-dev:amd64. 698s Preparing to unpack .../027-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package gcc-11. 698s Preparing to unpack .../028-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 698s Selecting previously unselected package gcc. 698s Preparing to unpack .../029-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 698s Unpacking gcc (4:11.2.0-1ubuntu1) ... 698s Selecting previously unselected package libstdc++-11-dev:amd64. 698s Preparing to unpack .../030-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 698s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 699s Selecting previously unselected package g++-11. 699s Preparing to unpack .../031-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 699s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 699s Selecting previously unselected package g++. 699s Preparing to unpack .../032-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 699s Unpacking g++ (4:11.2.0-1ubuntu1) ... 699s Selecting previously unselected package build-essential. 699s Preparing to unpack .../033-build-essential_12.9ubuntu3_amd64.deb ... 699s Unpacking build-essential (12.9ubuntu3) ... 699s Selecting previously unselected package libdebhelper-perl. 699s Preparing to unpack .../034-libdebhelper-perl_13.6ubuntu1_all.deb ... 699s Unpacking libdebhelper-perl (13.6ubuntu1) ... 699s Selecting previously unselected package libtool. 699s Preparing to unpack .../035-libtool_2.4.6-15build2_all.deb ... 699s Unpacking libtool (2.4.6-15build2) ... 699s Selecting previously unselected package dh-autoreconf. 699s Preparing to unpack .../036-dh-autoreconf_20_all.deb ... 699s Unpacking dh-autoreconf (20) ... 699s Selecting previously unselected package libarchive-zip-perl. 699s Preparing to unpack .../037-libarchive-zip-perl_1.68-1_all.deb ... 699s Unpacking libarchive-zip-perl (1.68-1) ... 699s Selecting previously unselected package libsub-override-perl. 699s Preparing to unpack .../038-libsub-override-perl_0.09-2_all.deb ... 699s Unpacking libsub-override-perl (0.09-2) ... 699s Selecting previously unselected package libfile-stripnondeterminism-perl. 699s Preparing to unpack .../039-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 699s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 699s Selecting previously unselected package dh-strip-nondeterminism. 699s Preparing to unpack .../040-dh-strip-nondeterminism_1.13.0-1_all.deb ... 699s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 699s Selecting previously unselected package debugedit. 699s Preparing to unpack .../041-debugedit_1%3a5.0-4build1_amd64.deb ... 699s Unpacking debugedit (1:5.0-4build1) ... 699s Selecting previously unselected package dwz. 699s Preparing to unpack .../042-dwz_0.14-1build2_amd64.deb ... 699s Unpacking dwz (0.14-1build2) ... 699s Selecting previously unselected package gettext. 699s Preparing to unpack .../043-gettext_0.21-4ubuntu4_amd64.deb ... 699s Unpacking gettext (0.21-4ubuntu4) ... 699s Selecting previously unselected package intltool-debian. 699s Preparing to unpack .../044-intltool-debian_0.35.0+20060710.5_all.deb ... 699s Unpacking intltool-debian (0.35.0+20060710.5) ... 699s Selecting previously unselected package po-debconf. 699s Preparing to unpack .../045-po-debconf_1.0.21+nmu1_all.deb ... 699s Unpacking po-debconf (1.0.21+nmu1) ... 699s Selecting previously unselected package debhelper. 699s Preparing to unpack .../046-debhelper_13.6ubuntu1_all.deb ... 699s Unpacking debhelper (13.6ubuntu1) ... 699s Selecting previously unselected package libfakeroot:amd64. 699s Preparing to unpack .../047-libfakeroot_1.28-1ubuntu1_amd64.deb ... 699s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 699s Selecting previously unselected package fakeroot. 699s Preparing to unpack .../048-fakeroot_1.28-1ubuntu1_amd64.deb ... 699s Unpacking fakeroot (1.28-1ubuntu1) ... 699s Selecting previously unselected package libfile-dirlist-perl. 699s Preparing to unpack .../049-libfile-dirlist-perl_0.05-2_all.deb ... 699s Unpacking libfile-dirlist-perl (0.05-2) ... 699s Selecting previously unselected package libfile-which-perl. 699s Preparing to unpack .../050-libfile-which-perl_1.23-1_all.deb ... 699s Unpacking libfile-which-perl (1.23-1) ... 699s Selecting previously unselected package libfile-homedir-perl. 699s Preparing to unpack .../051-libfile-homedir-perl_1.006-1_all.deb ... 699s Unpacking libfile-homedir-perl (1.006-1) ... 699s Selecting previously unselected package libfile-touch-perl. 699s Preparing to unpack .../052-libfile-touch-perl_0.12-1_all.deb ... 699s Unpacking libfile-touch-perl (0.12-1) ... 699s Selecting previously unselected package libio-pty-perl. 699s Preparing to unpack .../053-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 699s Unpacking libio-pty-perl (1:1.15-2build2) ... 699s Selecting previously unselected package libipc-run-perl. 699s Preparing to unpack .../054-libipc-run-perl_20200505.0-1_all.deb ... 699s Unpacking libipc-run-perl (20200505.0-1) ... 699s Selecting previously unselected package libclass-method-modifiers-perl. 699s Preparing to unpack .../055-libclass-method-modifiers-perl_2.13-1_all.deb ... 699s Unpacking libclass-method-modifiers-perl (2.13-1) ... 699s Selecting previously unselected package libclass-xsaccessor-perl. 699s Preparing to unpack .../056-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 699s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 699s Selecting previously unselected package libb-hooks-op-check-perl. 699s Preparing to unpack .../057-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 699s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 699s Selecting previously unselected package libdynaloader-functions-perl. 699s Preparing to unpack .../058-libdynaloader-functions-perl_0.003-1.1_all.deb ... 699s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 699s Selecting previously unselected package libdevel-callchecker-perl. 699s Preparing to unpack .../059-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 699s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 699s Selecting previously unselected package libparams-classify-perl. 699s Preparing to unpack .../060-libparams-classify-perl_0.015-1build5_amd64.deb ... 699s Unpacking libparams-classify-perl (0.015-1build5) ... 699s Selecting previously unselected package libmodule-runtime-perl. 699s Preparing to unpack .../061-libmodule-runtime-perl_0.016-1_all.deb ... 699s Unpacking libmodule-runtime-perl (0.016-1) ... 699s Selecting previously unselected package libimport-into-perl. 699s Preparing to unpack .../062-libimport-into-perl_1.002005-1_all.deb ... 699s Unpacking libimport-into-perl (1.002005-1) ... 699s Selecting previously unselected package librole-tiny-perl. 699s Preparing to unpack .../063-librole-tiny-perl_2.002004-1_all.deb ... 699s Unpacking librole-tiny-perl (2.002004-1) ... 699s Selecting previously unselected package libsub-quote-perl. 699s Preparing to unpack .../064-libsub-quote-perl_2.006006-1_all.deb ... 699s Unpacking libsub-quote-perl (2.006006-1) ... 699s Selecting previously unselected package libmoo-perl. 699s Preparing to unpack .../065-libmoo-perl_2.005004-3_all.deb ... 699s Unpacking libmoo-perl (2.005004-3) ... 699s Selecting previously unselected package libencode-locale-perl. 699s Preparing to unpack .../066-libencode-locale-perl_1.05-1.1_all.deb ... 699s Unpacking libencode-locale-perl (1.05-1.1) ... 699s Selecting previously unselected package libtimedate-perl. 699s Preparing to unpack .../067-libtimedate-perl_2.3300-2_all.deb ... 699s Unpacking libtimedate-perl (2.3300-2) ... 699s Selecting previously unselected package libhttp-date-perl. 699s Preparing to unpack .../068-libhttp-date-perl_6.05-1_all.deb ... 699s Unpacking libhttp-date-perl (6.05-1) ... 699s Selecting previously unselected package libfile-listing-perl. 699s Preparing to unpack .../069-libfile-listing-perl_6.14-1_all.deb ... 699s Unpacking libfile-listing-perl (6.14-1) ... 699s Selecting previously unselected package libhtml-tagset-perl. 699s Preparing to unpack .../070-libhtml-tagset-perl_3.20-4_all.deb ... 699s Unpacking libhtml-tagset-perl (3.20-4) ... 699s Selecting previously unselected package liburi-perl. 699s Preparing to unpack .../071-liburi-perl_5.10-1_all.deb ... 699s Unpacking liburi-perl (5.10-1) ... 699s Selecting previously unselected package libhtml-parser-perl:amd64. 699s Preparing to unpack .../072-libhtml-parser-perl_3.76-1build2_amd64.deb ... 699s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 700s Selecting previously unselected package libhtml-tree-perl. 700s Preparing to unpack .../073-libhtml-tree-perl_5.07-2_all.deb ... 700s Unpacking libhtml-tree-perl (5.07-2) ... 700s Selecting previously unselected package libio-html-perl. 700s Preparing to unpack .../074-libio-html-perl_1.004-2_all.deb ... 700s Unpacking libio-html-perl (1.004-2) ... 700s Selecting previously unselected package liblwp-mediatypes-perl. 700s Preparing to unpack .../075-liblwp-mediatypes-perl_6.04-1_all.deb ... 700s Unpacking liblwp-mediatypes-perl (6.04-1) ... 700s Selecting previously unselected package libhttp-message-perl. 700s Preparing to unpack .../076-libhttp-message-perl_6.36-1_all.deb ... 700s Unpacking libhttp-message-perl (6.36-1) ... 700s Selecting previously unselected package libhttp-cookies-perl. 700s Preparing to unpack .../077-libhttp-cookies-perl_6.10-1_all.deb ... 700s Unpacking libhttp-cookies-perl (6.10-1) ... 700s Selecting previously unselected package libhttp-negotiate-perl. 700s Preparing to unpack .../078-libhttp-negotiate-perl_6.01-1_all.deb ... 700s Unpacking libhttp-negotiate-perl (6.01-1) ... 700s Selecting previously unselected package perl-openssl-defaults:amd64. 700s Preparing to unpack .../079-perl-openssl-defaults_5build2_amd64.deb ... 700s Unpacking perl-openssl-defaults:amd64 (5build2) ... 700s Selecting previously unselected package libnet-ssleay-perl:amd64. 700s Preparing to unpack .../080-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 700s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 700s Selecting previously unselected package libio-socket-ssl-perl. 700s Preparing to unpack .../081-libio-socket-ssl-perl_2.074-2_all.deb ... 700s Unpacking libio-socket-ssl-perl (2.074-2) ... 700s Selecting previously unselected package libnet-http-perl. 700s Preparing to unpack .../082-libnet-http-perl_6.22-1_all.deb ... 700s Unpacking libnet-http-perl (6.22-1) ... 700s Selecting previously unselected package liblwp-protocol-https-perl. 700s Preparing to unpack .../083-liblwp-protocol-https-perl_6.10-1_all.deb ... 700s Unpacking liblwp-protocol-https-perl (6.10-1) ... 700s Selecting previously unselected package libtry-tiny-perl. 700s Preparing to unpack .../084-libtry-tiny-perl_0.31-1_all.deb ... 700s Unpacking libtry-tiny-perl (0.31-1) ... 700s Selecting previously unselected package libwww-robotrules-perl. 700s Preparing to unpack .../085-libwww-robotrules-perl_6.02-1_all.deb ... 700s Unpacking libwww-robotrules-perl (6.02-1) ... 700s Selecting previously unselected package libwww-perl. 700s Preparing to unpack .../086-libwww-perl_6.61-1_all.deb ... 700s Unpacking libwww-perl (6.61-1) ... 700s Selecting previously unselected package patchutils. 700s Preparing to unpack .../087-patchutils_0.4.2-1build2_amd64.deb ... 700s Unpacking patchutils (0.4.2-1build2) ... 700s Selecting previously unselected package wdiff. 700s Preparing to unpack .../088-wdiff_1.2.2-2build3_amd64.deb ... 700s Unpacking wdiff (1.2.2-2build3) ... 700s Selecting previously unselected package devscripts. 700s Preparing to unpack .../089-devscripts_2.22.1ubuntu1_amd64.deb ... 700s Unpacking devscripts (2.22.1ubuntu1) ... 700s Selecting previously unselected package liberror-perl. 700s Preparing to unpack .../090-liberror-perl_0.17029-1_all.deb ... 700s Unpacking liberror-perl (0.17029-1) ... 700s Selecting previously unselected package git-man. 700s Preparing to unpack .../091-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 700s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 700s Selecting previously unselected package git. 700s Preparing to unpack .../092-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 700s Unpacking git (1:2.34.1-1ubuntu1.12) ... 700s Selecting previously unselected package python3-dateutil. 700s Preparing to unpack .../093-python3-dateutil_2.8.1-6_all.deb ... 700s Unpacking python3-dateutil (2.8.1-6) ... 700s Selecting previously unselected package git-buildpackage. 700s Preparing to unpack .../094-git-buildpackage_0.9.25_all.deb ... 700s Unpacking git-buildpackage (0.9.25) ... 700s Selecting previously unselected package libexporter-tiny-perl. 700s Preparing to unpack .../095-libexporter-tiny-perl_1.002002-1_all.deb ... 700s Unpacking libexporter-tiny-perl (1.002002-1) ... 700s Selecting previously unselected package liblist-moreutils-xs-perl. 700s Preparing to unpack .../096-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 700s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 700s Selecting previously unselected package liblist-moreutils-perl. 700s Preparing to unpack .../097-liblist-moreutils-perl_0.430-2_all.deb ... 700s Unpacking liblist-moreutils-perl (0.430-2) ... 700s Selecting previously unselected package python3-debian. 700s Preparing to unpack .../098-python3-debian_0.1.43ubuntu1.1_all.deb ... 700s Unpacking python3-debian (0.1.43ubuntu1.1) ... 700s Selecting previously unselected package python3-gpg. 700s Preparing to unpack .../099-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 700s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 700s Selecting previously unselected package dput. 700s Preparing to unpack .../100-dput_1.1.0ubuntu2.1_all.deb ... 700s Unpacking dput (1.1.0ubuntu2.1) ... 700s Selecting previously unselected package libjson-perl. 700s Preparing to unpack .../101-libjson-perl_4.04000-1_all.deb ... 700s Unpacking libjson-perl (4.04000-1) ... 700s Selecting previously unselected package libtext-glob-perl. 700s Preparing to unpack .../102-libtext-glob-perl_0.11-2_all.deb ... 700s Unpacking libtext-glob-perl (0.11-2) ... 700s Selecting previously unselected package libwww-curl-perl. 700s Preparing to unpack .../103-libwww-curl-perl_4.17-7build2_amd64.deb ... 700s Unpacking libwww-curl-perl (4.17-7build2) ... 700s Selecting previously unselected package libtext-csv-perl. 700s Preparing to unpack .../104-libtext-csv-perl_2.01-1_all.deb ... 700s Unpacking libtext-csv-perl (2.01-1) ... 700s Selecting previously unselected package dgit. 700s Preparing to unpack .../105-dgit_9.15_all.deb ... 700s Unpacking dgit (9.15) ... 700s Selecting previously unselected package libfile-fnmatch-perl. 700s Preparing to unpack .../106-libfile-fnmatch-perl_0.02-2build8_amd64.deb ... 700s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 700s Selecting previously unselected package git-debrebase. 700s Preparing to unpack .../107-git-debrebase_9.15_all.deb ... 700s Unpacking git-debrebase (9.15) ... 700s Selecting previously unselected package libdbi-perl:amd64. 700s Preparing to unpack .../108-libdbi-perl_1.643-3build3_amd64.deb ... 700s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 700s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 700s Preparing to unpack .../109-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 700s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 700s Selecting previously unselected package sqlite3. 700s Preparing to unpack .../110-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 700s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 700s Selecting previously unselected package chiark-utils-bin. 700s Preparing to unpack .../111-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 700s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 700s Selecting previously unselected package dgit-infrastructure. 700s Preparing to unpack .../112-dgit-infrastructure_9.15_all.deb ... 700s Unpacking dgit-infrastructure (9.15) ... 700s Selecting previously unselected package libfaketime:amd64. 700s Preparing to unpack .../113-libfaketime_0.9.8-9_amd64.deb ... 700s Unpacking libfaketime:amd64 (0.9.8-9) ... 700s Selecting previously unselected package faketime. 700s Preparing to unpack .../114-faketime_0.9.8-9_amd64.deb ... 700s Unpacking faketime (0.9.8-9) ... 700s Setting up wdiff (1.2.2-2build3) ... 700s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 700s Setting up libfile-which-perl (1.23-1) ... 700s Setting up libdynaloader-functions-perl (0.003-1.1) ... 700s Setting up libtext-glob-perl (0.11-2) ... 700s Setting up libclass-method-modifiers-perl (2.13-1) ... 700s Setting up libio-pty-perl (1:1.15-2build2) ... 700s Setting up libarchive-zip-perl (1.68-1) ... 700s Setting up libhtml-tagset-perl (3.20-4) ... 700s Setting up libdebhelper-perl (13.6ubuntu1) ... 700s Setting up liblwp-mediatypes-perl (6.04-1) ... 700s Setting up libtry-tiny-perl (0.31-1) ... 700s Setting up perl-openssl-defaults:amd64 (5build2) ... 700s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 700s Setting up bc (1.07.1-3build1) ... 700s Setting up m4 (1.4.18-5ubuntu2) ... 700s Setting up libwww-curl-perl (4.17-7build2) ... 700s Setting up libencode-locale-perl (1.05-1.1) ... 700s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 700s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 700s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 700s Setting up chiark-utils-bin (6.1.2+nmu1) ... 700s Setting up fakeroot (1.28-1ubuntu1) ... 701s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 701s Setting up liberror-perl (0.17029-1) ... 701s Setting up patchutils (0.4.2-1build2) ... 701s Setting up autotools-dev (20220109.1) ... 701s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 701s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 701s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 701s Setting up python3-debian (0.1.43ubuntu1.1) ... 701s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up libmpc3:amd64 (1.2.1-2build1) ... 701s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up libio-html-perl (1.004-2) ... 701s Setting up autopoint (0.21-4ubuntu4) ... 701s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 701s Setting up libipc-run-perl (20200505.0-1) ... 701s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 701s Setting up autoconf (2.71-2) ... 701s Setting up libfile-fnmatch-perl (0.02-2build8) ... 701s Setting up libtimedate-perl (2.3300-2) ... 701s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up dwz (0.14-1build2) ... 701s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 701s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 701s Setting up libjson-perl (4.04000-1) ... 701s Setting up librole-tiny-perl (2.002004-1) ... 701s Setting up debugedit (1:5.0-4build1) ... 701s Setting up libsub-override-perl (0.09-2) ... 701s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 701s Setting up python3-dateutil (2.8.1-6) ... 701s Setting up libsub-quote-perl (2.006006-1) ... 701s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 701s Setting up libexporter-tiny-perl (1.002002-1) ... 701s Setting up libfile-dirlist-perl (0.05-2) ... 701s Setting up libisl23:amd64 (0.24-2build1) ... 701s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 701s Setting up libfile-homedir-perl (1.006-1) ... 701s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up liburi-perl (5.10-1) ... 701s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 701s Setting up libfile-touch-perl (0.12-1) ... 701s Setting up libdbi-perl:amd64 (1.643-3build3) ... 701s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 701s Setting up libfaketime:amd64 (0.9.8-9) ... 701s Setting up libtext-csv-perl (2.01-1) ... 701s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 701s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 701s Setting up automake (1:1.16.5-1.3) ... 701s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 701s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 701s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 701s Setting up faketime (0.9.8-9) ... 701s Setting up libhttp-date-perl (6.05-1) ... 701s Setting up gettext (0.21-4ubuntu4) ... 701s Setting up libfile-listing-perl (6.14-1) ... 701s Setting up liblist-moreutils-perl (0.430-2) ... 701s Setting up libnet-http-perl (6.22-1) ... 701s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 701s Setting up dput (1.1.0ubuntu2.1) ... 701s Setting up intltool-debian (0.35.0+20060710.5) ... 701s Setting up git (1:2.34.1-1ubuntu1.12) ... 701s Setting up dh-strip-nondeterminism (1.13.0-1) ... 701s Setting up libwww-robotrules-perl (6.02-1) ... 701s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 701s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 701s Setting up cpp (4:11.2.0-1ubuntu1) ... 701s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 701s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 701s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 701s Setting up libio-socket-ssl-perl (2.074-2) ... 701s Setting up libhttp-message-perl (6.36-1) ... 701s Setting up libhttp-negotiate-perl (6.01-1) ... 701s Setting up libhttp-cookies-perl (6.10-1) ... 701s Setting up libtool (2.4.6-15build2) ... 701s Setting up po-debconf (1.0.21+nmu1) ... 701s Setting up libhtml-tree-perl (5.07-2) ... 701s Setting up libparams-classify-perl (0.015-1build5) ... 701s Setting up gcc (4:11.2.0-1ubuntu1) ... 701s Setting up dh-autoreconf (20) ... 701s Setting up libmodule-runtime-perl (0.016-1) ... 701s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 701s Setting up dgit-infrastructure (9.15) ... 701s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 701s Setting up libimport-into-perl (1.002005-1) ... 701s Setting up libmoo-perl (2.005004-3) ... 701s Setting up debhelper (13.6ubuntu1) ... 701s Setting up g++ (4:11.2.0-1ubuntu1) ... 701s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 701s Setting up build-essential (12.9ubuntu3) ... 701s Setting up liblwp-protocol-https-perl (6.10-1) ... 701s Setting up libwww-perl (6.61-1) ... 701s Setting up devscripts (2.22.1ubuntu1) ... 701s Setting up git-buildpackage (0.9.25) ... 701s Setting up git-debrebase (9.15) ... 701s Setting up dgit (9.15) ... 701s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 701s Processing triggers for man-db (2.10.2-1) ... 702s Processing triggers for install-info (6.8-4build1) ... 702s autopkgtest [12:29:56]: test gdr-diverge-nmu: [----------------------- 703s ++ set -o pipefail 703s ++ . tests/lib-core 703s ++ . tests/lib-restricts 703s ++ trap ' 703s rc=$? 703s set +x 703s test $rc = 0 || echo " 703s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 703s 703s Most relevant logs are just before assignment rc=$rc 703s Will now do cleanup etc. 703s " 703s set -x 703s set +e 703s pwd 703s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 703s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 703s set -e 703s test $rc = 0 || t-report-failure 703s ' EXIT 703s ++ t-filter-out-git-hyphen-dir 703s ++ local pathent 703s +++ type -p git-rev-parse 703s +++ : 703s ++ pathent= 703s ++ case "$pathent" in 703s ++ return 703s ++ t-set-intree 703s ++ '[' x = x ']' 703s ++ return 703s ++ : -D 703s ++ export DGIT_TEST_DEBUG 703s ++ : x 703s ++ export DGIT_TEST_DEBPUSH_DEBUG 703s ++ : 703s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 703s ++ GIT_COMMITTER_DATE='1530000000 +0100' 703s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 703s ++ GIT_AUTHOR_DATE='1530000000 +0100' 703s ++ export LC_CTYPE=C.UTF-8 703s ++ LC_CTYPE=C.UTF-8 703s ++ unset CDPATH 703s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 703s ++ FILTER_BRANCH_SQUELCH_WARNING=1 703s +++ pwd 703s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 703s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ testname=gdr-diverge-nmu 703s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ bpd=.. 703s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 703s ++ '[' x '!=' x ']' 703s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s +++ pwd 703s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ t-set-using-tmp 703s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 703s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 703s ++ export 'DEBFULLNAME=dgit test git user' 703s ++ DEBFULLNAME='dgit test git user' 703s ++ git config --global user.email dgit-test@debian.example.net 703s ++ git config --global user.name 'dgit test git user' 703s ++ git config --global protocol.ext.allow always 703s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 703s ++ env -0 703s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 703s ++ export DEBCHANGE_VENDOR=dpkg 703s ++ DEBCHANGE_VENDOR=dpkg 703s ++ unset VISUAL 703s ++ unset GIT_EDITOR 703s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 703s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 703s ++ cat 703s ++ schroot=build 703s ++ : aq 703s ++ : archive/test-dummy 703s ++ : sid:unstable 703s ++ t-git-config dgit.default.old-dsc-distro test-dummy 703s ++ git config --global dgit.default.old-dsc-distro test-dummy 703s ++ for import in ${autoimport-gnupg} 703s ++ case "$0" in 703s ++ t-setup-import gnupg 703s ++ local setupname=gnupg 703s ++ local setupsrc 703s ++ local lock 703s ++ '[' x = x ']' 703s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 703s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 703s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 703s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 703s cd "$1"; shift 703s setupname="$1"; shift 703s simport="$1"; shift 703s if [ -e "$simport" ]; then exit 0; fi 703s env - "$@" \ 703s "tests/setup/$setupname" 703s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 703s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 703s + shift 703s + setupname=gnupg 703s + shift 703s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 703s + shift 703s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 703s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-diverge-nmu -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-diverge-nmu' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 703s ++ set -o pipefail 703s ++ . tests/lib-core 703s ++ . tests/lib-restricts 703s ++ trap ' 703s rc=$? 703s set +x 703s test $rc = 0 || echo " 703s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 703s 703s Most relevant logs are just before assignment rc=$rc 703s Will now do cleanup etc. 703s " 703s set -x 703s set +e 703s pwd 703s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 703s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 703s set -e 703s test $rc = 0 || t-report-failure 703s ' EXIT 703s ++ t-filter-out-git-hyphen-dir 703s ++ local pathent 703s +++ type -p git-rev-parse 703s +++ : 703s ++ pathent= 703s ++ case "$pathent" in 703s ++ return 703s ++ t-set-intree 703s ++ '[' x = x ']' 703s ++ return 703s ++ : -D 703s ++ export DGIT_TEST_DEBUG 703s ++ : x 703s ++ export DGIT_TEST_DEBPUSH_DEBUG 703s ++ : 703s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 703s ++ GIT_COMMITTER_DATE='1530000000 +0100' 703s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 703s ++ GIT_AUTHOR_DATE='1530000000 +0100' 703s ++ export LC_CTYPE=C.UTF-8 703s ++ LC_CTYPE=C.UTF-8 703s ++ unset CDPATH 703s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 703s ++ FILTER_BRANCH_SQUELCH_WARNING=1 703s +++ pwd 703s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 703s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ testname=gnupg 703s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 703s ++ bpd=.. 703s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 703s ++ '[' x '!=' x ']' 703s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s +++ pwd 703s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ t-set-using-tmp 703s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 703s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 703s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 703s ++ export 'DEBFULLNAME=dgit test git user' 703s ++ DEBFULLNAME='dgit test git user' 703s ++ git config --global user.email dgit-test@debian.example.net 703s ++ git config --global user.name 'dgit test git user' 703s ++ git config --global protocol.ext.allow always 703s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 703s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 703s ++ export DEBCHANGE_VENDOR=dpkg 703s ++ DEBCHANGE_VENDOR=dpkg 703s ++ unset VISUAL 703s ++ unset GIT_EDITOR 703s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 703s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 703s ++ cat 703s ++ schroot=build 703s ++ : aq 703s ++ : archive/test-dummy 703s ++ : sid:unstable 703s ++ t-git-config dgit.default.old-dsc-distro test-dummy 703s ++ git config --global dgit.default.old-dsc-distro test-dummy 703s ++ for import in ${autoimport-gnupg} 703s ++ case "$0" in 703s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 703s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 703s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 703s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 703s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 703s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 703s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 703s + setup=' 703s export GNUPGHOME=$tmp/gnupg 703s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 703s 703s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 703s ssb rsa2048 2013-11-17 [E] 703s 703s sec rsa2048 2014-01-26 [SC] 703s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 703s uid [ultimate] Populus Romanus (test key) 703s ssb rsa2048 2014-01-26 [E] 703s 703s sec rsa2048 2014-01-26 [SC] 703s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 703s uid [ unknown] Hannibal (test key) 703s ssb rsa2048 2014-01-26 [E] 703s 703s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 703s export GNUPGHOME=$tmp/gnupg 703s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 703s 703s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 703s delete mode 100644 debian/source/format 703s + git tag v1.0 703s + : 'fake up that our quilt-tip was descended from upstream' 703s + git checkout quilt-tip 703s Switched to branch 'quilt-tip' 703s + git merge --no-edit -s ours upstream 703s Merge made by the 'ours' strategy. 703s + : 'fake up that our quilt-tip had the patch queue in it' 703s + git checkout patch-queue/quilt-tip 703s Switched to branch 'patch-queue/quilt-tip' 703s + gbp pq export 703s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 703s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 703s + git add debian/patches 703s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 703s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 703s 4 files changed, 50 insertions(+) 703s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 703s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 703s create mode 100644 debian/patches/series 703s create mode 100644 debian/patches/subdir/addnewups 703s + : 'make branch names more conventional' 703s + git branch -D master 703s Deleted branch master (was 17d67db). 703s + git branch -m quilt-tip master 703s + not-gdr-processable origin 703s + git branch gdr-unprocessable/origin 703s + t-git-debrebase analyse 703s + local gdr=git-debrebase 703s + grep 'Unknown Unprocessable' 703s + : ' 703s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 703s + git-debrebase --dgit=dgit -D analyse 703s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 703s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 703s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 703s git-debrebase = AddPatches {"Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 703s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 703s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 703s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 703s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Overwritten" => [{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Type" => "Pseudomerge","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 703s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 703s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 703s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 703s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 703s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 703s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Type" => "Mixed","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n"} 703s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 703s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 703s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}]} 703s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 703s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 703s git-debrebase = Packaging {"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 703s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 703s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 703s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 703s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 703s git-debrebase ** Unknown 703s git-debrebase *** WALK BOMB unrecognised 703s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 703s ' 703s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 703s + : 'fake up an upstream 2.0' 703s + git branch make-upstream upstream 703s + t-make-new-upstream-tarball 2.0 703s + local uv=2.0 703s + git checkout make-upstream 703s Switched to branch 'make-upstream' 703s + echo 'upstream 2.0' 703s + git commit -a -m 'upstream 2.0 tarball' 703s [make-upstream 4db56a8] upstream 2.0 tarball 703s 1 file changed, 1 insertion(+) 703s + t-make-orig example 2.0 make-upstream 703s + local p=example 703s + local v=2.0 703s + local tag=make-upstream 703s + ust=example_2.0.orig.tar.gz 703s + GZIP=-1 703s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 703s gzip: warning: GZIP environment variable is deprecated; use an alias or script 703s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 703s + git branch -D quilt-tip-2 703s Deleted branch quilt-tip-2 (was 99fcab4). 703s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 703s + git branch -D gitish-only 703s Deleted branch gitish-only (was 2b2ddc8). 703s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 703s + git branch -D quilt-tip-1.1 703s Deleted branch quilt-tip-1.1 (was 7fc34be). 703s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 703s + git branch -D patch-queue/quilt-tip 703s Deleted branch patch-queue/quilt-tip (was d843a68). 703s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 703s + git branch -D indep-arch 703s Deleted branch indep-arch (was e215729). 703s + : 'see what gbp import-orig does' 703s + git checkout master 703s Switched to branch 'master' 703s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 703s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 703s gbp:info: Source package is example 703s gbp:info: Upstream version is 2.0 703s gbp:info: Replacing upstream source on 'master' 703s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 703s + not-gdr-processable merge 703s + git branch gdr-unprocessable/merge 703s + t-git-debrebase analyse 703s + local gdr=git-debrebase 703s + : ' 703s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 703s + git-debrebase --dgit=dgit -D analyse 703s + grep 'Unknown Unprocessable' 703s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 703s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 703s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 703s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 703s git-debrebase ** Unknown 703s git-debrebase *** WALK BOMB unrecognised 703s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 703s ' 703s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 703s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 703s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 703s + DEBEMAIL=dgit-tests@example.org 703s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 703s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 703s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 703s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 703s 1 file changed, 6 insertions(+) 703s + t-dch-commit-r 703s + t-dch-r-rune t-dch-commit 703s + local cmd=t-dch-commit 703s + shift 703s + local suite=unstable 703s + t-dch-commit -r -D unstable '' 703s + t-debchange -r -D unstable '' 703s + DEBEMAIL=dgit-tests@example.org 703s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 703s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 703s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 703s libdistro-info-perl is not installed, Debian release names are not known. 703s libdistro-info-perl is not installed, Ubuntu release names are not known. 703s + git commit -m 'dch -r -D unstable ' debian/changelog 704s [master f31021f] dch -r -D unstable 704s 1 file changed, 3 insertions(+), 2 deletions(-) 704s + echo garbage 704s + git add debian/patches/garbage 704s + git commit -m 'add garbage' debian/patches/garbage 704s [master eb10718] add garbage 704s 1 file changed, 1 insertion(+) 704s create mode 100644 debian/patches/garbage 704s + t-archive-none example 704s + t-select-package example 704s + p=example 704s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 704s + t-archive-none-aq 704s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 704s + : 704s + local 'jsondelim=[' 704s + local suitespec 704s + for suitespec in $suitespecs 704s + local suite=sid 704s + local sname=unstable 704s + t-aq-archive-updated sid example 704s + local suite=sid 704s + local p=example 704s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 704s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 704s + perl -wne ' 704s use JSON; 704s use strict; 704s our @v; 704s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 704s push @v, { 704s "version" => "$1", 704s "sha256sum" => "$2", 704s "component" => "$3", 704s "filename" => "$4", 704s }; 704s END { 704s my $json = JSON->new->canonical(); 704s print $json->encode(\@v) or die $!; 704s } 704s ' 704s + t-aq-archive-updated new example 704s + local suite=new 704s + local p=example 704s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 704s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 704s + perl -wne ' 704s use JSON; 704s use strict; 704s our @v; 704s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 704s push @v, { 704s "version" => "$1", 704s "sha256sum" => "$2", 704s "component" => "$3", 704s "filename" => "$4", 704s }; 704s END { 704s my $json = JSON->new->canonical(); 704s print $json->encode(\@v) or die $!; 704s } 704s ' 704s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 704s + cat 704s + jsondelim=' },' 704s + cat 704s + t-git-none 704s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 704s + set -e 704s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 704s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 704s + t-dgit -wgf --gbp push-source --new 704s + local dgit=dgit 704s + pwd 704s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 704s + : ' 704s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 704s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 704s | git rev-parse --show-toplevel 704s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 704s | git config -z --get-regexp --local '.*' 704s | git config -z --get-regexp --local '.*' 704s | git config -z --get-regexp --global '.*' 704s | git config -z --get-regexp --system '.*' 704s format 3.0 (quilt), quilt mode gbp 704s Format `3.0 (quilt)', need to check/update patch stack 704s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 704s => `' 704s + git diff --quiet HEAD 704s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 704s canonical suite name for unstable is sid 704s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 704s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 704s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 704s | git rev-parse 'HEAD~0' 704s => `eb10718ab213ccfa83613ebbddefbffda941a548' 704s | git symbolic-ref -q HEAD 704s => `refs/heads/master' 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 704s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 704s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 704s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 704s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 704s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e58e0c6bf6f351366815138c88ccbfa682fe16a3a416575bc3b34cadc15995e3 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 704s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 704s >(no reflog) 704s splitbrain cache miss 704s CD work 704s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 704s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 704s + git checkout -q -b dgit-view 704s examining quilt state (multiple patches, gbp mode) 704s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 704s CD fake 704s | find -name .git -prune -print0 704s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 704s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 704s + git add -Af . 704s | git write-tree 704s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 704s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 704s CD .. 704s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 704s CD ../fake 704s + git add -Af . 704s | git write-tree 704s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 704s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 704s CD ../work 704s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 704s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 704s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 704s => `' 704s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 704s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 704s => `lib.c\x00new-upstream-file\x00src.c\x00' 704s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 704s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 704s => `lib.c\x00new-upstream-file\x00src.c\x00' 704s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 704s differences @dl == ## ## == == ==. 704s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 704s dgit: quilt differences: src: == orig ## gitignores: == orig == 704s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 704s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 704s => `1530000000 +0000' 704s dgit view: creating patches-applied version using gbp pq 704s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 704s + git update-ref refs/heads/dgit-view HEAD 704s + git checkout -q dgit-view 704s | git rev-parse 'HEAD~0' 704s => `45ea71a69fa522ce760afdab8a420200443753e9' 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 704s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 704s => `' 704s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e58e0c6bf6f351366815138c88ccbfa682fe16a3a416575bc3b34cadc15995e3 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 704s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 704s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 704s | git rev-parse 'HEAD~0' 704s => `eb10718ab213ccfa83613ebbddefbffda941a548' 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 704s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 704s dpkg-source: info: using source format '3.0 (quilt)' 704s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 704s dpkg-source: info: using patch list from debian/patches/series 704s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 704s dpkg-source: info: building example in example_2.0-1.dsc 704s CD work 704s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 704s package seems new, not specifying -v 704s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 704s dpkg-genchanges: info: not including original source code in upload 704s CD .. 704s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 704s renaming (Files) example_2.0.orig.tar.gz 704s renaming (Files) example_2.0-1.debian.tar.xz 704s renaming (dsc) example_2.0-1.dsc 704s renaming (changes) example_2.0-1_source.changes 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 704s actually entering push 704s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 704s => `0' 704s + git config remote.dgit.skipdefaultupdate true 704s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 704s get_archive_dsc: nothing in archive, returning undef 704s no version available from the archive 704s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 704s => `' 704s previous reference hash= 704s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 704s => `' 704s fetch_from_archive: lastfetch= 704s nothing found! 704s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 704s + git check-ref-format archive/test-dummy/2.0-1 704s | git symbolic-ref -q HEAD 704s => `refs/heads/master' 704s | git rev-parse 'HEAD~0' 704s => `eb10718ab213ccfa83613ebbddefbffda941a548' 704s ffq_prev_branchinfo branch current refs/heads/master 704s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 704s => `' 704s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 704s => `' 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 704s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 704s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 704s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 704s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 704s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e58e0c6bf6f351366815138c88ccbfa682fe16a3a416575bc3b34cadc15995e3 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 704s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 704s CD work 704s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 704s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 704s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 704s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 704s splitbrain_pseudomerge... 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 704s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 704s => `' 704s + git diff --quiet HEAD 704s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 704s => `' 704s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 704s checking that example_2.0-1.dsc corresponds to HEAD 704s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 705s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 705s dpkg-source: info: extracting example in example-2.0 705s dpkg-source: info: unpacking example_2.0.orig.tar.gz 705s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 705s dpkg-source: info: using patch list from debian/patches/series 705s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 705s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 705s dpkg-source: info: applying subdir/addnewups 705s CD example-2.0 705s | find -name .git -prune -print0 705s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 705s + git add -Af . 705s | git write-tree 705s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 705s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 705s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 705s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 705s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 705s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 705s files_compare_inputs example_2.0-1.dsc 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 705s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 705s files_compare_inputs example_2.0-1.dsc Files 705s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 705s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 705s files_compare_inputs example_2.0-1_source.changes 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 705s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 705s files_compare_inputs example_2.0-1_source.changes Files 705s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 705s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 705s checking origs needed (2.0)... 705s checking origs needed placement 'devel extra'... 705s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 705s origs example_2.0.orig.tar.gz is_orig 705s -| sh -ec 'cd "$1"; shift 705s 705s find -name "$1" -print0 | 705s xargs -0r sha256sum 705s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 705s origs example_2.0.orig.tar.gz $#$have=-1 705s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 705s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 705s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 705s push_tagwants: $VAR1 = [ 705s '2.0-1', 705s '45ea71a69fa522ce760afdab8a420200443753e9', 705s 'eb10718ab213ccfa83613ebbddefbffda941a548', 705s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 705s ]; 705s $VAR2 = [ 705s { 705s 'Tfn' => sub { "DUMMY" }, 705s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 705s 'Tag' => 'archive/test-dummy/2.0-1', 705s 'View' => 'dgit', 705s 'TagFn' => sub { "DUMMY" }, 705s 'TfSuffix' => '' 705s }, 705s { 705s 'Tfn' => sub { "DUMMY" }, 705s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 705s 'Tag' => 'test-dummy/2.0-1', 705s 'View' => 'maint', 705s 'TagFn' => sub { "DUMMY" }, 705s 'TfSuffix' => '-maintview' 705s } 705s ]; 705s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 705s => `1530000000 +0000' 705s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 705s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 705s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 705s => `610bd4679516b8ff4b85a029aae11631494de9d9' 705s + git verify-tag 610bd4679516b8ff4b85a029aae11631494de9d9 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s gpg: Signature made Mon Mar 31 12:29:58 2025 UTC 705s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 705s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 705s gpg: WARNING: This key is not certified with a trusted signature! 705s gpg: There is no indication that the signature belongs to the owner. 705s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 705s + git update-ref refs/tags/archive/test-dummy/2.0-1 610bd4679516b8ff4b85a029aae11631494de9d9 705s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 705s => `c51ebb6bf1a273776ae12a528b4496475a8aac1d' 705s + git verify-tag c51ebb6bf1a273776ae12a528b4496475a8aac1d 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s gpg: Signature made Mon Mar 31 12:29:58 2025 UTC 705s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 705s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 705s gpg: WARNING: This key is not certified with a trusted signature! 705s gpg: There is no indication that the signature belongs to the owner. 705s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 705s + git update-ref refs/tags/test-dummy/2.0-1 c51ebb6bf1a273776ae12a528b4496475a8aac1d 705s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 705s => `0' 705s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 705s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 705s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 705s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 705s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 705s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 705s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 705s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 705s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s 705s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 705s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 705s 705s Successfully signed dsc, changes files 705s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 705s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 705s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 705s D: Setting host argument. 705s Checking signature on .changes 705s Checking signature on .dsc 705s Uploading to test-dummy (via local to localhost): 705s Successfully uploaded packages. 705s dgit ok: pushed and uploaded 2.0-1 705s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 705s del_lrfetchrefs... 705s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 705s ' 705s + t-salsa-add-remote 705s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 705s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 705s + set -e 705s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 705s + git init --bare 705s hint: Using 'master' as the name for the initial branch. This default branch name 705s hint: is subject to change. To configure the initial branch name to use in all 705s hint: of your new repositories, which will suppress this warning, call: 705s hint: 705s hint: git config --global init.defaultBranch 705s hint: 705s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 705s hint: 'development'. The just-created branch can be renamed via this command: 705s hint: 705s hint: git branch -m 705s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 705s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 705s + git push --set-upstream origin master 705s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 705s * [new branch] master -> master 705s Branch 'master' set up to track remote branch 'master' from 'origin'. 705s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 705s + local 'mpat=E:identical in upstream files' 705s + shift 705s + set +o pipefail 705s + LC_MESSAGES=C 705s + LANGUAGE=C 705s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 705s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 705s + local gdr=git-debrebase 705s + : ' 705s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 705s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 705s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 705s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 705s docs/README | 1 + 705s 1 file changed, 1 insertion(+) 705s 705s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 705s git-debrebase: identical in upstream files. See diffstat above, or run 705s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 705s + local 'ps=255 0' 705s + set -o pipefail 705s + case $ps in 705s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 705s + local 'mpat=E:identical in upstream files' 705s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 705s + local grepper=fgrep 705s + case "$mpat" in 705s + case "$mpat" in 705s + grepper=egrep 705s + mpat='identical in upstream files' 705s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 705s git-debrebase: identical in upstream files. See diffstat above, or run 705s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 705s + local 'mpat=E:Unused patch file garbage will be discarded' 705s + shift 705s + set +o pipefail 705s + LC_MESSAGES=C 705s + LANGUAGE=C 705s + t-git-debrebase -fupstream-has-debian convert-from-gbp 705s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 705s + local gdr=git-debrebase 705s + : ' 705s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 705s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 706s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 706s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 706s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 706s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 706s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 706s $VAR2 = bless( do{\(my $o = { 706s 'allow_duplicate' => 0, 706s 'fields' => { 706s 'Source' => 'example', 706s 'Version' => '2.0-1', 706s 'Distribution' => 'unstable', 706s 'Urgency' => 'medium', 706s 'Maintainer' => 'dgit test git user ', 706s 'Timestamp' => '1530000000', 706s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 706s 'Changes' => ' 706s example (2.0-1) unstable; urgency=medium 706s 706s [ Ian Jackson ] 706s * new upstream (did gbp import-orig)' 706s }, 706s 'allow_pgp' => 1, 706s 'is_pgp_signed' => 0, 706s 'name' => 'debian/changelog, entry no.1', 706s 'keep_duplicate' => 0, 706s 'drop_empty' => 0, 706s 'out_order' => [], 706s 'in_order' => [ 706s 'Source', 706s 'Version', 706s 'Distribution', 706s 'Urgency', 706s 'Maintainer', 706s 'Timestamp', 706s 'Date', 706s 'Changes' 706s ] 706s })}, 'Dpkg::Control::Hash' ); 706s last finished-looking changelog entry: (2.0-1) unstable 706s will stitch in dgit view, archive/test-dummy/2.0-1 706s git-debrebase: snags: 1 overriden by individual -f options 706s 706s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 706s + local 'ps=255 0' 706s + set -o pipefail 706s + case $ps in 706s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 706s + local 'mpat=E:Unused patch file garbage will be discarded' 706s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 706s + local grepper=fgrep 706s + case "$mpat" in 706s + case "$mpat" in 706s + grepper=egrep 706s + mpat='Unused patch file garbage will be discarded' 706s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 706s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 706s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 706s + local gdr=git-debrebase 706s + : ' 706s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 706s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 706s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 706s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 706s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 706s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 706s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 706s $VAR2 = bless( do{\(my $o = { 706s 'is_pgp_signed' => 0, 706s 'allow_pgp' => 1, 706s 'keep_duplicate' => 0, 706s 'in_order' => [ 706s 'Source', 706s 'Version', 706s 'Distribution', 706s 'Urgency', 706s 'Maintainer', 706s 'Timestamp', 706s 'Date', 706s 'Changes' 706s ], 706s 'name' => 'debian/changelog, entry no.1', 706s 'allow_duplicate' => 0, 706s 'out_order' => [], 706s 'fields' => { 706s 'Source' => 'example', 706s 'Version' => '2.0-1', 706s 'Distribution' => 'unstable', 706s 'Urgency' => 'medium', 706s 'Maintainer' => 'dgit test git user ', 706s 'Timestamp' => '1530000000', 706s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 706s 'Changes' => ' 706s example (2.0-1) unstable; urgency=medium 706s 706s [ Ian Jackson ] 706s * new upstream (did gbp import-orig)' 706s }, 706s 'drop_empty' => 0 706s })}, 'Dpkg::Control::Hash' ); 706s last finished-looking changelog entry: (2.0-1) unstable 706s will stitch in dgit view, archive/test-dummy/2.0-1 706s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 706s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 706s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 706s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 706s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 706s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 706s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 706s git-debrebase ffq check_specs * 706s git-debrebase ffq merge master 706s git-debrebase ffq check_remote origin remote fetch/merge branch 706s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 706s OK, you are ahead of refs/remotes/origin/master 706s git-debrebase ffq check_remote undef remote push branch 706s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 706s OK, you are ahead of refs/remotes/dgit/dgit/sid 706s git-debrebase: snags: 2 overriden by individual -f options 706s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 706s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 706s git-debrebase >$ 706s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 706s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 706s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 706s ' 706s + git branch converted-from-gbp 706s + v=2.0-2 706s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 706s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 706s + DEBEMAIL=dgit-tests@example.org 706s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 706s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 706s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 706s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 706s 1 file changed, 6 insertions(+) 706s + t-dch-commit-r 706s + t-dch-r-rune t-dch-commit 706s + local cmd=t-dch-commit 706s + shift 706s + local suite=unstable 706s + t-dch-commit -r -D unstable '' 706s + t-debchange -r -D unstable '' 706s + DEBEMAIL=dgit-tests@example.org 706s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 706s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 706s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 706s libdistro-info-perl is not installed, Debian release names are not known. 706s libdistro-info-perl is not installed, Ubuntu release names are not known. 706s + git commit -m 'dch -r -D unstable ' debian/changelog 706s [master 4af0243] dch -r -D unstable 706s 1 file changed, 1 insertion(+), 1 deletion(-) 706s + t-dgit -wgf push-source --new 706s + local dgit=dgit 706s + pwd 706s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 706s + : ' 706s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 706s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 706s | git rev-parse --show-toplevel 706s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 706s | git config -z --get-regexp --local '.*' 706s | git config -z --get-regexp --local '.*' 707s | git config -z --get-regexp --global '.*' 707s | git config -z --get-regexp --system '.*' 707s format 3.0 (quilt), quilt mode linear 707s Format `3.0 (quilt)', need to check/update patch stack 707s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 707s => `' 707s + git diff --quiet HEAD 707s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 707s canonical suite name for unstable is sid 707s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 707s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 707s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 707s | git rev-parse 'HEAD~0' 707s => `4af0243f9227b0d695fbff38df345aca23969e2e' 707s | git symbolic-ref -q HEAD 707s => `refs/heads/master' 707s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 707s CD work 707s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 707s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 707s examining quilt state (multiple patches, linear mode) 707s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 707s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 707s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 707s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 707s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 707s | git rev-parse 'HEAD~0' 707s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 707s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 707s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 707s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 707s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 707s CD fake 707s | find -name .git -prune -print0 707s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 707s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 707s + git add -Af . 707s | git write-tree 707s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 707s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 707s CD .. 707s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 707s CD ../fake 707s + git add -Af . 707s | git write-tree 707s => `607612c46d7ea5b66697b830f1a50f069061d460' 707s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 707s CD ../work 707s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 707s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 707s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 707s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 707s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 707s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 707s => `' 707s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 707s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 707s => `lib.c\x00new-upstream-file\x00src.c\x00' 707s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 707s differences @dl ## ## == == == ==. 707s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 707s dgit: quilt differences: src: ## orig ## gitignores: == orig == 707s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 707s starting quiltify (multiple patches, linear mode) 707s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 707s => `debian/control'... 707s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 707s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 707s => `' 707s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 707s search finished hooray! 707s quiltify linearisation planning successful, executing... 707s + git checkout -q master 707s | git status --ignored --porcelain 707s => `?? .pc/' 707s nothing quilty to commit, ok. 707s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 707s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 707s | git rev-parse 'HEAD~0' 707s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 707s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 707s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 707s CD work 707s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 707s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 707s CD .. 707s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 707s dpkg-source: info: using source format '3.0 (quilt)' 707s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 707s dpkg-source: info: using patch list from debian/patches/series 707s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 707s dpkg-source: info: building example in example_2.0-2.dsc 707s CD work 707s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 707s package seems new, not specifying -v 707s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 708s dpkg-genchanges: info: not including original source code in upload 708s CD .. 708s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 708s renaming (Files) example_2.0.orig.tar.gz 708s renaming (Files) example_2.0-2.debian.tar.xz 708s renaming (dsc) example_2.0-2.dsc 708s renaming (changes) example_2.0-2_source.changes 708s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 708s actually entering push 708s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 708s => `1' 708s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 708s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 708s git_lrfetch_sane iteration 0 708s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 708s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 708s => 610bd4679516b8ff4b85a029aae11631494de9d9 refs/tags/archive/test-dummy/2.0-1 708s => c51ebb6bf1a273776ae12a528b4496475a8aac1d refs/tags/test-dummy/2.0-1 708s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 708s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 708s | git for-each-ref refs/dgit-fetch/test-dummy 708s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 708s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 708s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 708s git_lrfetch_sane: tidying any old suite lrfetchrefs 708s | git for-each-ref refs/dgit-fetch/sid 708s git_lrfetch_sane: git fetch --no-insane emulation complete 708s $VAR1 = { 708s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'c51ebb6bf1a273776ae12a528b4496475a8aac1d', 708s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '610bd4679516b8ff4b85a029aae11631494de9d9', 708s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 708s }; 708s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 708s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/tags/archive/test-dummy/2.0-1 708s currently refs/tags/archive/test-dummy/2.0-1=610bd4679516b8ff4b85a029aae11631494de9d9 708s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/tags/test-dummy/2.0-1 708s currently refs/tags/test-dummy/2.0-1=c51ebb6bf1a273776ae12a528b4496475a8aac1d 708s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 708s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 708s offered refs/tags/archive/test-dummy/2.0-1=610bd4679516b8ff4b85a029aae11631494de9d9 708s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 708s offered refs/tags/test-dummy/2.0-1=c51ebb6bf1a273776ae12a528b4496475a8aac1d 708s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 708s get_archive_dsc: nothing in archive, returning undef 708s no version available from the archive 708s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 708s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 708s 708s Package not found in the archive, but has allegedly been pushed using dgit. 708s Perhaps the upload is stuck in incoming. Using the version from git. 708s 708s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s fetch mergeinfos: 708s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 708s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 708s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 708s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 708s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 708s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 708s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 708s + git check-ref-format archive/test-dummy/2.0-2 708s | git symbolic-ref -q HEAD 708s => `refs/heads/master' 708s | git rev-parse 'HEAD~0' 708s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 708s ffq_prev_branchinfo branch current refs/heads/master 708s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 708s => `' 708s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 708s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 708s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 708s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 708s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 708s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 708s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 708s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 708s | git status --ignored --porcelain 708s => `' 708s nothing quilty to commit, ok. 708s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 708s => `' 708s + git diff --quiet HEAD 708s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 708s => `45ea71a69fa522ce760afdab8a420200443753e9' 708s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 708s => `' 708s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 708s checking that example_2.0-2.dsc corresponds to HEAD 708s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 708s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 708s dpkg-source: info: extracting example in example-2.0 708s dpkg-source: info: unpacking example_2.0.orig.tar.gz 708s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 708s dpkg-source: info: using patch list from debian/patches/series 708s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 708s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 708s dpkg-source: info: applying subdir/addnewups 708s CD example-2.0 708s | find -name .git -prune -print0 708s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 708s + git add -Af . 708s | git write-tree 708s => `607612c46d7ea5b66697b830f1a50f069061d460' 708s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 708s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 708s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 708s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 708s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 708s files_compare_inputs example_2.0-2.dsc 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 708s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 708s files_compare_inputs example_2.0-2.dsc Files 708s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 708s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 708s files_compare_inputs example_2.0-2_source.changes 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 708s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 708s files_compare_inputs example_2.0-2_source.changes Files 708s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 708s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 708s checking origs needed (2.0)... 708s checking origs needed placement 'devel extra'... 708s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 708s origs example_2.0.orig.tar.gz is_orig 708s -| sh -ec 'cd "$1"; shift 708s 708s find -name "$1" -print0 | 708s xargs -0r sha256sum 708s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 708s origs example_2.0.orig.tar.gz $#$have=-1 708s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 708s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 708s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 708s push_tagwants: $VAR1 = [ 708s '2.0-2', 708s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 708s undef, 708s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 708s ]; 708s $VAR2 = [ 708s { 708s 'TfSuffix' => '', 708s 'Tag' => 'archive/test-dummy/2.0-2', 708s 'Tfn' => sub { "DUMMY" }, 708s 'View' => 'dgit', 708s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 708s 'TagFn' => sub { "DUMMY" } 708s }, 708s { 708s 'Tag' => 'test-dummy/2.0-2', 708s 'TfSuffix' => '-dgit', 708s 'Tfn' => sub { "DUMMY" }, 708s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 708s 'View' => 'dgit', 708s 'TagFn' => sub { "DUMMY" } 708s } 708s ]; 708s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 708s => `1530000000 +0000' 708s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 708s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 708s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 708s => `ce54d97b6999f97979f01526c311c26b24e65563' 708s + git verify-tag ce54d97b6999f97979f01526c311c26b24e65563 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s gpg: Signature made Mon Mar 31 12:30:02 2025 UTC 708s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 708s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 708s gpg: WARNING: This key is not certified with a trusted signature! 708s gpg: There is no indication that the signature belongs to the owner. 708s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 708s + git update-ref refs/tags/archive/test-dummy/2.0-2 ce54d97b6999f97979f01526c311c26b24e65563 708s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 708s => `f5a83d94634b2513c0fbb8cd47fd2fe39de4b548' 708s + git verify-tag f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s gpg: Signature made Mon Mar 31 12:30:02 2025 UTC 708s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 708s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 708s gpg: WARNING: This key is not certified with a trusted signature! 708s gpg: There is no indication that the signature belongs to the owner. 708s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 708s + git update-ref refs/tags/test-dummy/2.0-2 f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 708s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 708s => `1' 708s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 708s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 708s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 708s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 708s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 708s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 708s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 708s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s 708s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 708s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 708s 708s Successfully signed dsc, changes files 708s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 709s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 709s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 709s D: Setting host argument. 709s Checking signature on .changes 709s Checking signature on .dsc 709s Package includes an .orig.tar.gz file although the debian revision suggests 709s that it might not be required. Multiple uploads of the .orig.tar.gz may be 709s rejected by the upload queue management software. 709s Uploading to test-dummy (via local to localhost): 709s Successfully uploaded packages. 709s dgit ok: pushed and uploaded 2.0-2 709s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 709s del_lrfetchrefs... 709s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 709s del_lrfetchrefs: 610bd4679516b8ff4b85a029aae11631494de9d9 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 709s del_lrfetchrefs: c51ebb6bf1a273776ae12a528b4496475a8aac1d refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 709s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 709s ' 709s + git push 709s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 709s eb10718..6b22dd5 master -> master 709s + cd .. 709s + t-archive-process-incoming sid 709s + local suite=sid 709s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 709s + t-archive-query sid 709s + local suite=sid 709s + local dscf=main/example_2.0-2.dsc 709s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 709s + local suite=sid 709s + local p=example 709s + local v=2.0-2 709s + local dscf=main/example_2.0-2.dsc 709s + local sha 709s ++ sha256sum 709s + sha='427d4ccb94c1589e80ec3a7056a00394547291aa9f3466487c2ad4b304bbfae1 -' 709s + echo '2.0-2 427d4ccb94c1589e80ec3a7056a00394547291aa9f3466487c2ad4b304bbfae1 main/example_2.0-2.dsc' 709s + t-aq-archive-updated sid example 709s + local suite=sid 709s + local p=example 709s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 709s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 709s + perl -wne ' 709s use JSON; 709s use strict; 709s our @v; 709s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 709s push @v, { 709s "version" => "$1", 709s "sha256sum" => "$2", 709s "component" => "$3", 709s "filename" => "$4", 709s }; 709s END { 709s my $json = JSON->new->canonical(); 709s print $json->encode(\@v) or die $!; 709s } 709s ' 709s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 709s ++ echo git mirror aq 709s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 709s . $troot/lib-gdr 709s t-tstunt-parsechangelog 709s p=example 709s t-git-next-date 709s ' 709s + local savevars= 709s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 709s + local 'importeval= 709s . $troot/lib-gdr 709s t-tstunt-parsechangelog 709s p=example 709s t-git-next-date 709s ' 709s + local import=IMPORT.gdr-convert-gbp 709s + exec 709s + local vn 709s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 709s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 709s print STDERR "saving-exporting $vn\n"; 709s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 709s or die $!; 709s } 709s ' 709s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 709s saving-exporting DGIT_TEST_REAL_GPG_AGENT 709s saving-exporting DGIT_TEST_REAL_DEBCHANGE 709s saving-exporting DGIT_TEST_REAL_GPG 709s + set -e 709s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 709s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 709s + printf '\n%s\n' ' 709s . $troot/lib-gdr 709s t-tstunt-parsechangelog 709s p=example 709s t-git-next-date 709s ' 709s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 709s + rc=0 709s + set +x 709s + set +e 709s + pwd 709s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 709s + '[' x '!=' x ']' 709s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 709s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 709s + set -e 709s + test 0 = 0 709s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 709s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 709s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 709s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 709s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 709s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 709s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 709s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 709s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 709s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 709s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 709s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 709s +++ : -D 709s +++ export GDR_TEST_DEBUG 709s +++ t-tstunt debchange 709s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s +++ local var=PATH 709s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s +++ eval ' 709s case "$PATH" in 709s "$tstunt:"*) ;; 709s *":$tstunt:"*) ;; 709s "") PATH="$tstunt" ;; 709s *) PATH="$tstunt:$PATH" ;; 709s esac 709s export PATH 709s ' 709s ++++ case "$PATH" in 709s ++++ export PATH 709s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s +++ local var=PERLLIB 709s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s +++ eval ' 709s case "$PERLLIB" in 709s "$tstunt:"*) ;; 709s *":$tstunt:"*) ;; 709s "") PERLLIB="$tstunt" ;; 709s *) PERLLIB="$tstunt:$PERLLIB" ;; 709s esac 709s export PERLLIB 709s ' 709s ++++ case "$PERLLIB" in 709s ++++ export PERLLIB 709s +++ local f 709s +++ for f in "$@" 709s +++ t-tstunt--save-real debchange 709s +++ local f=debchange 709s +++ case "$f" in 709s +++ local rc 709s +++ local real 709s +++ set +e 709s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 709s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 709s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s ++++ type -p debchange 709s +++ real=/usr/bin/debchange 709s +++ rc=0 709s +++ set -e 709s +++ case $rc in 709s +++ local varname=debchange 709s +++ varname=DGIT_TEST_REAL_DEBCHANGE 709s +++ eval ' 709s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 709s export DGIT_TEST_REAL_DEBCHANGE 709s ' 709s ++++ : /usr/bin/debchange 709s ++++ export DGIT_TEST_REAL_DEBCHANGE 709s +++ f=./debchange 709s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 709s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 709s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 709s ++ t-tstunt-parsechangelog 709s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 709s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s ++ local var=PATH 709s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s ++ eval ' 709s case "$PATH" in 709s "$tstunt:"*) ;; 709s *":$tstunt:"*) ;; 709s "") PATH="$tstunt" ;; 709s *) PATH="$tstunt:$PATH" ;; 709s esac 709s export PATH 709s ' 709s +++ case "$PATH" in 709s +++ export PATH 709s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s ++ local var=PERLLIB 709s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 709s ++ eval ' 709s case "$PERLLIB" in 709s "$tstunt:"*) ;; 709s *":$tstunt:"*) ;; 709s "") PERLLIB="$tstunt" ;; 709s *) PERLLIB="$tstunt:$PERLLIB" ;; 709s esac 709s export PERLLIB 709s ' 709s +++ case "$PERLLIB" in 709s +++ export PERLLIB 709s ++ local f 709s ++ for f in "$@" 709s ++ t-tstunt--save-real dpkg-parsechangelog 709s ++ local f=dpkg-parsechangelog 709s ++ case "$f" in 709s ++ local rc 709s ++ local real 709s ++ set +e 709s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 709s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 709s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 709s +++ type -p dpkg-parsechangelog 709s ++ real=/usr/bin/dpkg-parsechangelog 709s ++ rc=0 709s ++ set -e 709s ++ case $rc in 709s ++ local varname=dpkg_parsechangelog 709s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 709s ++ eval ' 709s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 709s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 709s ' 709s +++ : /usr/bin/dpkg-parsechangelog 709s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 709s ++ f=./dpkg-parsechangelog 709s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 709s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 709s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 709s ++ for f in "$@" 709s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 709s ++ local f=Dpkg/Changelog/Parse.pm 709s ++ case "$f" in 709s ++ return 709s ++ f=./Dpkg/Changelog/Parse.pm 709s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 709s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 709s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 709s ++ p=example 709s ++ t-git-next-date 709s ++ GIT_COMMITTER_DATE='1530000001 +0100' 709s ++ GIT_AUTHOR_DATE='1530000001 +0100' 709s + cd example 709s + t-dgit setup-mergechangelogs 709s + local dgit=dgit 709s + pwd 709s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 709s + : ' 709s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 709s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 709s | git rev-parse --show-toplevel 709s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 709s | git config -z --get-regexp --local '.*' 709s | git config -z --get-regexp --local '.*' 709s | git config -z --get-regexp --global '.*' 709s | git config -z --get-regexp --system '.*' 709s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 709s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 709s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 709s ' 709s + : maintainer 709s + v=2.0-3 709s + t-maintainer-commit-some-changes 709s + t-dch-commit -v2.0-3 -m 'start 2.0-3' 709s + t-debchange -v2.0-3 -m 'start 2.0-3' 709s + DEBEMAIL=dgit-tests@example.org 709s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v2.0-3 -m 'start 2.0-3' 709s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange -v2.0-3 -m start 2.0-3 709s + git commit -m 'dch -v2.0-3 -m start 2.0-3' debian/changelog 709s [master 4dd98f7] dch -v2.0-3 -m start 2.0-3 709s 1 file changed, 6 insertions(+) 709s + t-some-changes 'maintainer 2.0-3' 709s + local 'token=maintainer 2.0-3' 709s + local which=dum 709s + local fsuffix= 709s + t-git-next-date 709s + GIT_COMMITTER_DATE='1530000002 +0100' 709s + GIT_AUTHOR_DATE='1530000002 +0100' 709s + case "$which" in 709s + echo '// debian maintainer 2.0-3' 709s + git add debian/zorkmid 709s + git commit -m 'DEBIAN add zorkmid (maintainer 2.0-3)' 709s [master c5aeac0] DEBIAN add zorkmid (maintainer 2.0-3) 709s 1 file changed, 1 insertion(+) 709s create mode 100644 debian/zorkmid 709s + case "$which" in 709s + echo '// upstream maintainer 2.0-3' 709s + git add src.c 709s + git commit -m 'UPSTREAM edit src.c (maintainer 2.0-3)' 709s [master 64946bb] UPSTREAM edit src.c (maintainer 2.0-3) 709s 1 file changed, 1 insertion(+) 709s + case "$which" in 709s + for f in debian/zorkmid$fsuffix src$fsuffix.c 709s + echo '// both! maintainer 2.0-3' 709s + git add debian/zorkmid 709s + for f in debian/zorkmid$fsuffix src$fsuffix.c 709s + echo '// both! maintainer 2.0-3' 709s + git add src.c 709s + git commit -m 'MIXED add both() (maintainer 2.0-3)' 709s [master 964ce93] MIXED add both() (maintainer 2.0-3) 709s 2 files changed, 2 insertions(+) 709s + t-git-next-date 709s + GIT_COMMITTER_DATE='1530000003 +0100' 709s + GIT_AUTHOR_DATE='1530000003 +0100' 709s + t-git-debrebase 709s + local gdr=git-debrebase 709s + : ' 709s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 709s + git-debrebase --dgit=dgit -D 709s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 709s git-debrebase ffq check_specs * 709s git-debrebase ffq merge master 709s git-debrebase ffq check_remote origin remote fetch/merge branch 709s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 709s OK, you are ahead of refs/remotes/origin/master 709s git-debrebase ffq check_remote undef remote push branch 709s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 709s OK, you are ahead of refs/remotes/dgit/dgit/sid 709s git-debrebase *** WALK 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0 - 709s git-debrebase get_differs 64946bb029165d28437faddd24dd43a5ca319327 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f = 0x22 709s git-debrebase classify 964ce93fe0ce99ab711d1cb423537d236e0bbf20 $t=6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f @p 64946bb029165d28437faddd24dd43a5ca319327/0x22 709s git-debrebase = Mixed {"Parents" => [{"CommitId" => "64946bb029165d28437faddd24dd43a5ca319327","Ix" => 0,"Differs" => 34}],"Tree" => "6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f","Hdr" => "tree 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f\nparent 64946bb029165d28437faddd24dd43a5ca319327\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "MIXED add both() (maintainer 2.0-3)\n","Type" => "Mixed","CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20"} 709s git-debrebase get_differs c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 = 0x2 709s git-debrebase classify 64946bb029165d28437faddd24dd43a5ca319327 $t=75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 @p c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c/0x2 709s git-debrebase = Upstream {"Hdr" => "tree 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537\nparent c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537","Type" => "Upstream","CommitId" => "64946bb029165d28437faddd24dd43a5ca319327","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c"}]} 709s git-debrebase get_differs 4dd98f768a8f29a08011b04867832a40ef33e618 b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 = 0x20 709s git-debrebase classify c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c $t=b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 @p 4dd98f768a8f29a08011b04867832a40ef33e618/0x20 709s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618"}],"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Type" => "Packaging","CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c","Tree" => "b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9","Hdr" => "tree b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9\nparent 4dd98f768a8f29a08011b04867832a40ef33e618\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 709s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 89b9b5a11fee7d2a1c974f30aa28172018b99c18 = 0x10 709s git-debrebase classify 4dd98f768a8f29a08011b04867832a40ef33e618 $t=89b9b5a11fee7d2a1c974f30aa28172018b99c18 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 709s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Type" => "Changelog","CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618","Tree" => "89b9b5a11fee7d2a1c974f30aa28172018b99c18","Hdr" => "tree 89b9b5a11fee7d2a1c974f30aa28172018b99c18\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 709s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 709s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 709s git-debrebase = AddPatches {"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}]} 709s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 709s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 709s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}]} 709s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 709s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 709s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}]} 709s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 709s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 709s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 709s git-debrebase = Pseudomerge {"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},"Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1,"Differs" => 8}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 709s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 709s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 709s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}]} 709s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 709s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 709s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}]} 709s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 709s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 709s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 709s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 709s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 709s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 709s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 709s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 709s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 709s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 709s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 709s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 709s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 709s git-debrebase WALK REWRITING NOW cl=HASH(0x5581b0745968) procd=HASH(0x5581b076acf8) 709s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 709s git-debrebase WALK BUILD 4dd98f768a8f29a08011b04867832a40ef33e618 Debian (rewriting=1) 709s git-debrebase WALK BUILD c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c Debian (rewriting=1) 709s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 709s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Debian (rewriting=1) 709s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 709s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 709s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 709s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 709s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 709s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 709s git-debrebase WALK BUILD 64946bb029165d28437faddd24dd43a5ca319327 Upstream (rewriting=1) 709s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Upstream (rewriting=1) 709s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 709s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 = 0x4 709s git-debrebase *** WALK RETURN 5b2d01d10ec62b3f25e6f7a22710468830e457fb 274022edec808f75f2359551ecdc6de6b6390355 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 709s git-debrebase: laundered (head was 964ce93fe0ce99ab711d1cb423537d236e0bbf20) 709s git-debrebase >= update refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0000000000000000000000000000000000000000 709s git-debrebase >= delete refs/debrebase-last/heads/master 709s git-debrebase >= update HEAD 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 709s git-debrebase >$ 709s Recorded previous head for preservation 709s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 709s ' 709s + t-git-debrebase stitch 709s + local gdr=git-debrebase 709s + : ' 709s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 709s + git-debrebase --dgit=dgit -D stitch 709s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 709s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 709s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 709s git-debrebase = Upstream {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Ix" => 0}],"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae"} 709s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 709s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 709s git-debrebase = Upstream {"Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14","Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Parents" => [{"Ix" => 0,"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n"} 709s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 709s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 709s git-debrebase = Upstream {"Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Parents" => [{"Ix" => 0,"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 709s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 709s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 709s git-debrebase = Upstream {"Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Parents" => [{"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 709s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 709s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 709s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Parents" => [{"Differs" => 2,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0}],"Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 709s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 709s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 709s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32}],"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 709s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 709s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 709s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}],"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 709s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 709s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 709s git-debrebase = Changelog {"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "894ca54a967167e2bb994b82357d084539559075"} 709s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 709s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 709s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 709s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 709s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 709s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 709s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 710s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 710s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 710s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]]} 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase >= delete refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 710s git-debrebase >= update refs/debrebase-last/heads/master 74d5f586ed443ce47434f30fbbeff3eacb36748d 0000000000000000000000000000000000000000 710s git-debrebase >= update HEAD 74d5f586ed443ce47434f30fbbeff3eacb36748d 5b2d01d10ec62b3f25e6f7a22710468830e457fb 710s git-debrebase >$ 710s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 710s ' 710s + git branch did.maintainer 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000004 +0100' 710s + GIT_AUTHOR_DATE='1530000004 +0100' 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000005 +0100' 710s + GIT_AUTHOR_DATE='1530000005 +0100' 710s + : 'non-dgit upload (but we prepare it with dgit anyway)' 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000006 +0100' 710s + GIT_AUTHOR_DATE='1530000006 +0100' 710s + git checkout origin/master 710s Note: switching to 'origin/master'. 710s 710s You are in 'detached HEAD' state. You can look around, make experimental 710s changes and commit them, and you can discard any commits you make in this 710s state without impacting any branches by switching back to a branch. 710s 710s If you want to create a new branch to retain commits you create, you may 710s do so (now or later) by using -c with the switch command. Example: 710s 710s git switch -c 710s 710s Or undo this operation with: 710s 710s git switch - 710s 710s Turn off this advice by setting config variable advice.detachedHead to false 710s 710s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 710s + v=2.0-2+nmu1 710s + t-nmu-upload-1 nmu 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000007 +0100' 710s + GIT_AUTHOR_DATE='1530000007 +0100' 710s + nmubranch=nmu 710s + git checkout -f -b nmu 710s Switched to a new branch 'nmu' 710s + t-git-debrebase 710s + local gdr=git-debrebase 710s + : ' 710s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 710s + git-debrebase --dgit=dgit -D 710s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 710s git-debrebase ffq check_specs * 710s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 710s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 710s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 710s git-debrebase = AddPatches {"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4}],"Type" => "AddPatches"} 710s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 710s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 710s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}]} 710s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 710s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 710s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 710s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 710s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 710s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 710s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Overwritten" => [{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Pseudomerge"} 710s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 710s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 710s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 710s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 710s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 710s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 710s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 710s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 710s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 710s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 710s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 710s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 710s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 710s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 710s git-debrebase WALK REWRITING NOW cl=HASH(0x55e030d4fe80) procd=HASH(0x55e030db8780) 710s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 710s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 710s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 710s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 710s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 710s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 710s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase get_differs 4abc58ced56fe358e76a8cedaff3563b8f3bc073 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 710s git-debrebase *** WALK RETURN 4abc58ced56fe358e76a8cedaff3563b8f3bc073 cdd388d460bc1f8215bafdb80bf92c245bd56f07 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 710s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 710s git-debrebase >= update refs/ffq-prev/heads/nmu 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 710s git-debrebase >= delete refs/debrebase-last/heads/nmu 710s git-debrebase >= update HEAD 4abc58ced56fe358e76a8cedaff3563b8f3bc073 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 710s git-debrebase >$ 710s Recorded previous head for preservation 710s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 710s ' 710s + t-git-debrebase convert-to-gbp 710s + local gdr=git-debrebase 710s + : ' 710s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 710s + git-debrebase --dgit=dgit -D convert-to-gbp 710s git-debrebase ffq_prev_branchinfo branch current refs/heads/nmu 710s git-debrebase get_differs c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 710s git-debrebase classify 4abc58ced56fe358e76a8cedaff3563b8f3bc073 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d/0x2 710s git-debrebase = Upstream {"CommitId" => "4abc58ced56fe358e76a8cedaff3563b8f3bc073","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 710s git-debrebase get_differs e090ba2c462bfcddd669365407b02f300dad2c92 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 710s git-debrebase classify c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p e090ba2c462bfcddd669365407b02f300dad2c92/0x2 710s git-debrebase = Upstream {"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Ix" => 0,"Differs" => 2}],"CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent e090ba2c462bfcddd669365407b02f300dad2c92\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream"} 710s git-debrebase get_differs cdd388d460bc1f8215bafdb80bf92c245bd56f07 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 710s git-debrebase classify e090ba2c462bfcddd669365407b02f300dad2c92 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p cdd388d460bc1f8215bafdb80bf92c245bd56f07/0x2 710s git-debrebase = Upstream {"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent cdd388d460bc1f8215bafdb80bf92c245bd56f07\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07"}]} 710s git-debrebase get_differs 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 710s git-debrebase classify cdd388d460bc1f8215bafdb80bf92c245bd56f07 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c/0x10 710s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c"}]} 710s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 710s git-debrebase classify 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 710s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 710s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 710s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 710s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 710s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 710s git-debrebase *** WALK 4abc58ced56fe358e76a8cedaff3563b8f3bc073 0 - 710s git-debrebase get_differs c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 710s git-debrebase classify 4abc58ced56fe358e76a8cedaff3563b8f3bc073 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d/0x2 710s git-debrebase = Upstream {"Parents" => [{"CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Ix" => 0,"Differs" => 2}],"CommitId" => "4abc58ced56fe358e76a8cedaff3563b8f3bc073","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 710s git-debrebase get_differs e090ba2c462bfcddd669365407b02f300dad2c92 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 710s git-debrebase classify c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p e090ba2c462bfcddd669365407b02f300dad2c92/0x2 710s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent e090ba2c462bfcddd669365407b02f300dad2c92\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Upstream","CommitId" => "c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d","Parents" => [{"CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Ix" => 0,"Differs" => 2}]} 710s git-debrebase get_differs cdd388d460bc1f8215bafdb80bf92c245bd56f07 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 710s git-debrebase classify e090ba2c462bfcddd669365407b02f300dad2c92 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p cdd388d460bc1f8215bafdb80bf92c245bd56f07/0x2 710s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","CommitId" => "e090ba2c462bfcddd669365407b02f300dad2c92","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent cdd388d460bc1f8215bafdb80bf92c245bd56f07\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Differs" => 2,"Ix" => 0}]} 710s git-debrebase get_differs 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 710s git-debrebase classify cdd388d460bc1f8215bafdb80bf92c245bd56f07 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c/0x10 710s git-debrebase = Changelog {"CommitId" => "cdd388d460bc1f8215bafdb80bf92c245bd56f07","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","Parents" => [{"CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 710s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 710s git-debrebase classify 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 710s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 710s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 710s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 710s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 710s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 710s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 2 proc 5 pm -1 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 6 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase WALK BUILD 5a6aeee5e7ff6f8359778d6bc25bb35a65c2ce4c Debian (rewriting=0) 710s git-debrebase WALK BUILD cdd388d460bc1f8215bafdb80bf92c245bd56f07 Debian (rewriting=0) 710s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 710s git-debrebase WALK BUILD e090ba2c462bfcddd669365407b02f300dad2c92 Upstream (rewriting=0) 710s git-debrebase WALK BUILD c4f4561a261da0cec4c5cc5ecec961a66f4cdf0d Upstream (rewriting=0) 710s git-debrebase WALK BUILD 4abc58ced56fe358e76a8cedaff3563b8f3bc073 Upstream (rewriting=0) 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase get_differs 4abc58ced56fe358e76a8cedaff3563b8f3bc073 4abc58ced56fe358e76a8cedaff3563b8f3bc073 = 0 710s git-debrebase *** WALK RETURN 4abc58ced56fe358e76a8cedaff3563b8f3bc073 cdd388d460bc1f8215bafdb80bf92c245bd56f07 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase gbp_pq_export bw cdd388d460bc1f8215bafdb80bf92c245bd56f07 4abc58ced56fe358e76a8cedaff3563b8f3bc073 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 710s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s git-debrebase >= delete refs/ffq-prev/heads/nmu 710s git-debrebase >= delete refs/debrebase-last/heads/nmu 710s git-debrebase >= update HEAD f73916f1a4b5bcd4c31ae456c6f392f41a743f01 4abc58ced56fe358e76a8cedaff3563b8f3bc073 710s git-debrebase >$ 710s HEAD is now at f73916f Commit patch queue (converted from git-debrebase format) 710s git-debrebase: converted to git-buildpackage branch format 710s git-debrebase: WARNING: do not now run "git-debrebase" any more 710s git-debrebase: WARNING: doing so would drop all upstream patches! 710s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 710s ' 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000008 +0100' 710s + GIT_AUTHOR_DATE='1530000008 +0100' 710s + gbp pq import 710s gbp:info: Trying to apply patches at 'f73916f1a4b5bcd4c31ae456c6f392f41a743f01' 710s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/nmu' 710s + t-nmu-upload-2 710s + t-git-next-date 710s + GIT_COMMITTER_DATE='1530000009 +0100' 710s + GIT_AUTHOR_DATE='1530000009 +0100' 710s + t-dch-commit -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 710s + t-debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 710s + DEBEMAIL=dgit-tests@example.org 710s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2+nmu1 -m 'nmu nmu 2.0-2+nmu1' 710s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 710s + git commit -m 'dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1' debian/changelog 710s [patch-queue/nmu 02fb5d2] dch -v 2.0-2+nmu1 -m nmu nmu 2.0-2+nmu1 710s 1 file changed, 6 insertions(+) 710s + t-nmu-commit-an-upstream-change 710s + echo '// more upstream' 710s + git add newsrc.c 710s + git commit -m 'UPSTREAM NMU' 710s [patch-queue/nmu 4971fde] UPSTREAM NMU 710s 1 file changed, 1 insertion(+) 710s create mode 100644 newsrc.c 710s + t-nmu-upload-3 710s + t-dch-commit-r 710s + t-dch-r-rune t-dch-commit 710s + local cmd=t-dch-commit 710s + shift 710s + local suite=unstable 710s + t-dch-commit -r -D unstable '' 710s + t-debchange -r -D unstable '' 710s + DEBEMAIL=dgit-tests@example.org 710s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 710s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange -r -D unstable 710s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 710s libdistro-info-perl is not installed, Debian release names are not known. 710s libdistro-info-perl is not installed, Ubuntu release names are not known. 710s + git commit -m 'dch -r -D unstable ' debian/changelog 710s [patch-queue/nmu 6219d19] dch -r -D unstable 710s 1 file changed, 1 insertion(+), 1 deletion(-) 710s + t-non-dgit-upload 710s + t-dgit -wgf build-source 710s + local dgit=dgit 710s + pwd 710s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 710s + : ' 710s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 710s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf build-source 711s | git rev-parse --show-toplevel 711s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 711s | git config -z --get-regexp --local '.*' 711s | git config -z --get-regexp --local '.*' 711s | git config -z --get-regexp --global '.*' 711s | git config -z --get-regexp --system '.*' 711s format 3.0 (quilt), quilt mode linear 711s Format `3.0 (quilt)', need to check/update patch stack 711s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 711s => `' 711s + git diff --quiet HEAD 711s | git clean -dn 711s => `' 711s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 711s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 711s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 711s | git rev-parse 'HEAD~0' 711s => `6219d1942fbad06e72069683f1d92bc54c51f4f4' 711s | git symbolic-ref -q HEAD 711s => `refs/heads/patch-queue/nmu' 711s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 711s CD work 711s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 711s + git reset -q --hard 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s examining quilt state (multiple patches, linear mode) 711s branch_is_gdr 6219d1942fbad06e72069683f1d92bc54c51f4f4... 711s branch_is_gdr cdd388d460bc1f8215bafdb80bf92c245bd56f07 ?-patches NO 711s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 711s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 711s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 711s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 711s CD fake 711s | find -name .git -prune -print0 711s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 711s + git checkout -f 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian 711s + git add -Af . 711s | git write-tree 711s => `84dc8ed851e54534e5a0db6b7fd7dd20758cee35' 711s fake orig tree object 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 711s CD .. 711s + git reset -q --hard 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s CD ../fake 711s + git add -Af . 711s | git write-tree 711s => `c43f4f26de484e2d7959293f06b0d5f963ab3550' 711s fake o+d/p tree object 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 711s CD ../work 711s | git ls-tree --name-only -z 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 711s | git diff-tree -z --no-renames -r 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:000000 100644 0000000000000000000000000000000000000000 20f7624364ec18735d627fc84c64fce3dee6115b A\x00newsrc.c\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 711s quiltify_trees_differ 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 6219d1942fbad06e72069683f1d92bc54c51f4f4 => 1 711s | git diff-tree -z --no-renames --name-only -r 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 711s => `newsrc.c\x00' 711s quiltify_trees_differ 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 711s | git diff-tree -z --no-renames --name-only -r 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 c43f4f26de484e2d7959293f06b0d5f963ab3550 711s => `lib.c\x00new-upstream-file\x00src.c\x00' 711s quiltify_trees_differ 84dc8ed851e54534e5a0db6b7fd7dd20758cee35 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 711s differences @dl ## ## ## == == ==. 711s dgit: base trees orig=84dc8ed851e54534e5a0 o+d/p=c43f4f26de484e2d7959 711s dgit: quilt differences: src: ## orig ## gitignores: == orig == 711s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 711s starting quiltify (multiple patches, linear mode) 711s | git ls-tree --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/rules debian/control 711s => `debian/control'... 711s quiltify investigate 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s | git diff-tree -z --no-renames --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 711s => `newsrc.c\x00' 711s quiltify_trees_differ 6219d1942fbad06e72069683f1d92bc54c51f4f4 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 711s | git ls-tree --name-only 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/rules debian/control 711s => `debian/control'... 711s | git cat-file commit 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s => `tree b7f00f40735e99877eb161ec52f3d41f3132caef'... 711s | git diff-tree -z --no-renames --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 711s => `debian\x00' 711s quiltify_trees_differ 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 => 0 711s considering C=6219d1942fbad06e72069683f1d92bc54c51f4f4 P=4971fdebfdffec4078dddbd8a8b2c715142610e1 711s | git diff-tree -r --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 6219d1942fbad06e72069683f1d92bc54c51f4f4 -- debian/patches .pc debian/source/format 711s => `' 711s search queue P=4971fdebfdffec4078dddbd8a8b2c715142610e1 triv 711s quiltify investigate 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s | git diff-tree -z --no-renames --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 c43f4f26de484e2d7959293f06b0d5f963ab3550 711s => `debian\x00newsrc.c\x00' 711s quiltify_trees_differ 4971fdebfdffec4078dddbd8a8b2c715142610e1 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 1 711s | git ls-tree --name-only 4971fdebfdffec4078dddbd8a8b2c715142610e1 -- debian/rules debian/control 711s => `debian/control'... 711s | git cat-file commit 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s => `tree 0b3c14e300196928f6bb548f0a42db7b57ccbf7b'... 711s | git diff-tree -z --no-renames --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s => `newsrc.c\x00' 711s quiltify_trees_differ 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 => 1 711s considering C=4971fdebfdffec4078dddbd8a8b2c715142610e1 P=02fb5d2ca5687155bf8eea87c153b361a22ac3d9 711s | git diff-tree -r --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 4971fdebfdffec4078dddbd8a8b2c715142610e1 -- debian/patches .pc debian/source/format 711s => `' 711s search queue P=02fb5d2ca5687155bf8eea87c153b361a22ac3d9 NT 711s quiltify investigate 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 711s | git diff-tree -z --no-renames --name-only 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 c43f4f26de484e2d7959293f06b0d5f963ab3550 711s => `debian\x00' 711s quiltify_trees_differ 02fb5d2ca5687155bf8eea87c153b361a22ac3d9 c43f4f26de484e2d7959293f06b0d5f963ab3550 => 0 711s search finished hooray! 711s quiltify linearisation planning successful, executing... 711s quiltify traverse 02fb5d2ca5687155bf8eea87c153b361a22ac3d9..4971fdebfdffec4078dddbd8a8b2c715142610e1 711s | git cat-file commit 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s => `tree 0b3c14e300196928f6bb548f0a42db7b57ccbf7b'... 711s | git log -n1 '--pretty=format:%aD' 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s => `Tue, 26 Jun 2018 09:00:09 +0100' 711s + git checkout -q 4971fdebfdffec4078dddbd8a8b2c715142610e1 711s + git checkout -q 6219d1942fbad06e72069683f1d92bc54c51f4f4 debian/changelog 711s | realpath -- /usr/bin/dgit 711s => `/usr/bin/dgit' 711s | realpath -- .git/dgit/quilt-description.tmp 711s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 711s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-nmu.patch 711s dpkg-source: info: using patch list from debian/patches/series 711s dpkg-source: info: local changes detected, the modified files are: 711s work/newsrc.c 711s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-nmu.patch 711s + git checkout -q 4971fdebfdffec4078dddbd8a8b2c715142610e1 debian/changelog 711s quiltify traverse 4971fdebfdffec4078dddbd8a8b2c715142610e1..6219d1942fbad06e72069683f1d92bc54c51f4f4 711s + git checkout -q master 711s | git status --ignored --porcelain 711s => ` M debian/patches/series'... 711s + git add -f debian/patches 711s Commit Debian 3.0 (quilt) metadata 711s 711s [dgit (9.15) quilt-fixup] 711s 711s + git commit -m 'Commit Debian 3.0 (quilt) metadata 711s 711s [dgit (9.15) quilt-fixup] 711s ' 711s [master 218e6aa] Commit Debian 3.0 (quilt) metadata 711s 2 files changed, 13 insertions(+) 711s create mode 100644 debian/patches/upstream-nmu.patch 711s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 711s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 711s | git rev-parse 'HEAD~0' 711s => `218e6aa1ac166f88f00899f6edf5ab5f39c80440' 711s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 711s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 711s CD work 711s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 711s + git reset -q --hard 218e6aa1ac166f88f00899f6edf5ab5f39c80440 711s CD .. 711s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 711s dpkg-source: info: using source format '3.0 (quilt)' 711s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 711s dpkg-source: info: using patch list from debian/patches/series 711s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 711s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 711s CD work 711s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 711s changelog will contain changes since 2.0-2 711s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 711s dpkg-genchanges: info: not including original source code in upload 711s CD .. 711s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 711s renaming (Files) example_2.0.orig.tar.gz 711s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 711s renaming (dsc) example_2.0-2+nmu1.dsc 711s renaming (changes) example_2.0-2+nmu1_source.changes 711s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 711s dgit ok: source built, results in example_2.0-2+nmu1.dsc and example_2.0-2+nmu1_source.changes 712s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 712s ' 712s + cd .. 712s + c=example_2.0-2+nmu1_source.changes 712s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A example_2.0-2+nmu1_source.changes 712s signfile dsc example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 712s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 712s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 712s 712s fixup_changes dsc example_2.0-2+nmu1.dsc example_2.0-2+nmu1_source.changes 712s signfile changes example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 712s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 712s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 712s 712s Successfully signed dsc, changes files 712s + dput -c /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy example_2.0-2+nmu1_source.changes 712s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 712s gpg: /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 712s D: Setting host argument. 712s Checking signature on .changes 712s Checking signature on .dsc 712s Uploading to test-dummy (via local to localhost): 712s Successfully uploaded packages. 712s + t-archive-process-incoming sid 712s + local suite=sid 712s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 712s + t-archive-query sid 712s + local suite=sid 712s + local dscf=main/example_2.0-2+nmu1.dsc 712s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 712s + local suite=sid 712s + local p=example 712s + local v=2.0-2+nmu1 712s + local dscf=main/example_2.0-2+nmu1.dsc 712s + local sha 712s ++ sha256sum 712s + sha='2d966d9c59a7f1c40c496685e1248d536bc51fed5f524cc47f211017df11f2f8 -' 712s + echo '2.0-2+nmu1 2d966d9c59a7f1c40c496685e1248d536bc51fed5f524cc47f211017df11f2f8 main/example_2.0-2+nmu1.dsc' 712s + t-aq-archive-updated sid example 712s + local suite=sid 712s + local p=example 712s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 712s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 712s + perl -wne ' 712s use JSON; 712s use strict; 712s our @v; 712s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 712s push @v, { 712s "version" => "$1", 712s "sha256sum" => "$2", 712s "component" => "$3", 712s "filename" => "$4", 712s }; 712s END { 712s my $json = JSON->new->canonical(); 712s print $json->encode(\@v) or die $!; 712s } 712s ' 712s + t-git-next-date 712s + GIT_COMMITTER_DATE='1530000010 +0100' 712s + GIT_AUTHOR_DATE='1530000010 +0100' 712s + cd example 712s + git checkout master 712s Switched to branch 'master' 712s Your branch is ahead of 'origin/master' by 15 commits. 712s (use "git push" to publish your local commits) 712s + : 'ad hocery' 712s + t-git-next-date 712s + GIT_COMMITTER_DATE='1530000011 +0100' 712s + GIT_AUTHOR_DATE='1530000011 +0100' 712s + git checkout master 712s Already on 'master' 712s Your branch is ahead of 'origin/master' by 15 commits. 712s (use "git push" to publish your local commits) 712s + t-nmu-causes-ff-fail 712s + t-dgit fetch 712s + local dgit=dgit 712s + pwd 712s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 712s + : ' 712s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 712s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 712s | git rev-parse --show-toplevel 712s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 712s | git config -z --get-regexp --local '.*' 712s | git config -z --get-regexp --local '.*' 712s | git config -z --get-regexp --global '.*' 712s | git config -z --get-regexp --system '.*' 712s | git symbolic-ref -q HEAD 712s => `refs/heads/master' 712s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 712s canonical suite name for unstable is sid 712s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 712s => `1' 712s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 712s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 712s git_lrfetch_sane iteration 0 712s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 712s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 712s => 610bd4679516b8ff4b85a029aae11631494de9d9 refs/tags/archive/test-dummy/2.0-1 712s => ce54d97b6999f97979f01526c311c26b24e65563 refs/tags/archive/test-dummy/2.0-2 712s => c51ebb6bf1a273776ae12a528b4496475a8aac1d refs/tags/test-dummy/2.0-1 712s => f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 refs/tags/test-dummy/2.0-2 712s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 712s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 712s | git for-each-ref refs/dgit-fetch/test-dummy 712s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 712s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 712s |> ce54d97b6999f97979f01526c311c26b24e65563 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 712s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 712s |> f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 712s git_lrfetch_sane: tidying any old suite lrfetchrefs 712s | git for-each-ref refs/dgit-fetch/sid 712s git_lrfetch_sane: git fetch --no-insane emulation complete 712s $VAR1 = { 712s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'c51ebb6bf1a273776ae12a528b4496475a8aac1d', 712s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'f5a83d94634b2513c0fbb8cd47fd2fe39de4b548', 712s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 712s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => 'ce54d97b6999f97979f01526c311c26b24e65563', 712s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '610bd4679516b8ff4b85a029aae11631494de9d9' 712s }; 712s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 712s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/tags/archive/test-dummy/2.0-1 712s currently refs/tags/archive/test-dummy/2.0-1=610bd4679516b8ff4b85a029aae11631494de9d9 712s |> ce54d97b6999f97979f01526c311c26b24e65563 tag refs/tags/archive/test-dummy/2.0-2 712s currently refs/tags/archive/test-dummy/2.0-2=ce54d97b6999f97979f01526c311c26b24e65563 712s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/tags/test-dummy/2.0-1 712s currently refs/tags/test-dummy/2.0-1=c51ebb6bf1a273776ae12a528b4496475a8aac1d 712s |> f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 tag refs/tags/test-dummy/2.0-2 712s currently refs/tags/test-dummy/2.0-2=f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 712s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 712s |> 610bd4679516b8ff4b85a029aae11631494de9d9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 712s offered refs/tags/archive/test-dummy/2.0-1=610bd4679516b8ff4b85a029aae11631494de9d9 712s |> ce54d97b6999f97979f01526c311c26b24e65563 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 712s offered refs/tags/archive/test-dummy/2.0-2=ce54d97b6999f97979f01526c311c26b24e65563 712s |> c51ebb6bf1a273776ae12a528b4496475a8aac1d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 712s offered refs/tags/test-dummy/2.0-1=c51ebb6bf1a273776ae12a528b4496475a8aac1d 712s |> f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 712s offered refs/tags/test-dummy/2.0-2=f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 712s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 712s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 712s get_archive_dsc: Version 2.0-2+nmu1 712s last upload to archive: NO git hash 712s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 712s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 712s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 712s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 712s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 712s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 712s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 712s considering reusing example_2.0.orig.tar.gz: (No such file or directory) linked. 712s using existing example_2.0.orig.tar.gz 712s considering saving example_2.0.orig.tar.gz: (File exists) no need. 712s considering reusing example_2.0-2+nmu1.debian.tar.xz: (No such file or directory) linked. 712s using existing example_2.0-2+nmu1.debian.tar.xz 712s considering saving example_2.0-2+nmu1.debian.tar.xz: (File exists) no need. 712s import considering example_2.0.orig.tar.gz Y .gz orig 712s + chmod -R '+rwX' _unpack-tar 712s CD _unpack-tar 712s | find -name .git -prune -print0 712s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 712s + git add -Af . 712s | git write-tree 712s => `e24142d5bb711d7b480f1e58dfc3e8c461c6e106' 712s | git ls-tree -z e24142d5bb711d7b480f1e58dfc3e8c461c6e106 712s => `040000 tree bdaae868b00952ee2af5782628959ae01469b2e3\x09example-2.0\x00' 712s one subtree bdaae868b00952ee2af5782628959ae01469b2e3 712s CD .. 712s import considering example_2.0-2+nmu1.debian.tar.xz Y .xz (none) 712s + chmod -R '+rwX' _unpack-tar 712s CD _unpack-tar 712s | find -name .git -prune -print0 712s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 712s + git add -Af . 712s | git write-tree 712s => `23e971fe638bc162b531d732bb16219be595a43c' 712s | git ls-tree -z 23e971fe638bc162b531d732bb16219be595a43c 712s => `040000 tree 12f5ba668e35e4a47824cc6cda0e3098989e4312\x09debian\x00' 712s one subtree 12f5ba668e35e4a47824cc6cda0e3098989e4312 712s CD .. 712s + dpkg-source --no-check --skip-patches -x -- example.dsc 712s dpkg-source: info: extracting example in example-2.0 712s dpkg-source: info: unpacking example_2.0.orig.tar.gz 712s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 712s CD example-2.0 712s | find -name .git -prune -print0 712s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 712s + git add -Af . 712s | git write-tree 712s => `95090028cc5026a9b5217d61a6c9f14ce0045ee1' 712s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 712s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 712s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 712s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 713s + git add -Af . 713s | git write-tree 713s => `1aabcedad6a8aa38371734ce42fe2aebc49d090c' 713s import clog search... 713s | dpkg-parsechangelog --format rfc822 --all 713s import clog 2.0-2+nmu1 package changelog, entry no.1... 713s import clog 2.0-2+nmu1 vs 2.0... 713s import clog 2.0-2+nmu1 becomes r1 713s import clog 2.0-2 package changelog, entry no.2... 713s import clog 2.0-2 vs 2.0... 713s import clog 2.0-2 becomes r1 713s import clog 2.0-1 package changelog, entry no.3... 713s import clog 2.0-1 vs 2.0... 713s import clog 2.0-1 becomes r1 713s import clog 1.0-1 package changelog, entry no.4... 713s import clog 1.0-1 vs 2.0... 713s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 713s => `1530000009 +0000' 713s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 713s => `1530000000 +0000' 713s import tartrees authline dgit test git user 1530000009 +0000 713s import tartrees r1authline dgit test git user 1530000000 +0000 713s import tartree example_2.0.orig.tar.gz bdaae868b00952ee2af5782628959ae01469b2e3 713s | git hash-object -w -t commit --stdin 713s => 6587c6c396e0002956dd3b151fe4b82e0bd7611c 713s import tartree example_2.0-2+nmu1.debian.tar.xz 12f5ba668e35e4a47824cc6cda0e3098989e4312 713s | git hash-object -w -t commit --stdin 713s => 5aae5da550b90378be4cee7b8148dd10d247cca6 713s import main commit 713s | git hash-object -w -t commit ../commit.tmp 713s => `968e0650fa96398f568331d7f9a52ae0ec8e2745' 713s import apply patches... 713s | git hash-object -w -t commit --stdin 713s => f21fc372b44a946334b067f1e11e694b03bb8407 713s + git checkout -q -b dapplied f21fc372b44a946334b067f1e11e694b03bb8407 713s + git checkout -q -b unpa 968e0650fa96398f568331d7f9a52ae0ec8e2745 713s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 713s => `1530000009 +0000' 713s + git checkout -q unpa 713s + git update-ref -d refs/heads/patch-queue/unpa 713s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 713s | git rev-parse 'HEAD~0' 713s => `38d22bb4c9556793edd4a1d3617b56d318810b54' 713s | git rev-parse HEAD: 713s => `1aabcedad6a8aa38371734ce42fe2aebc49d090c' 713s synthesised git commit from .dsc 2.0-2+nmu1 713s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:debian/changelog 713s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 713s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgitclog; exec "$@"' x git cat-file blob 38d22bb4c9556793edd4a1d3617b56d318810b54:debian/changelog 713s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 38d22bb4c9556793edd4a1d3617b56d318810b54 713s =>!256 713s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s fetch mergeinfos: 713s commit 38d22bb4c9556793edd4a1d3617b56d318810b54 Import of source package 713s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf dgit suite branch on dgit git server 713s ReverseParents=1 Message=Record example (2.0-2+nmu1) in archive suite sid 713s | git cat-file commit 38d22bb4c9556793edd4a1d3617b56d318810b54 713s => `tree 1aabcedad6a8aa38371734ce42fe2aebc49d090c'... 713s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:09 +0000' 713s => `1530000009 +0000' 713s | git hash-object -w -t commit /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/mergecommit 713s => `d79025ae72ceb544a8c17eb58f17f7ac33e2835d' 713s fetch hash=d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 713s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 713s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s | git log -n2 d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s => `commit d79025ae72ceb544a8c17eb58f17f7ac33e2835d'... 713s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid d79025ae72ceb544a8c17eb58f17f7ac33e2835d 713s => `' 713s is_gitattrs_setup: found nothing 713s | git ls-tree -lrz -- d79025ae72ceb544a8c17eb58f17f7ac33e2835d: 713s dgit ok: fetched into refs/remotes/dgit/dgit/sid 713s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 713s del_lrfetchrefs... 713s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 713s del_lrfetchrefs: 610bd4679516b8ff4b85a029aae11631494de9d9 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 713s del_lrfetchrefs: ce54d97b6999f97979f01526c311c26b24e65563 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 713s del_lrfetchrefs: c51ebb6bf1a273776ae12a528b4496475a8aac1d refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 713s del_lrfetchrefs: f5a83d94634b2513c0fbb8cd47fd2fe39de4b548 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 713s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 713s ' 713s + t-expect-fail 'E:Not.*fast-forward' git merge --ff-only dgit/dgit/sid 713s + local 'mpat=E:Not.*fast-forward' 713s + shift 713s + set +o pipefail 713s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + LC_MESSAGES=C 713s + LANGUAGE=C 713s + git merge --ff-only dgit/dgit/sid 713s fatal: Not possible to fast-forward, aborting. 713s + local 'ps=128 0' 713s + set -o pipefail 713s + case $ps in 713s + t-grep-mpat 'E:Not.*fast-forward' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local 'mpat=E:Not.*fast-forward' 713s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local grepper=fgrep 713s + case "$mpat" in 713s + case "$mpat" in 713s + grepper=egrep 713s + mpat='Not.*fast-forward' 713s + egrep -e 'Not.*fast-forward' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s fatal: Not possible to fast-forward, aborting. 713s + t-expect-fail 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' t-git-debrebase 713s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 713s + shift 713s + set +o pipefail 713s + LC_MESSAGES=C 713s + LANGUAGE=C 713s + t-git-debrebase 713s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local gdr=git-debrebase 713s + : ' 713s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 713s + git-debrebase --dgit=dgit -D 713s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 713s git-debrebase ffq check_specs * 713s git-debrebase ffq merge master 713s git-debrebase ffq check_remote origin remote fetch/merge branch 713s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 713s OK, you are ahead of refs/remotes/origin/master 713s git-debrebase ffq check_remote undef remote push branch 713s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 713s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 713s 713s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 713s + local 'ps=255 0' 713s + set -o pipefail 713s + case $ps in 713s + t-grep-mpat 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 713s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local grepper=fgrep 713s + case "$mpat" in 713s + case "$mpat" in 713s + grepper=egrep 713s + mpat='-fdiverged.*refs/remotes/dgit/dgit/sid' 713s + egrep -e '-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 713s + git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}' 713s [master e1a2970] UPSTREAM NMU 713s Date: Tue Jun 26 09:00:09 2018 +0100 713s 1 file changed, 1 insertion(+) 713s create mode 100644 newsrc.c 713s + t-expect-fail 'Automatic merge failed; fix conflicts' git merge --squash -m 'Incorporate NMU' dgit/dgit/sid 713s + local 'mpat=Automatic merge failed; fix conflicts' 713s + shift 713s + set +o pipefail 713s + LC_MESSAGES=C 713s + LANGUAGE=C 713s + git merge --squash -m 'Incorporate NMU' dgit/dgit/sid 713s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s Auto-merging debian/changelog 713s CONFLICT (modify/delete): debian/patches/series deleted in HEAD and modified in dgit/dgit/sid. Version dgit/dgit/sid of debian/patches/series left in tree. 713s Squash commit -- not updating HEAD 713s Automatic merge failed; fix conflicts and then commit the result. 713s + local 'ps=1 0' 713s + set -o pipefail 713s + case $ps in 713s + t-grep-mpat 'Automatic merge failed; fix conflicts' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local 'mpat=Automatic merge failed; fix conflicts' 713s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s + local grepper=fgrep 713s + case "$mpat" in 713s + fgrep -e 'Automatic merge failed; fix conflicts' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 713s Automatic merge failed; fix conflicts and then commit the result. 713s + git rm -rf debian/patches 713s rm 'debian/patches/series' 713s rm 'debian/patches/series' 713s rm 'debian/patches/upstream-nmu.patch' 713s + git commit -m 'Incorporate NMU' 713s [master 7a836f5] Incorporate NMU 713s 1 file changed, 6 insertions(+) 713s + git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid 713s Merge made by the 'ours' strategy. 713s + : 'right, how are we' 713s + t-git-next-date 713s + GIT_COMMITTER_DATE='1530000012 +0100' 713s + GIT_AUTHOR_DATE='1530000012 +0100' 713s + t-git-debrebase 713s + local gdr=git-debrebase 713s + : ' 713s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 713s + git-debrebase --dgit=dgit -D 713s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 713s git-debrebase ffq check_specs * 713s git-debrebase ffq merge master 713s git-debrebase ffq check_remote origin remote fetch/merge branch 713s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 713s OK, you are ahead of refs/remotes/origin/master 713s git-debrebase ffq check_remote undef remote push branch 713s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 713s OK, you are ahead of refs/remotes/dgit/dgit/sid 713s git-debrebase *** WALK 932654abddf0eb7ebe550193fb0ba398ba364e49 0 - 713s git-debrebase get_differs 7a836f53fdcff187d439fc6bb6768aa012e3bd06 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 713s git-debrebase get_differs d79025ae72ceb544a8c17eb58f17f7ac33e2835d f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x3a 713s git-debrebase classify 932654abddf0eb7ebe550193fb0ba398ba364e49 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 7a836f53fdcff187d439fc6bb6768aa012e3bd06/0 d79025ae72ceb544a8c17eb58f17f7ac33e2835d/0x3a 713s git-debrebase = Pseudomerge {"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 7a836f53fdcff187d439fc6bb6768aa012e3bd06\nparent d79025ae72ceb544a8c17eb58f17f7ac33e2835d\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Declare incorporate NMU\n","Overwritten" => [{"CommitId" => "d79025ae72ceb544a8c17eb58f17f7ac33e2835d","Differs" => 58,"Ix" => 1}],"Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06"},"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b"} 713s git-debrebase get_differs e1a29702bc09f17e805417c4625c85ff524a08ec f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x10 713s git-debrebase classify 7a836f53fdcff187d439fc6bb6768aa012e3bd06 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p e1a29702bc09f17e805417c4625c85ff524a08ec/0x10 713s git-debrebase = Changelog {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec"}],"Type" => "Changelog","CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent e1a29702bc09f17e805417c4625c85ff524a08ec\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Incorporate NMU\n"} 713s git-debrebase get_differs 74d5f586ed443ce47434f30fbbeff3eacb36748d 1d2249b1ed867c28303679a982049ff643d56028 = 0x2 713s git-debrebase classify e1a29702bc09f17e805417c4625c85ff524a08ec $t=1d2249b1ed867c28303679a982049ff643d56028 @p 74d5f586ed443ce47434f30fbbeff3eacb36748d/0x2 713s git-debrebase = Upstream {"Hdr" => "tree 1d2249b1ed867c28303679a982049ff643d56028\nparent 74d5f586ed443ce47434f30fbbeff3eacb36748d\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Tree" => "1d2249b1ed867c28303679a982049ff643d56028","CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec","Type" => "Upstream","Parents" => [{"CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Ix" => 0,"Differs" => 2}]} 713s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0 713s git-debrebase get_differs 964ce93fe0ce99ab711d1cb423537d236e0bbf20 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x8 713s git-debrebase classify 74d5f586ed443ce47434f30fbbeff3eacb36748d $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p 5b2d01d10ec62b3f25e6f7a22710468830e457fb/0 964ce93fe0ce99ab711d1cb423537d236e0bbf20/0x8 713s git-debrebase = Pseudomerge {"Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","Contributor" => {"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Ix" => 0,"Differs" => 0},"Parents" => [$VAR1->{"Contributor"},{"Differs" => 8,"Ix" => 1,"CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20"}],"Type" => "Pseudomerge","CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent 5b2d01d10ec62b3f25e6f7a22710468830e457fb\nparent 964ce93fe0ce99ab711d1cb423537d236e0bbf20\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 713s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 713s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 713s git-debrebase = Upstream {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Parents" => [{"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 713s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 713s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 713s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2"}],"Type" => "Upstream","Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14"} 713s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 713s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 713s git-debrebase = Upstream {"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Parents" => [{"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 713s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 713s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 713s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7"}],"Type" => "Upstream","CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 713s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 713s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 713s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"Type" => "Upstream","CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 713s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 713s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 713s git-debrebase = Packaging {"Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"}],"Type" => "Packaging","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd"} 713s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 713s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 713s git-debrebase = Packaging {"Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"}],"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4"} 713s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 713s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 713s git-debrebase = Changelog {"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Type" => "Changelog","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16,"Ix" => 0}],"Tree" => "894ca54a967167e2bb994b82357d084539559075"} 713s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 713s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 713s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 713s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 713s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 713s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 713s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 713s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 713s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 713s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 713s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 16 pm 1 713s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 713s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 713s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 17 713s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 713s git-debrebase WALK BUILD 9214201f528bae71f4647709e2357407746739d5 Debian (rewriting=0) 713s git-debrebase WALK BUILD 32b1b8f0bdc575561b14de2ec9711d768a12d928 Debian (rewriting=0) 713s git-debrebase WALK BUILD d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Debian (rewriting=0) 713s git-debrebase WALK BUILD 66623ad57ce32197ca515cfa520eaf7d7746889d Debian (rewriting=0) 713s git-debrebase WALK BUILD 274022edec808f75f2359551ecdc6de6b6390355 Debian (rewriting=0) 713s git-debrebase WALK BUILD 7a836f53fdcff187d439fc6bb6768aa012e3bd06 Debian (rewriting=0) 713s git-debrebase WALK REWRITING NOW cl=HASH(0x55cc954416b8) procd=HASH(0x55cc95505330) 713s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 713s git-debrebase WALK BUILD 505316fe392571a9180b6df0d54ec25ffb40c9c7 Upstream (rewriting=1) 713s git-debrebase WALK BUILD f99dd01b94310ac6847d5bb66d530db52eceb9a7 Upstream (rewriting=1) 713s git-debrebase WALK BUILD 8139d3db657e3270633db038d311934dab9b5fa2 Upstream (rewriting=1) 713s git-debrebase WALK BUILD b3c76885171009da1ef20071776aa9044fae8502 Upstream (rewriting=1) 713s git-debrebase WALK BUILD 5b2d01d10ec62b3f25e6f7a22710468830e457fb Upstream (rewriting=1) 713s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 713s git-debrebase WALK BUILD e1a29702bc09f17e805417c4625c85ff524a08ec Upstream (rewriting=1) 713s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 713s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 713s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49 = 0 713s git-debrebase *** WALK RETURN 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 8269bff5f8f41256a597bb494347f4bd8fc81fba 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 713s git-debrebase: laundered (head was 932654abddf0eb7ebe550193fb0ba398ba364e49) 713s git-debrebase >= update refs/ffq-prev/heads/master 932654abddf0eb7ebe550193fb0ba398ba364e49 0000000000000000000000000000000000000000 713s git-debrebase >= delete refs/debrebase-last/heads/master 713s git-debrebase >= update HEAD 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49 713s git-debrebase >$ 713s Recorded previous head for preservation 713s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 713s ' 713s + t-gdr-good laundered 713s + local state=laundered 713s + local beforetag= 713s + case $state in 713s + git diff --quiet -- :. ':!debian/patches' 713s + LC_MESSAGES=C 713s + t-git-debrebase status 713s + local gdr=git-debrebase 713s + : ' 713s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 713s + git-debrebase --dgit=dgit -D status 713s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 713s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 713s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Parents" => [{"Ix" => 0,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Differs" => 2}],"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 713s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 713s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 713s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Parents" => [{"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2}],"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 713s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 713s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 713s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 713s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 713s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 713s git-debrebase = Upstream {"Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Parents" => [{"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Differs" => 2}]} 714s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 714s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 714s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Differs" => 2}],"Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Type" => "Upstream","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 714s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 714s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 714s git-debrebase = Upstream {"Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Parents" => [{"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Differs" => 2,"Ix" => 0}]} 714s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 714s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 714s git-debrebase = Changelog {"Msg" => "Incorporate NMU\n","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Type" => "Changelog"} 714s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 714s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 714s git-debrebase = Packaging {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"} 714s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 714s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 714s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 714s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 714s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 714s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Tree" => "894ca54a967167e2bb994b82357d084539559075","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Type" => "Changelog","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 714s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 714s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 714s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 714s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 714s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 714s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 714s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 714s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 714s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 714s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor"} 714s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 714s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 714s ' 714s + case $state in 714s + egrep '^ *branch is laundered' ../status.check 714s branch is laundered 714s + t-gdr-good-analyse HEAD laundered 714s + local head=HEAD 714s + local state=laundered 714s + local wsfx= 714s + local etypes bwtip 714s + case $state in 714s + etypes=Upstream 714s ++ t-git-debrebase breakwater 714s ++ local gdr=git-debrebase 714s ++ : ' 714s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 714s ++ git-debrebase --dgit=dgit -D breakwater 714s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 714s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 714s git-debrebase = Upstream {"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9"}]} 714s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 714s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 714s git-debrebase = Upstream {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2}],"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream"} 714s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 714s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Parents" => [{"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Differs" => 2,"Ix" => 0}],"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n"} 714s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 714s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 714s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream"} 714s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 714s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Parents" => [{"Differs" => 2,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Ix" => 0}],"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 714s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 714s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 714s git-debrebase = Upstream {"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Parents" => [{"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Differs" => 2,"Ix" => 0}],"Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n"} 714s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 714s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 714s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16}],"Msg" => "Incorporate NMU\n"} 714s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 714s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 714s git-debrebase = Packaging {"Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"Ix" => 0,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32}]} 714s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 714s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 714s git-debrebase = Packaging {"Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Parents" => [{"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0}],"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 714s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 714s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 714s git-debrebase = Changelog {"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Tree" => "894ca54a967167e2bb994b82357d084539559075","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}]} 714s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 714s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 714s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog"} 714s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 714s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 714s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 714s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 714s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 714s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 714s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 714s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 714s ' 714s + bwtip=Y:8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + anal=../anal 714s + t-git-debrebase analyse HEAD 714s + local gdr=git-debrebase 714s + : ' 714s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 714s + git-debrebase --dgit=dgit -D analyse HEAD 714s git-debrebase *** WALK 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 1 *main::STDOUT 714s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 714s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 714s git-debrebase = Upstream {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Type" => "Upstream","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Parents" => [{"Differs" => 2,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Ix" => 0}]} 714s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 714s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 714s git-debrebase = Upstream {"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Parents" => [{"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2}],"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733"} 714s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 714s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 714s git-debrebase = Upstream {"Parents" => [{"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0,"Differs" => 2}],"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Type" => "Upstream","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c"} 714s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 714s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 714s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}],"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Type" => "Upstream","Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 714s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 714s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 714s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4"}],"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"} 714s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 714s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 714s git-debrebase = Upstream {"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Parents" => [{"Differs" => 2,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Ix" => 0}],"Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Type" => "Upstream","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 714s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 714s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 714s git-debrebase = Changelog {"Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Incorporate NMU\n","Type" => "Changelog","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16}],"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"} 714s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 714s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 714s git-debrebase = Packaging {"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Parents" => [{"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Type" => "Packaging"} 714s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 714s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 714s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"}],"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d"} 714s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 714s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 714s git-debrebase = Changelog {"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Tree" => "894ca54a967167e2bb994b82357d084539559075","Type" => "Changelog","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v2.0-3 -m start 2.0-3\n"} 714s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 714s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 714s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Ix" => 0,"Differs" => 16}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 714s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 714s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 714s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 714s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 714s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 714s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 714s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 714s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 5 proc 12 pm -1 714s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 714s ' 714s ++ git rev-parse HEAD 714s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 714s + exec 714s + local cid ctype info nparents 714s + read cid ctype info 714s + : ===== 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea Upstream ===== 714s + test 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea = 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 714s + local parents=c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s + expect=c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s + enparents=1 714s + : Upstream/SAME c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== c59f39e5ca05d33181b7ea7f243a95d529283eb9 Upstream ===== 714s + test c59f39e5ca05d33181b7ea7f243a95d529283eb9 = c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P c59f39e5ca05d33181b7ea7f243a95d529283eb9 714s + local parents=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s + expect=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s + enparents=1 714s + : Upstream/SAME 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 Upstream ===== 714s + test 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 = 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 714s + local parents=fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s + expect=fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s + enparents=1 714s + : Upstream/SAME fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== fc2ef95aff332f63d93b2025328fafa4a47a6f72 Upstream ===== 714s + test fc2ef95aff332f63d93b2025328fafa4a47a6f72 = fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P fc2ef95aff332f63d93b2025328fafa4a47a6f72 714s + local parents=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s + expect=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s + enparents=1 714s + : Upstream/SAME 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 582e04de6ba12ec6c2a7957216152c3d4bb5b68f Upstream ===== 714s + test 582e04de6ba12ec6c2a7957216152c3d4bb5b68f = 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 714s + local parents=4003fef7726798715307fd023578bd022f3c34a4 714s + expect=4003fef7726798715307fd023578bd022f3c34a4 714s + enparents=1 714s + : Upstream/SAME 4003fef7726798715307fd023578bd022f3c34a4 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s 4003fef7726798715307fd023578bd022f3c34a4 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 4003fef7726798715307fd023578bd022f3c34a4 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 4003fef7726798715307fd023578bd022f3c34a4 Upstream ===== 714s + test 4003fef7726798715307fd023578bd022f3c34a4 = 4003fef7726798715307fd023578bd022f3c34a4 714s + local cetype=Upstream 714s + '[' xUpstream = xUpstream ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 4003fef7726798715307fd023578bd022f3c34a4 714s + local parents=8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + expect=8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + enparents=1 714s + : Upstream/SAME 8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s ++ printf %s 8269bff5f8f41256a597bb494347f4bd8fc81fba 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 8269bff5f8f41256a597bb494347f4bd8fc81fba 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 8269bff5f8f41256a597bb494347f4bd8fc81fba Changelog ===== 714s + test 8269bff5f8f41256a597bb494347f4bd8fc81fba = 8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + local cetype=Upstream 714s + '[' xChangelog = xUpstream ']' 714s ++ git log -n1 --pretty=format:%P 8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + local parents=274022edec808f75f2359551ecdc6de6b6390355 714s + expect=274022edec808f75f2359551ecdc6de6b6390355 714s + enparents=1 714s + : Changelog/Upstream 274022edec808f75f2359551ecdc6de6b6390355 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + '[' xY:8269bff5f8f41256a597bb494347f4bd8fc81fba '!=' x ']' 714s + test Y:8269bff5f8f41256a597bb494347f4bd8fc81fba = Y:8269bff5f8f41256a597bb494347f4bd8fc81fba 714s + bwtip= 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet 274022edec808f75f2359551ecdc6de6b6390355..8269bff5f8f41256a597bb494347f4bd8fc81fba -- :. ':!debian/changelog' 714s + etypes=Packaging 714s ++ printf %s 274022edec808f75f2359551ecdc6de6b6390355 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 274022edec808f75f2359551ecdc6de6b6390355 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 274022edec808f75f2359551ecdc6de6b6390355 Packaging ===== 714s + test 274022edec808f75f2359551ecdc6de6b6390355 = 274022edec808f75f2359551ecdc6de6b6390355 714s + local cetype=Packaging 714s + '[' xPackaging = xPackaging ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 274022edec808f75f2359551ecdc6de6b6390355 714s + local parents=66623ad57ce32197ca515cfa520eaf7d7746889d 714s + expect=66623ad57ce32197ca515cfa520eaf7d7746889d 714s + enparents=1 714s + : Packaging/SAME 66623ad57ce32197ca515cfa520eaf7d7746889d 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :. ':!debian' 714s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :debian/patches 714s + etypes=Packaging 714s ++ printf %s 66623ad57ce32197ca515cfa520eaf7d7746889d 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 66623ad57ce32197ca515cfa520eaf7d7746889d 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 66623ad57ce32197ca515cfa520eaf7d7746889d Packaging ===== 714s + test 66623ad57ce32197ca515cfa520eaf7d7746889d = 66623ad57ce32197ca515cfa520eaf7d7746889d 714s + local cetype=Packaging 714s + '[' xPackaging = xPackaging ']' 714s + cetype=SAME 714s ++ git log -n1 --pretty=format:%P 66623ad57ce32197ca515cfa520eaf7d7746889d 714s + local parents=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s + expect=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s + enparents=1 714s + : Packaging/SAME d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :. ':!debian' 714s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :debian/patches 714s + etypes=Packaging 714s ++ printf %s d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Changelog ===== 714s + test d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a = d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s + local cetype=Packaging 714s + '[' xChangelog = xPackaging ']' 714s ++ git log -n1 --pretty=format:%P d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 714s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 714s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 714s + enparents=1 714s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a -- :. ':!debian/changelog' 714s + etypes=Packaging 714s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 714s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 714s + local cetype=Packaging 714s + '[' xChangelog = xPackaging ']' 714s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 714s + local parents=9214201f528bae71f4647709e2357407746739d5 714s + expect=9214201f528bae71f4647709e2357407746739d5 714s + enparents=1 714s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 714s + etypes=Packaging 714s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s ++ wc -w 714s ++ for f in $parents 714s ++ echo 9214201f528bae71f4647709e2357407746739d5 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 714s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 714s + local cetype=Packaging 714s + '[' xChangelog = xPackaging ']' 714s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 714s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s + enparents=1 714s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 714s + etypes=Packaging 714s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s ++ wc -w 714s + local cnparents=1 714s + test 1 = 1 714s ++ for f in $parents 714s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s ++ wc -w 714s ++ t-sort -u 714s ++ LC_COLLATE=C 714s ++ sort -u 714s + local cndparents=1 714s + test 1 = 1 714s + case "$parents" in 714s + case "$ctype" in 714s + read cid ctype info 714s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 714s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s + local cetype=Packaging 714s + '[' xAnchor = xPackaging ']' 714s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 714s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 714s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 714s + enparents=1 714s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 714s + case "$ctype/$cetype" in 714s + case "$ctype/$etypes" in 714s + case "$cetype" in 714s + case "$ctype" in 714s + break 714s + t-git-debrebase stitch 714s + local gdr=git-debrebase 714s + : ' 714s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 714s + git-debrebase --dgit=dgit -D stitch 714s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 714s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 714s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 714s git-debrebase = Upstream {"Parents" => [{"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b"} 714s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 714s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 714s git-debrebase = Upstream {"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Ix" => 0,"Differs" => 2}]} 714s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 714s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72"}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 714s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 714s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Ix" => 0,"Differs" => 2}],"Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 714s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 714s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 714s git-debrebase = Upstream {"Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Ix" => 0}]} 714s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 714s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 714s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f"} 714s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 714s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 714s git-debrebase = Changelog {"Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0,"Differs" => 16}],"Msg" => "Incorporate NMU\n","Type" => "Changelog","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd"} 714s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 714s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 714s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32}],"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd"} 714s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 714s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 714s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4"} 714s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 714s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 714s git-debrebase = Changelog {"Tree" => "894ca54a967167e2bb994b82357d084539559075","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}]} 714s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 714s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 714s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 714s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 714s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 714s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 714s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 714s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 714s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 714s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 714s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 714s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 714s git-debrebase >= delete refs/ffq-prev/heads/master 932654abddf0eb7ebe550193fb0ba398ba364e49 714s git-debrebase >= update refs/debrebase-last/heads/master 7deba4224559390e54e9ff106aa4430e0cfdb7f5 0000000000000000000000000000000000000000 714s git-debrebase >= update HEAD 7deba4224559390e54e9ff106aa4430e0cfdb7f5 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 714s git-debrebase >$ 714s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 714s ' 714s + t-gdr-good stitched 714s + local state=stitched 714s + local beforetag= 714s + case $state in 714s + git diff --quiet -- :. ':!debian/patches' 714s + LC_MESSAGES=C 714s + t-git-debrebase status 714s + local gdr=git-debrebase 714s + : ' 714s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 714s + git-debrebase --dgit=dgit -D status 714s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 714s git-debrebase get_differs 932654abddf0eb7ebe550193fb0ba398ba364e49 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 714s git-debrebase classify 7deba4224559390e54e9ff106aa4430e0cfdb7f5 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea/0 932654abddf0eb7ebe550193fb0ba398ba364e49/0 714s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea\nparent 932654abddf0eb7ebe550193fb0ba398ba364e49\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Contributor" => {"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Ix" => 0,"Differs" => 0},"Overwritten" => [{"Differs" => 0,"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Ix" => 1}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "7deba4224559390e54e9ff106aa4430e0cfdb7f5","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","SubType" => "Ambiguous"} 714s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 714s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 714s git-debrebase = Upstream {"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Parents" => [{"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Ix" => 0,"Differs" => 2}],"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch"} 714s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 714s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Parents" => [{"Ix" => 0,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Differs" => 2}]} 714s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 714s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 714s git-debrebase = Upstream {"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Type" => "Upstream","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Differs" => 2}],"Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c"} 714s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 714s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 714s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","Parents" => [{"Differs" => 2,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Ix" => 0}]} 714s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 714s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 714s git-debrebase = Upstream {"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Differs" => 2}],"Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9"} 714s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 714s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 714s git-debrebase = Upstream {"Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n"} 714s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 714s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 714s git-debrebase = Changelog {"Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "Incorporate NMU\n","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd"} 714s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 714s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 714s git-debrebase = Packaging {"Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"Differs" => 32,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Ix" => 0}],"Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"} 714s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 714s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 714s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0}],"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Type" => "Packaging","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 714s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 714s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 714s git-debrebase = Changelog {"Tree" => "894ca54a967167e2bb994b82357d084539559075","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Msg" => "dch -v2.0-3 -m start 2.0-3\n"} 714s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 714s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 714s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}]} 714s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 714s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 714s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 714s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 714s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 714s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 714s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 714s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 714s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 714s ' 714s + case $state in 714s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 714s branch contains furniture (not laundered) 714s + egrep '^ stitched$' ../status.check 714s stitched 714s + t-gdr-good-analyse HEAD stitched 714s + local head=HEAD 714s + local state=stitched 714s + local wsfx= 714s + local etypes bwtip 714s + case $state in 714s + etypes=Pseudomerge-Upstream 714s + anal=../anal 714s + t-git-debrebase analyse HEAD 714s + local gdr=git-debrebase 714s + : ' 714s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 714s + git-debrebase --dgit=dgit -D analyse HEAD 715s git-debrebase *** WALK 7deba4224559390e54e9ff106aa4430e0cfdb7f5 1 *main::STDOUT 715s git-debrebase get_differs 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 715s git-debrebase get_differs 932654abddf0eb7ebe550193fb0ba398ba364e49 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 715s git-debrebase classify 7deba4224559390e54e9ff106aa4430e0cfdb7f5 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea/0 932654abddf0eb7ebe550193fb0ba398ba364e49/0 715s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Contributor" => {"CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Differs" => 0,"Ix" => 0},"Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","SubType" => "Ambiguous","Parents" => [$VAR1->{"Contributor"},{"CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Differs" => 0,"Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","CommitId" => "7deba4224559390e54e9ff106aa4430e0cfdb7f5","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea\nparent 932654abddf0eb7ebe550193fb0ba398ba364e49\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 715s git-debrebase get_differs c59f39e5ca05d33181b7ea7f243a95d529283eb9 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x2 715s git-debrebase classify 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p c59f39e5ca05d33181b7ea7f243a95d529283eb9/0x2 715s git-debrebase = Upstream {"Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","CommitId" => "8c8e79c7272f955ef3647c415d9e5f6b34cea1ea","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent c59f39e5ca05d33181b7ea7f243a95d529283eb9\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Ix" => 0}],"Type" => "Upstream"} 715s git-debrebase get_differs 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 e874f3f715a5dbed708f53b2c9045de612dd9733 = 0x2 715s git-debrebase classify c59f39e5ca05d33181b7ea7f243a95d529283eb9 $t=e874f3f715a5dbed708f53b2c9045de612dd9733 @p 4ef2ee9b8afc55c658d79028f7b1cf47461ada38/0x2 715s git-debrebase = Upstream {"Hdr" => "tree e874f3f715a5dbed708f53b2c9045de612dd9733\nparent 4ef2ee9b8afc55c658d79028f7b1cf47461ada38\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "c59f39e5ca05d33181b7ea7f243a95d529283eb9","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Ix" => 0}],"Tree" => "e874f3f715a5dbed708f53b2c9045de612dd9733","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 715s git-debrebase get_differs fc2ef95aff332f63d93b2025328fafa4a47a6f72 467bd6c6ee0833811c04dac8591511b32de3110c = 0x2 715s git-debrebase classify 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 $t=467bd6c6ee0833811c04dac8591511b32de3110c @p fc2ef95aff332f63d93b2025328fafa4a47a6f72/0x2 715s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Tree" => "467bd6c6ee0833811c04dac8591511b32de3110c","Parents" => [{"Differs" => 2,"CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Ix" => 0}],"Type" => "Upstream","CommitId" => "4ef2ee9b8afc55c658d79028f7b1cf47461ada38","Hdr" => "tree 467bd6c6ee0833811c04dac8591511b32de3110c\nparent fc2ef95aff332f63d93b2025328fafa4a47a6f72\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000012 +0100\n"} 715s git-debrebase get_differs 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf = 0x2 715s git-debrebase classify fc2ef95aff332f63d93b2025328fafa4a47a6f72 $t=907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf @p 582e04de6ba12ec6c2a7957216152c3d4bb5b68f/0x2 715s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf","CommitId" => "fc2ef95aff332f63d93b2025328fafa4a47a6f72","Hdr" => "tree 907f61dc53b56d1b861e2762ca8fb3c9bc1cbbbf\nparent 582e04de6ba12ec6c2a7957216152c3d4bb5b68f\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000012 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f"}]} 715s git-debrebase get_differs 4003fef7726798715307fd023578bd022f3c34a4 385e14c491a1bb795f0e2f956f62e730d263ceb9 = 0x2 715s git-debrebase classify 582e04de6ba12ec6c2a7957216152c3d4bb5b68f $t=385e14c491a1bb795f0e2f956f62e730d263ceb9 @p 4003fef7726798715307fd023578bd022f3c34a4/0x2 715s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "385e14c491a1bb795f0e2f956f62e730d263ceb9","CommitId" => "582e04de6ba12ec6c2a7957216152c3d4bb5b68f","Hdr" => "tree 385e14c491a1bb795f0e2f956f62e730d263ceb9\nparent 4003fef7726798715307fd023578bd022f3c34a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 715s git-debrebase get_differs 8269bff5f8f41256a597bb494347f4bd8fc81fba 6654af700482e5111ccb9bcdc47ec2800589cc2f = 0x2 715s git-debrebase classify 4003fef7726798715307fd023578bd022f3c34a4 $t=6654af700482e5111ccb9bcdc47ec2800589cc2f @p 8269bff5f8f41256a597bb494347f4bd8fc81fba/0x2 715s git-debrebase = Upstream {"Hdr" => "tree 6654af700482e5111ccb9bcdc47ec2800589cc2f\nparent 8269bff5f8f41256a597bb494347f4bd8fc81fba\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "4003fef7726798715307fd023578bd022f3c34a4","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba"}],"Tree" => "6654af700482e5111ccb9bcdc47ec2800589cc2f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 715s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd = 0x10 715s git-debrebase classify 8269bff5f8f41256a597bb494347f4bd8fc81fba $t=4bfe6f25d76191ff31ea0345c9ec5b696e4823dd @p 274022edec808f75f2359551ecdc6de6b6390355/0x10 715s git-debrebase = Changelog {"Tree" => "4bfe6f25d76191ff31ea0345c9ec5b696e4823dd","Msg" => "Incorporate NMU\n","Hdr" => "tree 4bfe6f25d76191ff31ea0345c9ec5b696e4823dd\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000012 +0100\n","CommitId" => "8269bff5f8f41256a597bb494347f4bd8fc81fba","Parents" => [{"Ix" => 0,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Differs" => 16}],"Type" => "Changelog"} 715s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 715s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 715s git-debrebase = Packaging {"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32}],"Type" => "Packaging","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd"} 715s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 715s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 715s git-debrebase = Packaging {"Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0}]} 715s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 715s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 715s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}],"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Tree" => "894ca54a967167e2bb994b82357d084539559075","Msg" => "dch -v2.0-3 -m start 2.0-3\n"} 715s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 715s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 715s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Type" => "Changelog"} 715s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 715s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 715s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog"} 715s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 715s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 715s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 715s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 715s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 715s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 715s ' 715s ++ git rev-parse HEAD 715s + expect=7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s + exec 715s + local cid ctype info nparents 715s + read cid ctype info 715s + : ===== 7deba4224559390e54e9ff106aa4430e0cfdb7f5 Pseudomerge Contributor=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea ===== 715s + test 7deba4224559390e54e9ff106aa4430e0cfdb7f5 = 7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s + local cetype=Pseudomerge 715s + '[' xPseudomerge = xPseudomerge ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s + local 'parents=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 715s + expect='8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 715s + enparents=1 715s + : Pseudomerge/SAME '8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 715s + expect=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 715s + enparents=2 715s + git diff --quiet 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea..7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s + etypes=Upstream 715s + : 'reject pointless pseudomerges' 715s + local 'overwritten= 932654abddf0eb7ebe550193fb0ba398ba364e49' 715s + overwritten=932654abddf0eb7ebe550193fb0ba398ba364e49 715s + t-git-debrebase analyse 932654abddf0eb7ebe550193fb0ba398ba364e49 715s + local gdr=git-debrebase 715s + : ' 715s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 715s + git-debrebase --dgit=dgit -D analyse 932654abddf0eb7ebe550193fb0ba398ba364e49 715s git-debrebase *** WALK 932654abddf0eb7ebe550193fb0ba398ba364e49 1 *main::STDOUT 715s git-debrebase get_differs 7a836f53fdcff187d439fc6bb6768aa012e3bd06 f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0 715s git-debrebase get_differs d79025ae72ceb544a8c17eb58f17f7ac33e2835d f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x3a 715s git-debrebase classify 932654abddf0eb7ebe550193fb0ba398ba364e49 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p 7a836f53fdcff187d439fc6bb6768aa012e3bd06/0 d79025ae72ceb544a8c17eb58f17f7ac33e2835d/0x3a 715s git-debrebase = Pseudomerge {"Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent 7a836f53fdcff187d439fc6bb6768aa012e3bd06\nparent d79025ae72ceb544a8c17eb58f17f7ac33e2835d\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","CommitId" => "932654abddf0eb7ebe550193fb0ba398ba364e49","Msg" => "Declare incorporate NMU\n","Overwritten" => [{"Differs" => 58,"Ix" => 1,"CommitId" => "d79025ae72ceb544a8c17eb58f17f7ac33e2835d"}],"Contributor" => {"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Ix" => 0,"Differs" => 0},"Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 715s git-debrebase get_differs e1a29702bc09f17e805417c4625c85ff524a08ec f871f6b0c33fab0aea0a4d15d2f00d2ea074071b = 0x10 715s git-debrebase classify 7a836f53fdcff187d439fc6bb6768aa012e3bd06 $t=f871f6b0c33fab0aea0a4d15d2f00d2ea074071b @p e1a29702bc09f17e805417c4625c85ff524a08ec/0x10 715s git-debrebase = Changelog {"CommitId" => "7a836f53fdcff187d439fc6bb6768aa012e3bd06","Tree" => "f871f6b0c33fab0aea0a4d15d2f00d2ea074071b","Hdr" => "tree f871f6b0c33fab0aea0a4d15d2f00d2ea074071b\nparent e1a29702bc09f17e805417c4625c85ff524a08ec\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Incorporate NMU\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec"}]} 715s git-debrebase get_differs 74d5f586ed443ce47434f30fbbeff3eacb36748d 1d2249b1ed867c28303679a982049ff643d56028 = 0x2 715s git-debrebase classify e1a29702bc09f17e805417c4625c85ff524a08ec $t=1d2249b1ed867c28303679a982049ff643d56028 @p 74d5f586ed443ce47434f30fbbeff3eacb36748d/0x2 715s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 1d2249b1ed867c28303679a982049ff643d56028\nparent 74d5f586ed443ce47434f30fbbeff3eacb36748d\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "1d2249b1ed867c28303679a982049ff643d56028","CommitId" => "e1a29702bc09f17e805417c4625c85ff524a08ec","Msg" => "UPSTREAM NMU\n\n\nGbp-Pq: Name upstream-nmu.patch"} 715s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0 715s git-debrebase get_differs 964ce93fe0ce99ab711d1cb423537d236e0bbf20 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x8 715s git-debrebase classify 74d5f586ed443ce47434f30fbbeff3eacb36748d $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p 5b2d01d10ec62b3f25e6f7a22710468830e457fb/0 964ce93fe0ce99ab711d1cb423537d236e0bbf20/0x8 715s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb"},{"Differs" => 8,"Ix" => 1,"CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20"}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent 5b2d01d10ec62b3f25e6f7a22710468830e457fb\nparent 964ce93fe0ce99ab711d1cb423537d236e0bbf20\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "74d5f586ed443ce47434f30fbbeff3eacb36748d","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae"} 715s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 715s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 715s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502"}],"Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 715s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 715s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 715s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Parents" => [{"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 715s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 715s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 715s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Ix" => 0,"Differs" => 2}],"Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 715s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 715s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 715s git-debrebase = Upstream {"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7"}]} 715s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 715s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 715s git-debrebase = Upstream {"Parents" => [{"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b","Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 715s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 715s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 715s git-debrebase = Packaging {"Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Parents" => [{"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 715s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 715s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 715s git-debrebase = Packaging {"Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Type" => "Packaging","Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Differs" => 32,"Ix" => 0}]} 715s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 715s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 715s git-debrebase = Changelog {"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Tree" => "894ca54a967167e2bb994b82357d084539559075","Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v2.0-3 -m start 2.0-3\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}]} 715s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 715s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 715s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 715s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 715s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 715s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}]} 715s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 715s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 715s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 715s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 715s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 16 pm 1 715s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 715s ' 715s + local ocid otype oinfo 715s + read ocid otype oinfo 715s + case "$otype" in 715s + test xContributor=8c8e79c7272f955ef3647c415d9e5f6b34cea1ea '!=' xContributor=7a836f53fdcff187d439fc6bb6768aa012e3bd06 715s ++ printf %s '8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 932654abddf0eb7ebe550193fb0ba398ba364e49' 715s ++ wc -w 715s + local cnparents=2 715s + test 2 = 2 715s ++ for f in $parents 715s ++ echo 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 715s ++ for f in $parents 715s ++ echo 932654abddf0eb7ebe550193fb0ba398ba364e49 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=2 715s + test 2 = 2 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea Upstream ===== 715s + test 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea = 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 8c8e79c7272f955ef3647c415d9e5f6b34cea1ea 715s + local parents=c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s + expect=c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s + enparents=1 715s + : Upstream/SAME c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== c59f39e5ca05d33181b7ea7f243a95d529283eb9 Upstream ===== 715s + test c59f39e5ca05d33181b7ea7f243a95d529283eb9 = c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P c59f39e5ca05d33181b7ea7f243a95d529283eb9 715s + local parents=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s + expect=4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s + enparents=1 715s + : Upstream/SAME 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 Upstream ===== 715s + test 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 = 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 4ef2ee9b8afc55c658d79028f7b1cf47461ada38 715s + local parents=fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s + expect=fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s + enparents=1 715s + : Upstream/SAME fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== fc2ef95aff332f63d93b2025328fafa4a47a6f72 Upstream ===== 715s + test fc2ef95aff332f63d93b2025328fafa4a47a6f72 = fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P fc2ef95aff332f63d93b2025328fafa4a47a6f72 715s + local parents=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s + expect=582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s + enparents=1 715s + : Upstream/SAME 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 582e04de6ba12ec6c2a7957216152c3d4bb5b68f Upstream ===== 715s + test 582e04de6ba12ec6c2a7957216152c3d4bb5b68f = 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 582e04de6ba12ec6c2a7957216152c3d4bb5b68f 715s + local parents=4003fef7726798715307fd023578bd022f3c34a4 715s + expect=4003fef7726798715307fd023578bd022f3c34a4 715s + enparents=1 715s + : Upstream/SAME 4003fef7726798715307fd023578bd022f3c34a4 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s 4003fef7726798715307fd023578bd022f3c34a4 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 4003fef7726798715307fd023578bd022f3c34a4 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 4003fef7726798715307fd023578bd022f3c34a4 Upstream ===== 715s + test 4003fef7726798715307fd023578bd022f3c34a4 = 4003fef7726798715307fd023578bd022f3c34a4 715s + local cetype=Upstream 715s + '[' xUpstream = xUpstream ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 4003fef7726798715307fd023578bd022f3c34a4 715s + local parents=8269bff5f8f41256a597bb494347f4bd8fc81fba 715s + expect=8269bff5f8f41256a597bb494347f4bd8fc81fba 715s + enparents=1 715s + : Upstream/SAME 8269bff5f8f41256a597bb494347f4bd8fc81fba 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s ++ printf %s 8269bff5f8f41256a597bb494347f4bd8fc81fba 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 8269bff5f8f41256a597bb494347f4bd8fc81fba 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 8269bff5f8f41256a597bb494347f4bd8fc81fba Changelog ===== 715s + test 8269bff5f8f41256a597bb494347f4bd8fc81fba = 8269bff5f8f41256a597bb494347f4bd8fc81fba 715s + local cetype=Upstream 715s + '[' xChangelog = xUpstream ']' 715s ++ git log -n1 --pretty=format:%P 8269bff5f8f41256a597bb494347f4bd8fc81fba 715s + local parents=274022edec808f75f2359551ecdc6de6b6390355 715s + expect=274022edec808f75f2359551ecdc6de6b6390355 715s + enparents=1 715s + : Changelog/Upstream 274022edec808f75f2359551ecdc6de6b6390355 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + '[' x '!=' x ']' 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet 274022edec808f75f2359551ecdc6de6b6390355..8269bff5f8f41256a597bb494347f4bd8fc81fba -- :. ':!debian/changelog' 715s + etypes=Packaging 715s ++ printf %s 274022edec808f75f2359551ecdc6de6b6390355 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 274022edec808f75f2359551ecdc6de6b6390355 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 274022edec808f75f2359551ecdc6de6b6390355 Packaging ===== 715s + test 274022edec808f75f2359551ecdc6de6b6390355 = 274022edec808f75f2359551ecdc6de6b6390355 715s + local cetype=Packaging 715s + '[' xPackaging = xPackaging ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 274022edec808f75f2359551ecdc6de6b6390355 715s + local parents=66623ad57ce32197ca515cfa520eaf7d7746889d 715s + expect=66623ad57ce32197ca515cfa520eaf7d7746889d 715s + enparents=1 715s + : Packaging/SAME 66623ad57ce32197ca515cfa520eaf7d7746889d 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :. ':!debian' 715s + git diff --quiet 66623ad57ce32197ca515cfa520eaf7d7746889d..274022edec808f75f2359551ecdc6de6b6390355 -- :debian/patches 715s + etypes=Packaging 715s ++ printf %s 66623ad57ce32197ca515cfa520eaf7d7746889d 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 66623ad57ce32197ca515cfa520eaf7d7746889d 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 66623ad57ce32197ca515cfa520eaf7d7746889d Packaging ===== 715s + test 66623ad57ce32197ca515cfa520eaf7d7746889d = 66623ad57ce32197ca515cfa520eaf7d7746889d 715s + local cetype=Packaging 715s + '[' xPackaging = xPackaging ']' 715s + cetype=SAME 715s ++ git log -n1 --pretty=format:%P 66623ad57ce32197ca515cfa520eaf7d7746889d 715s + local parents=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s + expect=d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s + enparents=1 715s + : Packaging/SAME d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :. ':!debian' 715s + git diff --quiet d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a..66623ad57ce32197ca515cfa520eaf7d7746889d -- :debian/patches 715s + etypes=Packaging 715s ++ printf %s d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a Changelog ===== 715s + test d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a = d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s + local cetype=Packaging 715s + '[' xChangelog = xPackaging ']' 715s ++ git log -n1 --pretty=format:%P d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a 715s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 715s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 715s + enparents=1 715s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a -- :. ':!debian/changelog' 715s + etypes=Packaging 715s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 715s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 715s + local cetype=Packaging 715s + '[' xChangelog = xPackaging ']' 715s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 715s + local parents=9214201f528bae71f4647709e2357407746739d5 715s + expect=9214201f528bae71f4647709e2357407746739d5 715s + enparents=1 715s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 715s + etypes=Packaging 715s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 9214201f528bae71f4647709e2357407746739d5 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 715s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 715s + local cetype=Packaging 715s + '[' xChangelog = xPackaging ']' 715s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 715s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s + enparents=1 715s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 715s + etypes=Packaging 715s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s ++ wc -w 715s + local cnparents=1 715s + test 1 = 1 715s ++ for f in $parents 715s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s ++ wc -w 715s ++ t-sort -u 715s ++ LC_COLLATE=C 715s ++ sort -u 715s + local cndparents=1 715s + test 1 = 1 715s + case "$parents" in 715s + case "$ctype" in 715s + read cid ctype info 715s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 715s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s + local cetype=Packaging 715s + '[' xAnchor = xPackaging ']' 715s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 715s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 715s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 715s + enparents=1 715s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 715s + case "$ctype/$cetype" in 715s + case "$ctype/$etypes" in 715s + case "$cetype" in 715s + case "$ctype" in 715s + break 715s + t-nmu-reconciled-good patch-queue/nmu 715s + local nmutree=patch-queue/nmu 715s + : 'check that what we have is what is expected' 715s + git checkout -b compare.nmu origin/master~0 715s Switched to a new branch 'compare.nmu' 715s + git checkout patch-queue/nmu . 715s Updated 4 paths from 1aabced 715s + git rm -rf debian/patches 715s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 715s rm 'debian/patches/0002-Edit-the-.c-file.patch' 715s rm 'debian/patches/series' 715s rm 'debian/patches/subdir/addnewups' 715s rm 'debian/patches/upstream-nmu.patch' 715s + git commit -m 'rm patches nmu' 715s [compare.nmu 6caba01] rm patches nmu 715s 6 files changed, 7 insertions(+), 50 deletions(-) 715s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 715s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 715s delete mode 100644 debian/patches/series 715s delete mode 100644 debian/patches/subdir/addnewups 715s create mode 100644 newsrc.c 715s + git checkout -b compare.maintainer origin/master~0 715s Switched to a new branch 'compare.maintainer' 715s + git checkout did.maintainer . 715s Updated 3 paths from 27ebb24 715s + git rm -rf --ignore-unmatch debian/patches 715s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 715s rm 'debian/patches/0002-Edit-the-.c-file.patch' 715s rm 'debian/patches/series' 715s rm 'debian/patches/subdir/addnewups' 715s + git commit --allow-empty -m 'rm patches maintainer' 715s [compare.maintainer c88a69a] rm patches maintainer 715s 7 files changed, 10 insertions(+), 50 deletions(-) 715s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 715s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 715s delete mode 100644 debian/patches/series 715s delete mode 100644 debian/patches/subdir/addnewups 715s create mode 100644 debian/zorkmid 715s + git merge compare.nmu 715s Auto-merging debian/changelog 715s Merge made by the 'ort' strategy. 715s debian/changelog | 6 ++++++ 715s newsrc.c | 1 + 715s 2 files changed, 7 insertions(+) 715s create mode 100644 newsrc.c 715s + git diff --quiet master 715s + : 'check that dgit still likes it' 715s + git checkout master 715s Switched to branch 'master' 715s Your branch is ahead of 'origin/master' by 34 commits. 715s (use "git push" to publish your local commits) 715s + t-dgit -wgf quilt-fixup 715s + local dgit=dgit 715s + pwd 715s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 715s + : ' 715s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 715s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 715s | git rev-parse --show-toplevel 715s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 715s | git config -z --get-regexp --local '.*' 715s | git config -z --get-regexp --local '.*' 715s | git config -z --get-regexp --global '.*' 715s | git config -z --get-regexp --system '.*' 715s format 3.0 (quilt), quilt mode linear 715s Format `3.0 (quilt)', need to check/update patch stack 715s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 715s => `' 715s + git diff --quiet HEAD 715s + git clean -xdff 715s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 715s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 715s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 715s | git rev-parse 'HEAD~0' 715s => `7deba4224559390e54e9ff106aa4430e0cfdb7f5' 715s | git symbolic-ref -q HEAD 715s => `refs/heads/master' 715s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 715s CD work 715s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 715s + git reset -q --hard 7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s examining quilt state (multiple patches, linear mode) 715s branch_is_gdr 7deba4224559390e54e9ff106aa4430e0cfdb7f5... 715s branch_is_gdr 7deba4224559390e54e9ff106aa4430e0cfdb7f5 gdr pseudomerge YES 715s + git reset -q --hard 7deba4224559390e54e9ff106aa4430e0cfdb7f5 715s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 716s HEAD is now at 091cf23 Commit patch queue (exported by git-debrebase) 716s | git rev-parse 'HEAD~0' 716s => `091cf23aab21aa2a8354372e5d3a8ac55110b6cf' 716s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 716s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 716s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 716s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 716s CD fake 716s | find -name .git -prune -print0 716s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 716s + git checkout -f 091cf23aab21aa2a8354372e5d3a8ac55110b6cf -- debian 716s + git add -Af . 716s | git write-tree 716s => `0b28429abd365b6b1dc4894b505211f99ac804dc' 716s fake orig tree object 0b28429abd365b6b1dc4894b505211f99ac804dc 716s CD .. 716s + git reset -q --hard 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 716s CD ../fake 716s + git add -Af . 716s | git write-tree 716s => `bf3cc2d56f9816f228473395e6195b49676a47f4' 716s fake o+d/p tree object 0b28429abd365b6b1dc4894b505211f99ac804dc 716s CD ../work 716s | git ls-tree --name-only -z 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 716s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 716s | git diff-tree -z --no-renames -r 0b28429abd365b6b1dc4894b505211f99ac804dc 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 716s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:000000 100644 0000000000000000000000000000000000000000 20f7624364ec18735d627fc84c64fce3dee6115b A\x00newsrc.c\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 27e8e51c7f66da756b386ed5ebb1d42aef75fbc3 M\x00src.c\x00' 716s quiltify_trees_differ 0b28429abd365b6b1dc4894b505211f99ac804dc 091cf23aab21aa2a8354372e5d3a8ac55110b6cf => 1 716s | git diff-tree -z --no-renames --name-only -r 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 716s => `' 716s quiltify_trees_differ 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 => 0 716s | git diff-tree -z --no-renames --name-only -r 0b28429abd365b6b1dc4894b505211f99ac804dc bf3cc2d56f9816f228473395e6195b49676a47f4 716s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 716s quiltify_trees_differ 0b28429abd365b6b1dc4894b505211f99ac804dc bf3cc2d56f9816f228473395e6195b49676a47f4 => 1 716s differences @dl ## ## == == == ==. 716s dgit: base trees orig=0b28429abd365b6b1dc4 o+d/p=bf3cc2d56f9816f22847 716s dgit: quilt differences: src: ## orig ## gitignores: == orig == 716s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 716s starting quiltify (multiple patches, linear mode) 716s | git ls-tree --name-only 091cf23aab21aa2a8354372e5d3a8ac55110b6cf -- debian/rules debian/control 716s => `debian/control'... 716s quiltify investigate 091cf23aab21aa2a8354372e5d3a8ac55110b6cf 716s | git diff-tree -z --no-renames --name-only 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 716s => `' 716s quiltify_trees_differ 091cf23aab21aa2a8354372e5d3a8ac55110b6cf bf3cc2d56f9816f228473395e6195b49676a47f4 => 0 716s search finished hooray! 716s quiltify linearisation planning successful, executing... 716s + git checkout -q master 716s | git status --ignored --porcelain 716s => `?? .pc/' 716s nothing quilty to commit, ok. 716s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 716s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 716s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 716s ' 716s + t-ok 716s + : ======================================== 716s + t-check-only-bpd 716s + '[' .. = .. ']' 716s + return 716s + t-fscks 716s + shopt -s nullglob 716s + for d in $tmp/*/.git $tmp/git/*.git 716s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 716s + t-git-fsck 716s ++ git rev-parse --git-dir 716s + local fsckerrs=.git/dgit-test-fsck.errs 716s + set +e 716s + LC_MESSAGES=C 716s + git fsck --no-dangling --strict 716s + tee .git/dgit-test-fsck.errs 716s + ps='0 0' 716s + set -e 716s + local pats 716s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 716s + test '0 0' = '0 0' 716s + pats+=(-e 'notice: HEAD points to an unborn branch') 716s + pats+=(-e 'notice: No default references') 716s + set +e 716s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 716s + rc=1 716s + set -e 716s + case $rc in 716s + for d in $tmp/*/.git $tmp/git/*.git 716s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 716s + t-git-fsck 716s ++ git rev-parse --git-dir 716s + local fsckerrs=./dgit-test-fsck.errs 716s + set +e 716s + LC_MESSAGES=C 716s + git fsck --no-dangling --strict 716s + tee ./dgit-test-fsck.errs 716s notice: HEAD points to an unborn branch (master) 716s + ps='0 0' 716s + set -e 716s + local pats 716s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 716s + test '0 0' = '0 0' 716s + pats+=(-e 'notice: HEAD points to an unborn branch') 716s + pats+=(-e 'notice: No default references') 716s + set +e 716s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 716s + rc=1 716s + set -e 716s + case $rc in 716s + t-save-artifacts 716s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts 716s + '[' x/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts = x ']' 716s + '[' xtmp = x ']' 716s + GZIP=-1v 716s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-artifacts/gdr-diverge-nmu.tar.gz '--exclude=*.tar' . 716s gzip: warning: GZIP environment variable is deprecated; use an alias or script 716s 80.3% 716s + echo ok. 716s ok. 716s + rc=0 716s + set +x 716s + set +e 716s + pwd 716s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 716s + '[' x '!=' x ']' 716s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 716s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 716s + set -e 716s + test 0 = 0 716s autopkgtest [12:30:10]: test gdr-diverge-nmu: -----------------------] 717s gdr-diverge-nmu PASS 717s autopkgtest [12:30:11]: test gdr-diverge-nmu: - - - - - - - - - - results - - - - - - - - - - 717s autopkgtest [12:30:11]: test gdr-diverge-nmu-dgit: preparing testbed 717s Reading package lists... 717s Building dependency tree... 717s Reading state information... 717s Starting pkgProblemResolver with broken count: 0 718s Starting 2 pkgProblemResolver with broken count: 0 718s Done 718s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 718s autopkgtest [12:30:12]: test gdr-diverge-nmu-dgit: [----------------------- 718s ++ set -o pipefail 718s ++ . tests/lib-core 718s ++ . tests/lib-restricts 718s ++ trap ' 718s rc=$? 718s set +x 718s test $rc = 0 || echo " 718s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 718s 718s Most relevant logs are just before assignment rc=$rc 718s Will now do cleanup etc. 718s " 718s set -x 718s set +e 718s pwd 718s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 718s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 718s set -e 718s test $rc = 0 || t-report-failure 718s ' EXIT 718s ++ t-filter-out-git-hyphen-dir 718s ++ local pathent 718s +++ type -p git-rev-parse 718s +++ : 718s ++ pathent= 718s ++ case "$pathent" in 718s ++ return 718s ++ t-set-intree 718s ++ '[' x = x ']' 718s ++ return 718s ++ : -D 718s ++ export DGIT_TEST_DEBUG 718s ++ : x 718s ++ export DGIT_TEST_DEBPUSH_DEBUG 718s ++ : 718s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 718s ++ GIT_COMMITTER_DATE='1530000000 +0100' 718s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 718s ++ GIT_AUTHOR_DATE='1530000000 +0100' 718s ++ export LC_CTYPE=C.UTF-8 718s ++ LC_CTYPE=C.UTF-8 718s ++ unset CDPATH 718s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 718s ++ FILTER_BRANCH_SQUELCH_WARNING=1 718s +++ pwd 718s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 718s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ testname=gdr-diverge-nmu-dgit 718s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ bpd=.. 718s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 718s ++ '[' x '!=' x ']' 718s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s +++ pwd 718s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ t-set-using-tmp 718s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 718s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 718s ++ export 'DEBFULLNAME=dgit test git user' 718s ++ DEBFULLNAME='dgit test git user' 718s ++ git config --global user.email dgit-test@debian.example.net 718s ++ git config --global user.name 'dgit test git user' 718s ++ git config --global protocol.ext.allow always 718s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 718s ++ env -0 718s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 718s ++ export DEBCHANGE_VENDOR=dpkg 718s ++ DEBCHANGE_VENDOR=dpkg 718s ++ unset VISUAL 718s ++ unset GIT_EDITOR 718s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 718s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 718s ++ cat 718s ++ schroot=build 718s ++ : aq 718s ++ : archive/test-dummy 718s ++ : sid:unstable 718s ++ t-git-config dgit.default.old-dsc-distro test-dummy 718s ++ git config --global dgit.default.old-dsc-distro test-dummy 718s ++ for import in ${autoimport-gnupg} 718s ++ case "$0" in 718s ++ t-setup-import gnupg 718s ++ local setupname=gnupg 718s ++ local setupsrc 718s ++ local lock 718s ++ '[' x = x ']' 718s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 718s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 718s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 718s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 718s cd "$1"; shift 718s setupname="$1"; shift 718s simport="$1"; shift 718s if [ -e "$simport" ]; then exit 0; fi 718s env - "$@" \ 718s "tests/setup/$setupname" 718s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 718s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 718s + shift 718s + setupname=gnupg 718s + shift 718s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 718s + shift 718s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 718s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-diverge-nmu-dgit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-diverge-nmu-dgit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 718s ++ set -o pipefail 718s ++ . tests/lib-core 718s ++ . tests/lib-restricts 718s ++ trap ' 718s rc=$? 718s set +x 718s test $rc = 0 || echo " 718s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 718s 718s Most relevant logs are just before assignment rc=$rc 718s Will now do cleanup etc. 718s " 718s set -x 718s set +e 718s pwd 718s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 718s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 718s set -e 718s test $rc = 0 || t-report-failure 718s ' EXIT 718s ++ t-filter-out-git-hyphen-dir 718s ++ local pathent 718s +++ type -p git-rev-parse 718s +++ : 718s ++ pathent= 718s ++ case "$pathent" in 718s ++ return 718s ++ t-set-intree 718s ++ '[' x = x ']' 718s ++ return 718s ++ : -D 718s ++ export DGIT_TEST_DEBUG 718s ++ : x 718s ++ export DGIT_TEST_DEBPUSH_DEBUG 718s ++ : 718s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 718s ++ GIT_COMMITTER_DATE='1530000000 +0100' 718s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 718s ++ GIT_AUTHOR_DATE='1530000000 +0100' 718s ++ export LC_CTYPE=C.UTF-8 718s ++ LC_CTYPE=C.UTF-8 718s ++ unset CDPATH 718s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 718s ++ FILTER_BRANCH_SQUELCH_WARNING=1 718s +++ pwd 718s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 718s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ testname=gnupg 718s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 718s ++ bpd=.. 718s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 718s ++ '[' x '!=' x ']' 718s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s +++ pwd 718s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ t-set-using-tmp 718s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 718s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 718s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 718s ++ export 'DEBFULLNAME=dgit test git user' 718s ++ DEBFULLNAME='dgit test git user' 718s ++ git config --global user.email dgit-test@debian.example.net 718s ++ git config --global user.name 'dgit test git user' 718s ++ git config --global protocol.ext.allow always 718s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 718s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 718s ++ export DEBCHANGE_VENDOR=dpkg 718s ++ DEBCHANGE_VENDOR=dpkg 718s ++ unset VISUAL 718s ++ unset GIT_EDITOR 718s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 718s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 718s ++ cat 718s ++ schroot=build 718s ++ : aq 718s ++ : archive/test-dummy 718s ++ : sid:unstable 718s ++ t-git-config dgit.default.old-dsc-distro test-dummy 718s ++ git config --global dgit.default.old-dsc-distro test-dummy 718s ++ for import in ${autoimport-gnupg} 718s ++ case "$0" in 718s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 718s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 718s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 718s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 718s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 718s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 718s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 718s + setup=' 718s export GNUPGHOME=$tmp/gnupg 718s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 718s 718s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 718s ssb rsa2048 2013-11-17 [E] 718s 718s sec rsa2048 2014-01-26 [SC] 718s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 718s uid [ultimate] Populus Romanus (test key) 718s ssb rsa2048 2014-01-26 [E] 718s 718s sec rsa2048 2014-01-26 [SC] 718s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 718s uid [ unknown] Hannibal (test key) 718s ssb rsa2048 2014-01-26 [E] 718s 718s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 718s export GNUPGHOME=$tmp/gnupg 718s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 718s 718s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 719s delete mode 100644 debian/source/format 719s + git tag v1.0 719s + : 'fake up that our quilt-tip was descended from upstream' 719s + git checkout quilt-tip 719s Switched to branch 'quilt-tip' 719s + git merge --no-edit -s ours upstream 719s Merge made by the 'ours' strategy. 719s + : 'fake up that our quilt-tip had the patch queue in it' 719s + git checkout patch-queue/quilt-tip 719s Switched to branch 'patch-queue/quilt-tip' 719s + gbp pq export 719s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 719s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 719s + git add debian/patches 719s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 719s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 719s 4 files changed, 50 insertions(+) 719s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 719s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 719s create mode 100644 debian/patches/series 719s create mode 100644 debian/patches/subdir/addnewups 719s + : 'make branch names more conventional' 719s + git branch -D master 719s Deleted branch master (was 17d67db). 719s + git branch -m quilt-tip master 719s + not-gdr-processable origin 719s + git branch gdr-unprocessable/origin 719s + t-git-debrebase analyse 719s + local gdr=git-debrebase 719s + : ' 719s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 719s + git-debrebase --dgit=dgit -D analyse 719s + grep 'Unknown Unprocessable' 719s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 719s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 719s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 719s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 719s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 719s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 719s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 719s git-debrebase = Pseudomerge {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1,"Differs" => 48}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Msg" => "Merge branch 'upstream' into quilt-tip\n","Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0]} 719s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 719s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 719s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}]} 719s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 719s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 719s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "Mixed","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 719s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 719s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 719s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging"} 719s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 719s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 719s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 719s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 719s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 719s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}]} 719s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 719s git-debrebase ** Unknown 719s git-debrebase *** WALK BOMB unrecognised 719s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 719s ' 719s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 719s + : 'fake up an upstream 2.0' 719s + git branch make-upstream upstream 719s + t-make-new-upstream-tarball 2.0 719s + local uv=2.0 719s + git checkout make-upstream 719s Switched to branch 'make-upstream' 719s + echo 'upstream 2.0' 719s + git commit -a -m 'upstream 2.0 tarball' 719s [make-upstream 4db56a8] upstream 2.0 tarball 719s 1 file changed, 1 insertion(+) 719s + t-make-orig example 2.0 make-upstream 719s + local p=example 719s + local v=2.0 719s + local tag=make-upstream 719s + ust=example_2.0.orig.tar.gz 719s + GZIP=-1 719s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 719s gzip: warning: GZIP environment variable is deprecated; use an alias or script 719s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 719s + git branch -D quilt-tip-2 719s Deleted branch quilt-tip-2 (was 99fcab4). 719s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 719s + git branch -D gitish-only 719s Deleted branch gitish-only (was 2b2ddc8). 719s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 719s + git branch -D quilt-tip-1.1 719s Deleted branch quilt-tip-1.1 (was 7fc34be). 719s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 719s + git branch -D patch-queue/quilt-tip 719s Deleted branch patch-queue/quilt-tip (was d843a68). 719s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 719s + git branch -D indep-arch 719s Deleted branch indep-arch (was e215729). 719s + : 'see what gbp import-orig does' 719s + git checkout master 719s Switched to branch 'master' 719s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 719s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 719s gbp:info: Source package is example 719s gbp:info: Upstream version is 2.0 719s gbp:info: Replacing upstream source on 'master' 719s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 719s + not-gdr-processable merge 719s + git branch gdr-unprocessable/merge 719s + t-git-debrebase analyse 719s + local gdr=git-debrebase 719s + : ' 719s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 719s + git-debrebase --dgit=dgit -D analyse 719s + grep 'Unknown Unprocessable' 719s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 719s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 719s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 719s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 719s git-debrebase ** Unknown 719s git-debrebase *** WALK BOMB unrecognised 719s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 719s ' 719s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 719s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 719s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 719s + DEBEMAIL=dgit-tests@example.org 719s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 719s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 719s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 719s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 719s 1 file changed, 6 insertions(+) 719s + t-dch-commit-r 719s + t-dch-r-rune t-dch-commit 719s + local cmd=t-dch-commit 719s + shift 719s + local suite=unstable 719s + t-dch-commit -r -D unstable '' 719s + t-debchange -r -D unstable '' 719s + DEBEMAIL=dgit-tests@example.org 719s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 719s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 719s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 719s libdistro-info-perl is not installed, Debian release names are not known. 719s libdistro-info-perl is not installed, Ubuntu release names are not known. 719s + git commit -m 'dch -r -D unstable ' debian/changelog 719s [master f31021f] dch -r -D unstable 719s 1 file changed, 3 insertions(+), 2 deletions(-) 719s + echo garbage 719s + git add debian/patches/garbage 719s + git commit -m 'add garbage' debian/patches/garbage 719s [master eb10718] add garbage 719s 1 file changed, 1 insertion(+) 719s create mode 100644 debian/patches/garbage 719s + t-archive-none example 719s + t-select-package example 719s + p=example 719s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 719s + t-archive-none-aq 719s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 719s + : 719s + local 'jsondelim=[' 719s + local suitespec 719s + for suitespec in $suitespecs 719s + local suite=sid 719s + local sname=unstable 719s + t-aq-archive-updated sid example 719s + local suite=sid 719s + local p=example 719s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 719s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 719s + perl -wne ' 719s use JSON; 719s use strict; 719s our @v; 719s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 719s push @v, { 719s "version" => "$1", 719s "sha256sum" => "$2", 719s "component" => "$3", 719s "filename" => "$4", 719s }; 719s END { 719s my $json = JSON->new->canonical(); 719s print $json->encode(\@v) or die $!; 719s } 719s ' 719s + t-aq-archive-updated new example 719s + local suite=new 719s + local p=example 719s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 719s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 719s + perl -wne ' 719s use JSON; 719s use strict; 719s our @v; 719s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 719s push @v, { 719s "version" => "$1", 719s "sha256sum" => "$2", 719s "component" => "$3", 719s "filename" => "$4", 719s }; 719s END { 719s my $json = JSON->new->canonical(); 719s print $json->encode(\@v) or die $!; 719s } 719s ' 719s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 719s + cat 719s + jsondelim=' },' 719s + cat 719s + t-git-none 719s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 719s + set -e 719s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 719s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 719s + t-dgit -wgf --gbp push-source --new 719s + local dgit=dgit 719s + pwd 719s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 719s + : ' 719s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 719s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 719s | git rev-parse --show-toplevel 719s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 719s | git config -z --get-regexp --local '.*' 719s | git config -z --get-regexp --local '.*' 719s | git config -z --get-regexp --global '.*' 719s | git config -z --get-regexp --system '.*' 719s format 3.0 (quilt), quilt mode gbp 719s Format `3.0 (quilt)', need to check/update patch stack 719s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 719s => `' 719s + git diff --quiet HEAD 719s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 719s canonical suite name for unstable is sid 719s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 719s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 719s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 719s | git rev-parse 'HEAD~0' 719s => `eb10718ab213ccfa83613ebbddefbffda941a548' 719s | git symbolic-ref -q HEAD 719s => `refs/heads/master' 719s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 719s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 719s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 719s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 719s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 719s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - d656f81c628d8dfd953be35eccaa6aac3a869db5afb435c0bedf18bab7731b9f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 719s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 719s >(no reflog) 719s splitbrain cache miss 719s CD work 719s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 719s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 719s + git checkout -q -b dgit-view 719s examining quilt state (multiple patches, gbp mode) 719s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 720s CD fake 720s | find -name .git -prune -print0 720s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 720s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 720s + git add -Af . 720s | git write-tree 720s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 720s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 720s CD .. 720s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 720s CD ../fake 720s + git add -Af . 720s | git write-tree 720s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 720s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 720s CD ../work 720s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 720s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 720s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 720s => `' 720s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 720s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 720s => `lib.c\x00new-upstream-file\x00src.c\x00' 720s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 720s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 720s => `lib.c\x00new-upstream-file\x00src.c\x00' 720s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 720s differences @dl == ## ## == == ==. 720s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 720s dgit: quilt differences: src: == orig ## gitignores: == orig == 720s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 720s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 720s => `1530000000 +0000' 720s dgit view: creating patches-applied version using gbp pq 720s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 720s + git update-ref refs/heads/dgit-view HEAD 720s + git checkout -q dgit-view 720s | git rev-parse 'HEAD~0' 720s => `45ea71a69fa522ce760afdab8a420200443753e9' 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 720s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 720s => `' 720s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - d656f81c628d8dfd953be35eccaa6aac3a869db5afb435c0bedf18bab7731b9f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 720s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 720s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 720s | git rev-parse 'HEAD~0' 720s => `eb10718ab213ccfa83613ebbddefbffda941a548' 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 720s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 720s dpkg-source: info: using source format '3.0 (quilt)' 720s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 720s dpkg-source: info: using patch list from debian/patches/series 720s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 720s dpkg-source: info: building example in example_2.0-1.dsc 720s CD work 720s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 720s package seems new, not specifying -v 720s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 720s dpkg-genchanges: info: not including original source code in upload 720s CD .. 720s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 720s renaming (Files) example_2.0.orig.tar.gz 720s renaming (Files) example_2.0-1.debian.tar.xz 720s renaming (dsc) example_2.0-1.dsc 720s renaming (changes) example_2.0-1_source.changes 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 720s actually entering push 720s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 720s => `0' 720s + git config remote.dgit.skipdefaultupdate true 720s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 720s get_archive_dsc: nothing in archive, returning undef 720s no version available from the archive 720s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 720s => `' 720s previous reference hash= 720s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 720s => `' 720s fetch_from_archive: lastfetch= 720s nothing found! 720s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 720s + git check-ref-format archive/test-dummy/2.0-1 720s | git symbolic-ref -q HEAD 720s => `refs/heads/master' 720s | git rev-parse 'HEAD~0' 720s => `eb10718ab213ccfa83613ebbddefbffda941a548' 720s ffq_prev_branchinfo branch current refs/heads/master 720s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 720s => `' 720s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 720s => `' 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 720s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 720s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 720s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 720s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 720s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - d656f81c628d8dfd953be35eccaa6aac3a869db5afb435c0bedf18bab7731b9f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 720s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 720s CD work 720s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 720s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 720s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 720s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 720s splitbrain_pseudomerge... 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 720s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 720s => `' 720s + git diff --quiet HEAD 720s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 720s => `' 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 720s checking that example_2.0-1.dsc corresponds to HEAD 720s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 720s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 720s dpkg-source: info: extracting example in example-2.0 720s dpkg-source: info: unpacking example_2.0.orig.tar.gz 720s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 720s dpkg-source: info: using patch list from debian/patches/series 720s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 720s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 720s dpkg-source: info: applying subdir/addnewups 720s CD example-2.0 720s | find -name .git -prune -print0 720s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 720s + git add -Af . 720s | git write-tree 720s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 720s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 720s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 720s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 720s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 720s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 720s files_compare_inputs example_2.0-1.dsc 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 720s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 720s files_compare_inputs example_2.0-1.dsc Files 720s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 720s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 720s files_compare_inputs example_2.0-1_source.changes 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 720s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 720s files_compare_inputs example_2.0-1_source.changes Files 720s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 720s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 720s checking origs needed (2.0)... 720s checking origs needed placement 'devel extra'... 720s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 720s origs example_2.0.orig.tar.gz is_orig 720s -| sh -ec 'cd "$1"; shift 720s 720s find -name "$1" -print0 | 720s xargs -0r sha256sum 720s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 720s origs example_2.0.orig.tar.gz $#$have=-1 720s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 720s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 720s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 720s push_tagwants: $VAR1 = [ 720s '2.0-1', 720s '45ea71a69fa522ce760afdab8a420200443753e9', 720s 'eb10718ab213ccfa83613ebbddefbffda941a548', 720s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 720s ]; 720s $VAR2 = [ 720s { 720s 'Tfn' => sub { "DUMMY" }, 720s 'TfSuffix' => '', 720s 'TagFn' => sub { "DUMMY" }, 720s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 720s 'View' => 'dgit', 720s 'Tag' => 'archive/test-dummy/2.0-1' 720s }, 720s { 720s 'Tfn' => sub { "DUMMY" }, 720s 'TfSuffix' => '-maintview', 720s 'View' => 'maint', 720s 'Tag' => 'test-dummy/2.0-1', 720s 'TagFn' => sub { "DUMMY" }, 720s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548' 720s } 720s ]; 720s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 720s => `1530000000 +0000' 720s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 720s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 720s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 720s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 720s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 720s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 720s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 720s => `5562a727642ddb44984dc445491cc555aff57e3a' 720s + git verify-tag 5562a727642ddb44984dc445491cc555aff57e3a 720s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 720s gpg: Signature made Mon Mar 31 12:30:14 2025 UTC 720s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 720s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 720s gpg: WARNING: This key is not certified with a trusted signature! 720s gpg: There is no indication that the signature belongs to the owner. 720s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 720s + git update-ref refs/tags/archive/test-dummy/2.0-1 5562a727642ddb44984dc445491cc555aff57e3a 720s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 720s => `d436cfd4171093e37c6f84f60ebb7ad387293b21' 720s + git verify-tag d436cfd4171093e37c6f84f60ebb7ad387293b21 720s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 720s gpg: Signature made Mon Mar 31 12:30:14 2025 UTC 720s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 720s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 720s gpg: WARNING: This key is not certified with a trusted signature! 720s gpg: There is no indication that the signature belongs to the owner. 720s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 720s + git update-ref refs/tags/test-dummy/2.0-1 d436cfd4171093e37c6f84f60ebb7ad387293b21 720s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 720s => `0' 720s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 720s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 720s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 720s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 720s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 720s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 720s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 720s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 720s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 721s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 721s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 721s 721s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 721s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 721s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 721s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 721s 721s Successfully signed dsc, changes files 721s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 721s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 721s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 721s D: Setting host argument. 721s Checking signature on .changes 721s Checking signature on .dsc 721s Uploading to test-dummy (via local to localhost): 721s Successfully uploaded packages. 721s dgit ok: pushed and uploaded 2.0-1 721s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 721s del_lrfetchrefs... 721s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 721s ' 721s + t-salsa-add-remote 721s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 721s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 721s + set -e 721s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 721s + git init --bare 721s hint: Using 'master' as the name for the initial branch. This default branch name 721s hint: is subject to change. To configure the initial branch name to use in all 721s hint: of your new repositories, which will suppress this warning, call: 721s hint: 721s hint: git config --global init.defaultBranch 721s hint: 721s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 721s hint: 'development'. The just-created branch can be renamed via this command: 721s hint: 721s hint: git branch -m 721s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 721s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 721s + git push --set-upstream origin master 721s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 721s * [new branch] master -> master 721s Branch 'master' set up to track remote branch 'master' from 'origin'. 721s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 721s + local 'mpat=E:identical in upstream files' 721s + shift 721s + set +o pipefail 721s + LC_MESSAGES=C 721s + LANGUAGE=C 721s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 721s + local gdr=git-debrebase 721s + : ' 721s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 721s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 721s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 721s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 721s docs/README | 1 + 721s 1 file changed, 1 insertion(+) 721s 721s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 721s git-debrebase: identical in upstream files. See diffstat above, or run 721s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 721s + local 'ps=255 0' 721s + set -o pipefail 721s + case $ps in 721s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + local 'mpat=E:identical in upstream files' 721s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + local grepper=fgrep 721s + case "$mpat" in 721s + case "$mpat" in 721s + grepper=egrep 721s + mpat='identical in upstream files' 721s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s git-debrebase: identical in upstream files. See diffstat above, or run 721s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 721s + local 'mpat=E:Unused patch file garbage will be discarded' 721s + shift 721s + set +o pipefail 721s + LC_MESSAGES=C 721s + LANGUAGE=C 721s + t-git-debrebase -fupstream-has-debian convert-from-gbp 721s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + local gdr=git-debrebase 721s + : ' 721s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 721s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 721s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 721s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 721s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 721s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 721s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 721s $VAR2 = bless( do{\(my $o = { 721s 'keep_duplicate' => 0, 721s 'allow_duplicate' => 0, 721s 'allow_pgp' => 1, 721s 'is_pgp_signed' => 0, 721s 'in_order' => [ 721s 'Source', 721s 'Version', 721s 'Distribution', 721s 'Urgency', 721s 'Maintainer', 721s 'Timestamp', 721s 'Date', 721s 'Changes' 721s ], 721s 'name' => 'debian/changelog, entry no.1', 721s 'out_order' => [], 721s 'fields' => { 721s 'Source' => 'example', 721s 'Version' => '2.0-1', 721s 'Distribution' => 'unstable', 721s 'Urgency' => 'medium', 721s 'Maintainer' => 'dgit test git user ', 721s 'Timestamp' => '1530000000', 721s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 721s 'Changes' => ' 721s example (2.0-1) unstable; urgency=medium 721s 721s [ Ian Jackson ] 721s * new upstream (did gbp import-orig)' 721s }, 721s 'drop_empty' => 0 721s })}, 'Dpkg::Control::Hash' ); 721s last finished-looking changelog entry: (2.0-1) unstable 721s will stitch in dgit view, archive/test-dummy/2.0-1 721s git-debrebase: snags: 1 overriden by individual -f options 721s 721s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 721s + local 'ps=255 0' 721s + set -o pipefail 721s + case $ps in 721s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + local 'mpat=E:Unused patch file garbage will be discarded' 721s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s + local grepper=fgrep 721s + case "$mpat" in 721s + case "$mpat" in 721s + grepper=egrep 721s + mpat='Unused patch file garbage will be discarded' 721s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 721s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 721s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 721s + local gdr=git-debrebase 721s + : ' 721s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 721s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 721s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 721s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 721s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 721s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 721s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 721s $VAR2 = bless( do{\(my $o = { 721s 'fields' => { 721s 'Source' => 'example', 721s 'Version' => '2.0-1', 721s 'Distribution' => 'unstable', 721s 'Urgency' => 'medium', 721s 'Maintainer' => 'dgit test git user ', 721s 'Timestamp' => '1530000000', 721s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 721s 'Changes' => ' 721s example (2.0-1) unstable; urgency=medium 721s 721s [ Ian Jackson ] 721s * new upstream (did gbp import-orig)' 721s }, 721s 'out_order' => [], 721s 'keep_duplicate' => 0, 721s 'drop_empty' => 0, 721s 'in_order' => [ 721s 'Source', 721s 'Version', 721s 'Distribution', 721s 'Urgency', 721s 'Maintainer', 721s 'Timestamp', 721s 'Date', 721s 'Changes' 721s ], 721s 'allow_duplicate' => 0, 721s 'allow_pgp' => 1, 721s 'name' => 'debian/changelog, entry no.1', 721s 'is_pgp_signed' => 0 721s })}, 'Dpkg::Control::Hash' ); 721s last finished-looking changelog entry: (2.0-1) unstable 721s will stitch in dgit view, archive/test-dummy/2.0-1 721s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 721s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 721s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 721s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 721s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 721s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 721s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 721s git-debrebase ffq check_specs * 721s git-debrebase ffq merge master 721s git-debrebase ffq check_remote origin remote fetch/merge branch 721s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 721s OK, you are ahead of refs/remotes/origin/master 721s git-debrebase ffq check_remote undef remote push branch 721s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 722s OK, you are ahead of refs/remotes/dgit/dgit/sid 722s git-debrebase: snags: 2 overriden by individual -f options 722s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 722s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 722s git-debrebase >$ 722s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 722s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 722s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 722s ' 722s + git branch converted-from-gbp 722s + v=2.0-2 722s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 722s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 722s + DEBEMAIL=dgit-tests@example.org 722s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 722s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 722s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 722s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 722s 1 file changed, 6 insertions(+) 722s + t-dch-commit-r 722s + t-dch-r-rune t-dch-commit 722s + local cmd=t-dch-commit 722s + shift 722s + local suite=unstable 722s + t-dch-commit -r -D unstable '' 722s + t-debchange -r -D unstable '' 722s + DEBEMAIL=dgit-tests@example.org 722s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 722s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 722s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 722s libdistro-info-perl is not installed, Debian release names are not known. 722s libdistro-info-perl is not installed, Ubuntu release names are not known. 722s + git commit -m 'dch -r -D unstable ' debian/changelog 722s [master 4af0243] dch -r -D unstable 722s 1 file changed, 1 insertion(+), 1 deletion(-) 722s + t-dgit -wgf push-source --new 722s + local dgit=dgit 722s + pwd 722s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 722s + : ' 722s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 722s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 722s | git rev-parse --show-toplevel 722s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 722s | git config -z --get-regexp --local '.*' 722s | git config -z --get-regexp --local '.*' 722s | git config -z --get-regexp --global '.*' 722s | git config -z --get-regexp --system '.*' 722s format 3.0 (quilt), quilt mode linear 722s Format `3.0 (quilt)', need to check/update patch stack 722s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 722s => `' 722s + git diff --quiet HEAD 722s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 722s canonical suite name for unstable is sid 722s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 722s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 722s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 722s | git rev-parse 'HEAD~0' 722s => `4af0243f9227b0d695fbff38df345aca23969e2e' 722s | git symbolic-ref -q HEAD 722s => `refs/heads/master' 722s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 722s CD work 722s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 722s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 722s examining quilt state (multiple patches, linear mode) 722s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 722s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 722s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 722s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 722s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 722s | git rev-parse 'HEAD~0' 722s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 722s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 722s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 722s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 722s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 722s CD fake 722s | find -name .git -prune -print0 722s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 722s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 722s + git add -Af . 722s | git write-tree 722s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 722s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 722s CD .. 722s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 722s CD ../fake 722s + git add -Af . 722s | git write-tree 722s => `607612c46d7ea5b66697b830f1a50f069061d460' 722s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 722s CD ../work 722s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 722s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 722s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 723s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 723s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 723s => `' 723s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 723s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 723s => `lib.c\x00new-upstream-file\x00src.c\x00' 723s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 723s differences @dl ## ## == == == ==. 723s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 723s dgit: quilt differences: src: ## orig ## gitignores: == orig == 723s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 723s starting quiltify (multiple patches, linear mode) 723s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 723s => `debian/control'... 723s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 723s => `' 723s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 723s search finished hooray! 723s quiltify linearisation planning successful, executing... 723s + git checkout -q master 723s | git status --ignored --porcelain 723s => `?? .pc/' 723s nothing quilty to commit, ok. 723s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 723s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 723s | git rev-parse 'HEAD~0' 723s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 723s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 723s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 723s CD work 723s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 723s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s CD .. 723s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 723s dpkg-source: info: using source format '3.0 (quilt)' 723s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 723s dpkg-source: info: using patch list from debian/patches/series 723s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 723s dpkg-source: info: building example in example_2.0-2.dsc 723s CD work 723s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 723s package seems new, not specifying -v 723s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 723s dpkg-genchanges: info: not including original source code in upload 723s CD .. 723s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 723s renaming (Files) example_2.0.orig.tar.gz 723s renaming (Files) example_2.0-2.debian.tar.xz 723s renaming (dsc) example_2.0-2.dsc 723s renaming (changes) example_2.0-2_source.changes 723s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 723s actually entering push 723s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 723s => `1' 723s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 723s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 723s git_lrfetch_sane iteration 0 723s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 723s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 723s => 5562a727642ddb44984dc445491cc555aff57e3a refs/tags/archive/test-dummy/2.0-1 723s => d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/tags/test-dummy/2.0-1 723s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 723s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 723s | git for-each-ref refs/dgit-fetch/test-dummy 723s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 723s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 723s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 723s git_lrfetch_sane: tidying any old suite lrfetchrefs 723s | git for-each-ref refs/dgit-fetch/sid 723s git_lrfetch_sane: git fetch --no-insane emulation complete 723s $VAR1 = { 723s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd436cfd4171093e37c6f84f60ebb7ad387293b21', 723s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '5562a727642ddb44984dc445491cc555aff57e3a', 723s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 723s }; 723s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 723s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/tags/archive/test-dummy/2.0-1 723s currently refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 723s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/tags/test-dummy/2.0-1 723s currently refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 723s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 723s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 723s offered refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 723s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 723s offered refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 723s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 723s get_archive_dsc: nothing in archive, returning undef 723s no version available from the archive 723s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 723s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 723s 723s Package not found in the archive, but has allegedly been pushed using dgit. 723s Perhaps the upload is stuck in incoming. Using the version from git. 723s 723s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s fetch mergeinfos: 723s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 723s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 723s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 723s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 723s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 723s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 723s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 723s + git check-ref-format archive/test-dummy/2.0-2 723s | git symbolic-ref -q HEAD 723s => `refs/heads/master' 723s | git rev-parse 'HEAD~0' 723s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 723s ffq_prev_branchinfo branch current refs/heads/master 723s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 723s => `' 723s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 723s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 723s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 723s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 723s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 723s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 723s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 723s | git status --ignored --porcelain 723s => `' 723s nothing quilty to commit, ok. 723s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 723s => `' 723s + git diff --quiet HEAD 723s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 723s => `45ea71a69fa522ce760afdab8a420200443753e9' 723s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 723s => `' 723s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 723s checking that example_2.0-2.dsc corresponds to HEAD 723s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 723s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 723s dpkg-source: info: extracting example in example-2.0 723s dpkg-source: info: unpacking example_2.0.orig.tar.gz 723s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 723s dpkg-source: info: using patch list from debian/patches/series 723s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 723s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 723s dpkg-source: info: applying subdir/addnewups 723s CD example-2.0 723s | find -name .git -prune -print0 723s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 723s + git add -Af . 723s | git write-tree 723s => `607612c46d7ea5b66697b830f1a50f069061d460' 723s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 723s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 723s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 723s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 723s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s files_compare_inputs example_2.0-2.dsc 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 723s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 723s files_compare_inputs example_2.0-2.dsc Files 723s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 723s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 723s files_compare_inputs example_2.0-2_source.changes 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 723s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 723s files_compare_inputs example_2.0-2_source.changes Files 723s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 723s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 723s checking origs needed (2.0)... 723s checking origs needed placement 'devel extra'... 723s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 723s origs example_2.0.orig.tar.gz is_orig 723s -| sh -ec 'cd "$1"; shift 723s 723s find -name "$1" -print0 | 723s xargs -0r sha256sum 723s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 723s origs example_2.0.orig.tar.gz $#$have=-1 723s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 723s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 723s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 723s push_tagwants: $VAR1 = [ 723s '2.0-2', 723s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 723s undef, 723s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 723s ]; 723s $VAR2 = [ 723s { 723s 'View' => 'dgit', 723s 'TfSuffix' => '', 723s 'Tag' => 'archive/test-dummy/2.0-2', 723s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 723s 'Tfn' => sub { "DUMMY" }, 723s 'TagFn' => sub { "DUMMY" } 723s }, 723s { 723s 'View' => 'dgit', 723s 'TagFn' => sub { "DUMMY" }, 723s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 723s 'Tfn' => sub { "DUMMY" }, 723s 'Tag' => 'test-dummy/2.0-2', 723s 'TfSuffix' => '-dgit' 723s } 723s ]; 723s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 723s => `1530000000 +0000' 723s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 723s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 723s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 723s => `1b826e3c4f76402727ddfb691b16f9c8836c9077' 723s + git verify-tag 1b826e3c4f76402727ddfb691b16f9c8836c9077 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s gpg: Signature made Mon Mar 31 12:30:17 2025 UTC 723s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 723s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 723s gpg: WARNING: This key is not certified with a trusted signature! 723s gpg: There is no indication that the signature belongs to the owner. 723s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 723s + git update-ref refs/tags/archive/test-dummy/2.0-2 1b826e3c4f76402727ddfb691b16f9c8836c9077 723s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 723s => `e794227659d22135a5576598c319a08df8aaa331' 723s + git verify-tag e794227659d22135a5576598c319a08df8aaa331 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s gpg: Signature made Mon Mar 31 12:30:17 2025 UTC 723s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 723s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 723s gpg: WARNING: This key is not certified with a trusted signature! 723s gpg: There is no indication that the signature belongs to the owner. 723s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 723s + git update-ref refs/tags/test-dummy/2.0-2 e794227659d22135a5576598c319a08df8aaa331 723s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 723s => `1' 723s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 723s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 723s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 723s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 723s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 723s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 723s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 723s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 723s 723s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 723s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 723s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 724s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 724s 724s Successfully signed dsc, changes files 724s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 724s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 724s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 724s D: Setting host argument. 724s Checking signature on .changes 724s Checking signature on .dsc 724s Package includes an .orig.tar.gz file although the debian revision suggests 724s that it might not be required. Multiple uploads of the .orig.tar.gz may be 724s rejected by the upload queue management software. 724s Uploading to test-dummy (via local to localhost): 724s Successfully uploaded packages. 724s dgit ok: pushed and uploaded 2.0-2 724s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 724s del_lrfetchrefs... 724s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 724s del_lrfetchrefs: 5562a727642ddb44984dc445491cc555aff57e3a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 724s del_lrfetchrefs: d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 724s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 724s ' 724s + git push 724s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 724s eb10718..6b22dd5 master -> master 724s + cd .. 724s + t-archive-process-incoming sid 724s + local suite=sid 724s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 724s + t-archive-query sid 724s + local suite=sid 724s + local dscf=main/example_2.0-2.dsc 724s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 724s + local suite=sid 724s + local p=example 724s + local v=2.0-2 724s + local dscf=main/example_2.0-2.dsc 724s + local sha 724s ++ sha256sum 724s + sha='bec33735f6cef01427e61302c391872808b7bcbd3c030f5a22dac026ca1c441e -' 724s + echo '2.0-2 bec33735f6cef01427e61302c391872808b7bcbd3c030f5a22dac026ca1c441e main/example_2.0-2.dsc' 724s + t-aq-archive-updated sid example 724s + local suite=sid 724s + local p=example 724s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 724s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 724s + perl -wne ' 724s use JSON; 724s use strict; 724s our @v; 724s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 724s push @v, { 724s "version" => "$1", 724s "sha256sum" => "$2", 724s "component" => "$3", 724s "filename" => "$4", 724s }; 724s END { 724s my $json = JSON->new->canonical(); 724s print $json->encode(\@v) or die $!; 724s } 724s ' 724s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 724s ++ echo git mirror aq 724s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 724s . $troot/lib-gdr 724s t-tstunt-parsechangelog 724s p=example 724s t-git-next-date 724s ' 724s + local savevars= 724s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 724s + local 'importeval= 724s . $troot/lib-gdr 724s t-tstunt-parsechangelog 724s p=example 724s t-git-next-date 724s ' 724s + local import=IMPORT.gdr-convert-gbp 724s + exec 724s + local vn 724s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 724s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 724s print STDERR "saving-exporting $vn\n"; 724s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 724s or die $!; 724s } 724s ' 724s saving-exporting DGIT_TEST_REAL_GPG_AGENT 724s saving-exporting DGIT_TEST_REAL_GPG 724s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 724s saving-exporting DGIT_TEST_REAL_DEBCHANGE 724s + set -e 724s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 724s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 724s + printf '\n%s\n' ' 724s . $troot/lib-gdr 724s t-tstunt-parsechangelog 724s p=example 724s t-git-next-date 724s ' 724s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 724s + rc=0 724s + set +x 724s + set +e 724s + pwd 724s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 724s + '[' x '!=' x ']' 724s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 724s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 724s + set -e 724s + test 0 = 0 724s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 724s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 724s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 724s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 724s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 724s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 724s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 724s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 724s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 724s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 724s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 724s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 724s +++ : -D 724s +++ export GDR_TEST_DEBUG 724s +++ t-tstunt debchange 724s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s +++ local var=PATH 724s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s +++ eval ' 724s case "$PATH" in 724s "$tstunt:"*) ;; 724s *":$tstunt:"*) ;; 724s "") PATH="$tstunt" ;; 724s *) PATH="$tstunt:$PATH" ;; 724s esac 724s export PATH 724s ' 724s ++++ case "$PATH" in 724s ++++ export PATH 724s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s +++ local var=PERLLIB 724s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s +++ eval ' 724s case "$PERLLIB" in 724s "$tstunt:"*) ;; 724s *":$tstunt:"*) ;; 724s "") PERLLIB="$tstunt" ;; 724s *) PERLLIB="$tstunt:$PERLLIB" ;; 724s esac 724s export PERLLIB 724s ' 724s ++++ case "$PERLLIB" in 724s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++++ export PERLLIB 724s +++ local f 724s +++ for f in "$@" 724s +++ t-tstunt--save-real debchange 724s +++ local f=debchange 724s +++ case "$f" in 724s +++ local rc 724s +++ local real 724s +++ set +e 724s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 724s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 724s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s ++++ type -p debchange 724s +++ real=/usr/bin/debchange 724s +++ rc=0 724s +++ set -e 724s +++ case $rc in 724s +++ local varname=debchange 724s +++ varname=DGIT_TEST_REAL_DEBCHANGE 724s +++ eval ' 724s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 724s export DGIT_TEST_REAL_DEBCHANGE 724s ' 724s ++++ : /usr/bin/debchange 724s ++++ export DGIT_TEST_REAL_DEBCHANGE 724s +++ f=./debchange 724s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 724s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 724s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 724s ++ t-tstunt-parsechangelog 724s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 724s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++ local var=PATH 724s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++ eval ' 724s case "$PATH" in 724s "$tstunt:"*) ;; 724s *":$tstunt:"*) ;; 724s "") PATH="$tstunt" ;; 724s *) PATH="$tstunt:$PATH" ;; 724s esac 724s export PATH 724s ' 724s +++ case "$PATH" in 724s +++ export PATH 724s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++ local var=PERLLIB 724s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 724s ++ eval ' 724s case "$PERLLIB" in 724s "$tstunt:"*) ;; 724s *":$tstunt:"*) ;; 724s "") PERLLIB="$tstunt" ;; 724s *) PERLLIB="$tstunt:$PERLLIB" ;; 724s esac 724s export PERLLIB 724s ' 724s +++ case "$PERLLIB" in 724s +++ export PERLLIB 724s ++ local f 724s ++ for f in "$@" 724s ++ t-tstunt--save-real dpkg-parsechangelog 724s ++ local f=dpkg-parsechangelog 724s ++ case "$f" in 724s ++ local rc 724s ++ local real 724s ++ set +e 724s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 724s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 724s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 724s +++ type -p dpkg-parsechangelog 724s ++ real=/usr/bin/dpkg-parsechangelog 724s ++ rc=0 724s ++ set -e 724s ++ case $rc in 724s ++ local varname=dpkg_parsechangelog 724s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 724s ++ eval ' 724s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 724s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 724s ' 724s +++ : /usr/bin/dpkg-parsechangelog 724s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 724s ++ f=./dpkg-parsechangelog 724s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 724s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 724s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 724s ++ for f in "$@" 724s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 724s ++ local f=Dpkg/Changelog/Parse.pm 724s ++ case "$f" in 724s ++ return 724s ++ f=./Dpkg/Changelog/Parse.pm 724s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 724s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 724s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 724s ++ p=example 724s ++ t-git-next-date 724s ++ GIT_COMMITTER_DATE='1530000001 +0100' 724s ++ GIT_AUTHOR_DATE='1530000001 +0100' 724s + cd example 724s + t-dgit setup-mergechangelogs 724s + local dgit=dgit 724s + pwd 724s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 724s + : ' 724s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 724s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 724s | git rev-parse --show-toplevel 724s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 724s | git config -z --get-regexp --local '.*' 724s | git config -z --get-regexp --local '.*' 724s | git config -z --get-regexp --global '.*' 724s | git config -z --get-regexp --system '.*' 724s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 724s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 724s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 724s ' 724s + : maintainer 724s + git checkout master 724s Already on 'master' 724s Your branch is up to date with 'origin/master'. 724s + v=2.0-3 724s + t-maintainer-commit-some-changes 724s + t-dch-commit -v2.0-3 -m 'start 2.0-3' 724s + t-debchange -v2.0-3 -m 'start 2.0-3' 724s + DEBEMAIL=dgit-tests@example.org 724s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v2.0-3 -m 'start 2.0-3' 724s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange -v2.0-3 -m start 2.0-3 724s + git commit -m 'dch -v2.0-3 -m start 2.0-3' debian/changelog 724s [master 4dd98f7] dch -v2.0-3 -m start 2.0-3 724s 1 file changed, 6 insertions(+) 724s + t-some-changes 'maintainer 2.0-3' 724s + local 'token=maintainer 2.0-3' 724s + local which=dum 724s + local fsuffix= 724s + t-git-next-date 724s + GIT_COMMITTER_DATE='1530000002 +0100' 724s + GIT_AUTHOR_DATE='1530000002 +0100' 724s + case "$which" in 724s + echo '// debian maintainer 2.0-3' 724s + git add debian/zorkmid 724s + git commit -m 'DEBIAN add zorkmid (maintainer 2.0-3)' 724s [master c5aeac0] DEBIAN add zorkmid (maintainer 2.0-3) 724s 1 file changed, 1 insertion(+) 724s create mode 100644 debian/zorkmid 724s + case "$which" in 724s + echo '// upstream maintainer 2.0-3' 724s + git add src.c 724s + git commit -m 'UPSTREAM edit src.c (maintainer 2.0-3)' 724s [master 64946bb] UPSTREAM edit src.c (maintainer 2.0-3) 724s 1 file changed, 1 insertion(+) 724s + case "$which" in 724s + for f in debian/zorkmid$fsuffix src$fsuffix.c 724s + echo '// both! maintainer 2.0-3' 724s + git add debian/zorkmid 724s + for f in debian/zorkmid$fsuffix src$fsuffix.c 724s + echo '// both! maintainer 2.0-3' 724s + git add src.c 724s + git commit -m 'MIXED add both() (maintainer 2.0-3)' 724s [master 964ce93] MIXED add both() (maintainer 2.0-3) 724s 2 files changed, 2 insertions(+) 724s + t-git-next-date 724s + GIT_COMMITTER_DATE='1530000003 +0100' 724s + GIT_AUTHOR_DATE='1530000003 +0100' 724s + t-git-debrebase 724s + local gdr=git-debrebase 724s + : ' 724s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 724s + git-debrebase --dgit=dgit -D 724s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 724s git-debrebase ffq check_specs * 724s git-debrebase ffq merge master 724s git-debrebase ffq check_remote origin remote fetch/merge branch 724s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 724s OK, you are ahead of refs/remotes/origin/master 724s git-debrebase ffq check_remote undef remote push branch 724s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 724s OK, you are ahead of refs/remotes/dgit/dgit/sid 724s git-debrebase *** WALK 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0 - 724s git-debrebase get_differs 64946bb029165d28437faddd24dd43a5ca319327 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f = 0x22 724s git-debrebase classify 964ce93fe0ce99ab711d1cb423537d236e0bbf20 $t=6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f @p 64946bb029165d28437faddd24dd43a5ca319327/0x22 724s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "64946bb029165d28437faddd24dd43a5ca319327"}],"Tree" => "6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f","Msg" => "MIXED add both() (maintainer 2.0-3)\n","CommitId" => "964ce93fe0ce99ab711d1cb423537d236e0bbf20","Type" => "Mixed","Hdr" => "tree 6fb6e99e1e0b97c2bc4d187cafea434c6a61fb4f\nparent 64946bb029165d28437faddd24dd43a5ca319327\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 724s git-debrebase get_differs c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 = 0x2 724s git-debrebase classify 64946bb029165d28437faddd24dd43a5ca319327 $t=75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537 @p c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c/0x2 724s git-debrebase = Upstream {"Hdr" => "tree 75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537\nparent c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Upstream","CommitId" => "64946bb029165d28437faddd24dd43a5ca319327","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c"}],"Tree" => "75c2fc34e7b70cbf6c52d3bfef6fa1ecc95cd537"} 724s git-debrebase get_differs 4dd98f768a8f29a08011b04867832a40ef33e618 b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 = 0x20 724s git-debrebase classify c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c $t=b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9 @p 4dd98f768a8f29a08011b04867832a40ef33e618/0x20 724s git-debrebase = Packaging {"CommitId" => "c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c","Type" => "Packaging","Tree" => "b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9","Parents" => [{"CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n","Hdr" => "tree b8aaa7f6ac00320566ae1300dfd2d15a70a9a0f9\nparent 4dd98f768a8f29a08011b04867832a40ef33e618\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 724s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 89b9b5a11fee7d2a1c974f30aa28172018b99c18 = 0x10 724s git-debrebase classify 4dd98f768a8f29a08011b04867832a40ef33e618 $t=89b9b5a11fee7d2a1c974f30aa28172018b99c18 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 724s git-debrebase = Changelog {"Msg" => "dch -v2.0-3 -m start 2.0-3\n","Tree" => "89b9b5a11fee7d2a1c974f30aa28172018b99c18","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","CommitId" => "4dd98f768a8f29a08011b04867832a40ef33e618","Hdr" => "tree 89b9b5a11fee7d2a1c974f30aa28172018b99c18\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 724s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 724s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 724s git-debrebase = AddPatches {"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Type" => "AddPatches","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 724s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 724s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 724s git-debrebase = Changelog {"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 724s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 724s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 724s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 724s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 724s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 724s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 724s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 724s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 724s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 724s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 724s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 724s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 724s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 724s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 724s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 724s git-debrebase = Upstream {"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2,"Ix" => 0}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 724s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 724s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 724s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 724s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 724s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 14 pm 0 724s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 724s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 724s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 15 724s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 724s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 724s git-debrebase WALK REWRITING NOW cl=HASH(0x556244df6fc0) procd=HASH(0x556244e1ce80) 724s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 724s git-debrebase WALK BUILD 4dd98f768a8f29a08011b04867832a40ef33e618 Debian (rewriting=1) 724s git-debrebase WALK BUILD c5aeac05f2eb3e8fea1d9c73d532b8aae154b53c Debian (rewriting=1) 724s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 724s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Debian (rewriting=1) 724s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 724s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 724s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 724s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 724s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 724s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 724s git-debrebase WALK BUILD 64946bb029165d28437faddd24dd43a5ca319327 Upstream (rewriting=1) 724s git-debrebase WALK BUILD 964ce93fe0ce99ab711d1cb423537d236e0bbf20 Upstream (rewriting=1) 724s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 724s git-debrebase get_differs 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 = 0x4 724s git-debrebase *** WALK RETURN 5b2d01d10ec62b3f25e6f7a22710468830e457fb 274022edec808f75f2359551ecdc6de6b6390355 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 724s git-debrebase: laundered (head was 964ce93fe0ce99ab711d1cb423537d236e0bbf20) 724s git-debrebase >= update refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 0000000000000000000000000000000000000000 724s git-debrebase >= delete refs/debrebase-last/heads/master 724s git-debrebase >= update HEAD 5b2d01d10ec62b3f25e6f7a22710468830e457fb 964ce93fe0ce99ab711d1cb423537d236e0bbf20 724s git-debrebase >$ 724s Recorded previous head for preservation 724s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 724s ' 724s + t-git-debrebase stitch 724s + local gdr=git-debrebase 724s + : ' 724s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 724s + git-debrebase --dgit=dgit -D stitch 725s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 725s git-debrebase get_differs b3c76885171009da1ef20071776aa9044fae8502 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae = 0x2 725s git-debrebase classify 5b2d01d10ec62b3f25e6f7a22710468830e457fb $t=27ebb241bdcc4fbab78e30d67dd40652f0ad1cae @p b3c76885171009da1ef20071776aa9044fae8502/0x2 725s git-debrebase = Upstream {"Tree" => "27ebb241bdcc4fbab78e30d67dd40652f0ad1cae","CommitId" => "5b2d01d10ec62b3f25e6f7a22710468830e457fb","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 27ebb241bdcc4fbab78e30d67dd40652f0ad1cae\nparent b3c76885171009da1ef20071776aa9044fae8502\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b3c76885171009da1ef20071776aa9044fae8502"}],"Type" => "Upstream"} 725s git-debrebase get_differs 8139d3db657e3270633db038d311934dab9b5fa2 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 = 0x2 725s git-debrebase classify b3c76885171009da1ef20071776aa9044fae8502 $t=5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14 @p 8139d3db657e3270633db038d311934dab9b5fa2/0x2 725s git-debrebase = Upstream {"Hdr" => "tree 5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14\nparent 8139d3db657e3270633db038d311934dab9b5fa2\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (maintainer 2.0-3)\n","CommitId" => "b3c76885171009da1ef20071776aa9044fae8502","Tree" => "5367f2b85b48a02ba37ebe9f5d4cbe794f75fb14"} 725s git-debrebase get_differs f99dd01b94310ac6847d5bb66d530db52eceb9a7 1a9494a6c69d5574aa472ee96d6f641184e55cfa = 0x2 725s git-debrebase classify 8139d3db657e3270633db038d311934dab9b5fa2 $t=1a9494a6c69d5574aa472ee96d6f641184e55cfa @p f99dd01b94310ac6847d5bb66d530db52eceb9a7/0x2 725s git-debrebase = Upstream {"Parents" => [{"CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 1a9494a6c69d5574aa472ee96d6f641184e55cfa\nparent f99dd01b94310ac6847d5bb66d530db52eceb9a7\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "1a9494a6c69d5574aa472ee96d6f641184e55cfa","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "8139d3db657e3270633db038d311934dab9b5fa2"} 725s git-debrebase get_differs 505316fe392571a9180b6df0d54ec25ffb40c9c7 a71937789bee6e5711ddc7f7e212948a45fedf59 = 0x2 725s git-debrebase classify f99dd01b94310ac6847d5bb66d530db52eceb9a7 $t=a71937789bee6e5711ddc7f7e212948a45fedf59 @p 505316fe392571a9180b6df0d54ec25ffb40c9c7/0x2 725s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7"}],"Hdr" => "tree a71937789bee6e5711ddc7f7e212948a45fedf59\nparent 505316fe392571a9180b6df0d54ec25ffb40c9c7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "f99dd01b94310ac6847d5bb66d530db52eceb9a7","Tree" => "a71937789bee6e5711ddc7f7e212948a45fedf59","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 725s git-debrebase get_differs 274022edec808f75f2359551ecdc6de6b6390355 447f86ca9d4d65b8c1128528a4338c51733e127b = 0x2 725s git-debrebase classify 505316fe392571a9180b6df0d54ec25ffb40c9c7 $t=447f86ca9d4d65b8c1128528a4338c51733e127b @p 274022edec808f75f2359551ecdc6de6b6390355/0x2 725s git-debrebase = Upstream {"Hdr" => "tree 447f86ca9d4d65b8c1128528a4338c51733e127b\nparent 274022edec808f75f2359551ecdc6de6b6390355\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "505316fe392571a9180b6df0d54ec25ffb40c9c7","Tree" => "447f86ca9d4d65b8c1128528a4338c51733e127b"} 725s git-debrebase get_differs 66623ad57ce32197ca515cfa520eaf7d7746889d 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd = 0x20 725s git-debrebase classify 274022edec808f75f2359551ecdc6de6b6390355 $t=52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd @p 66623ad57ce32197ca515cfa520eaf7d7746889d/0x20 725s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd\nparent 66623ad57ce32197ca515cfa520eaf7d7746889d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "52f2b3c86002e9a00ae49d1abd3af34c4ffebbcd","Msg" => "MIXED add both() (maintainer 2.0-3)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "274022edec808f75f2359551ecdc6de6b6390355"} 725s git-debrebase get_differs d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a b493b6bc5a8fe4b229528407f365a185a732dcf4 = 0x20 725s git-debrebase classify 66623ad57ce32197ca515cfa520eaf7d7746889d $t=b493b6bc5a8fe4b229528407f365a185a732dcf4 @p d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a/0x20 725s git-debrebase = Packaging {"Parents" => [{"CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree b493b6bc5a8fe4b229528407f365a185a732dcf4\nparent d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b493b6bc5a8fe4b229528407f365a185a732dcf4","CommitId" => "66623ad57ce32197ca515cfa520eaf7d7746889d","Msg" => "DEBIAN add zorkmid (maintainer 2.0-3)\n"} 725s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 894ca54a967167e2bb994b82357d084539559075 = 0x10 725s git-debrebase classify d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a $t=894ca54a967167e2bb994b82357d084539559075 @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 725s git-debrebase = Changelog {"Hdr" => "tree 894ca54a967167e2bb994b82357d084539559075\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Type" => "Changelog","Tree" => "894ca54a967167e2bb994b82357d084539559075","Msg" => "dch -v2.0-3 -m start 2.0-3\n","CommitId" => "d697bb9d62eaadd79cc3ac4c899b5d48ef8a827a"} 725s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 725s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 725s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 725s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 725s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 725s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 725s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 725s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 725s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 725s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 725s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 725s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 725s git-debrebase >= delete refs/ffq-prev/heads/master 964ce93fe0ce99ab711d1cb423537d236e0bbf20 725s git-debrebase >= update refs/debrebase-last/heads/master 74d5f586ed443ce47434f30fbbeff3eacb36748d 0000000000000000000000000000000000000000 725s git-debrebase >= update HEAD 74d5f586ed443ce47434f30fbbeff3eacb36748d 5b2d01d10ec62b3f25e6f7a22710468830e457fb 725s git-debrebase >$ 725s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 725s ' 725s + git branch did.maintainer 725s + t-git-next-date 725s + GIT_COMMITTER_DATE='1530000004 +0100' 725s + GIT_AUTHOR_DATE='1530000004 +0100' 725s + t-git-next-date 725s + GIT_COMMITTER_DATE='1530000005 +0100' 725s + GIT_AUTHOR_DATE='1530000005 +0100' 725s + : nmu 725s + git checkout -b nmu origin/master~0 725s Switched to a new branch 'nmu' 725s + t-git-next-date 725s + GIT_COMMITTER_DATE='1530000006 +0100' 725s + GIT_AUTHOR_DATE='1530000006 +0100' 725s + v=2.0-2+nmu1 725s + t-nmu-commit-an-upstream-change 725s + echo '// more upstream' 725s + git add newsrc.c 725s + git commit -m 'UPSTREAM NMU' 725s [nmu a46e8d3] UPSTREAM NMU 725s 1 file changed, 1 insertion(+) 725s create mode 100644 newsrc.c 725s + t-dch-commit -v2.0-2+nmu1 -m finalise 725s + t-debchange -v2.0-2+nmu1 -m finalise 725s + DEBEMAIL=dgit-tests@example.org 725s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v2.0-2+nmu1 -m finalise 725s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -v2.0-2+nmu1 -m finalise 725s + git commit -m 'dch -v2.0-2+nmu1 -m finalise' debian/changelog 725s [nmu eb84137] dch -v2.0-2+nmu1 -m finalise 725s 1 file changed, 6 insertions(+) 725s + t-dch-commit-r 725s + t-dch-r-rune t-dch-commit 725s + local cmd=t-dch-commit 725s + shift 725s + local suite=unstable 725s + t-dch-commit -r -D unstable '' 725s + t-debchange -r -D unstable '' 725s + DEBEMAIL=dgit-tests@example.org 725s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 725s + exec env TZ=UTC faketime -f 2018-06-26 08:00:06 env -u TZ /usr/bin/debchange -r -D unstable 725s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 725s libdistro-info-perl is not installed, Debian release names are not known. 725s libdistro-info-perl is not installed, Ubuntu release names are not known. 725s + git commit -m 'dch -r -D unstable ' debian/changelog 725s [nmu c796f6f] dch -r -D unstable 725s 1 file changed, 1 insertion(+), 1 deletion(-) 725s + t-dgit -wgf push-source 725s + local dgit=dgit 725s + pwd 725s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 725s + : ' 725s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 725s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source 725s | git rev-parse --show-toplevel 725s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 725s | git config -z --get-regexp --local '.*' 725s | git config -z --get-regexp --local '.*' 725s | git config -z --get-regexp --global '.*' 725s | git config -z --get-regexp --system '.*' 725s format 3.0 (quilt), quilt mode linear 725s Format `3.0 (quilt)', need to check/update patch stack 725s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 725s => `' 725s + git diff --quiet HEAD 725s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 725s canonical suite name for unstable is sid 725s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 725s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 725s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 725s | git rev-parse 'HEAD~0' 725s => `c796f6f0f624a7aa89eee33d301e249029f42362' 725s | git symbolic-ref -q HEAD 725s => `refs/heads/nmu' 725s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 725s CD work 725s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 725s + git reset -q --hard c796f6f0f624a7aa89eee33d301e249029f42362 725s examining quilt state (multiple patches, linear mode) 725s branch_is_gdr c796f6f0f624a7aa89eee33d301e249029f42362... 725s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 725s + git reset -q --hard c796f6f0f624a7aa89eee33d301e249029f42362 725s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 725s HEAD is now at 1b09bea Commit patch queue (exported by git-debrebase) 725s | git rev-parse 'HEAD~0' 725s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 725s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 725s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 725s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 725s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 725s CD fake 725s | find -name .git -prune -print0 725s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 725s + git checkout -f 1b09bea8a4b0249eafd6d5623761abfa79446f68 -- debian 725s + git add -Af . 725s | git write-tree 725s => `2e49b4b87cbedac7e1e20ece2288a2244efa6d93' 725s fake orig tree object 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 726s CD .. 726s + git reset -q --hard 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s CD ../fake 726s + git add -Af . 726s | git write-tree 726s => `b5b261782b3ba083e7f9d56d8b6ece45218faf20' 726s fake o+d/p tree object 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 726s CD ../work 726s | git ls-tree --name-only -z 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 726s | git diff-tree -z --no-renames -r 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:000000 100644 0000000000000000000000000000000000000000 20f7624364ec18735d627fc84c64fce3dee6115b A\x00newsrc.c\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 726s quiltify_trees_differ 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 1b09bea8a4b0249eafd6d5623761abfa79446f68 => 1 726s | git diff-tree -z --no-renames --name-only -r 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 726s => `' 726s quiltify_trees_differ 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 0 726s | git diff-tree -z --no-renames --name-only -r 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 b5b261782b3ba083e7f9d56d8b6ece45218faf20 726s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 726s quiltify_trees_differ 2e49b4b87cbedac7e1e20ece2288a2244efa6d93 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 1 726s differences @dl ## ## == == == ==. 726s dgit: base trees orig=2e49b4b87cbedac7e1e2 o+d/p=b5b261782b3ba083e7f9 726s dgit: quilt differences: src: ## orig ## gitignores: == orig == 726s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 726s starting quiltify (multiple patches, linear mode) 726s | git ls-tree --name-only 1b09bea8a4b0249eafd6d5623761abfa79446f68 -- debian/rules debian/control 726s => `debian/control'... 726s quiltify investigate 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s | git diff-tree -z --no-renames --name-only 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 726s => `' 726s quiltify_trees_differ 1b09bea8a4b0249eafd6d5623761abfa79446f68 b5b261782b3ba083e7f9d56d8b6ece45218faf20 => 0 726s search finished hooray! 726s quiltify linearisation planning successful, executing... 726s + git checkout -q master 726s | git status --ignored --porcelain 726s => `?? .pc/' 726s nothing quilty to commit, ok. 726s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 726s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 726s | git rev-parse 'HEAD~0' 726s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 726s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 726s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 726s CD work 726s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 726s + git reset -q --hard 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s CD .. 726s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 726s dpkg-source: info: using source format '3.0 (quilt)' 726s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 726s dpkg-source: info: using patch list from debian/patches/series 726s dpkg-source: info: building example in example_2.0-2+nmu1.debian.tar.xz 726s dpkg-source: info: building example in example_2.0-2+nmu1.dsc 726s CD work 726s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 726s changelog will contain changes since 2.0-2 726s + sh -ec 'exec >../$1; shift; exec "$@"' x 'example_2.0-2+nmu1_source.changes' dpkg-genchanges -S -v2.0-2 726s dpkg-genchanges: info: not including original source code in upload 726s CD .. 726s moving example_2.0-2+nmu1.dsc, example_2.0-2+nmu1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 726s renaming (Files) example_2.0.orig.tar.gz 726s renaming (Files) example_2.0-2+nmu1.debian.tar.xz 726s renaming (dsc) example_2.0-2+nmu1.dsc 726s renaming (changes) example_2.0-2+nmu1_source.changes 726s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 726s actually entering push 726s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 726s => `1' 726s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 726s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 726s git_lrfetch_sane iteration 0 726s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 726s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 726s => 5562a727642ddb44984dc445491cc555aff57e3a refs/tags/archive/test-dummy/2.0-1 726s => 1b826e3c4f76402727ddfb691b16f9c8836c9077 refs/tags/archive/test-dummy/2.0-2 726s => d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/tags/test-dummy/2.0-1 726s => e794227659d22135a5576598c319a08df8aaa331 refs/tags/test-dummy/2.0-2 726s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 726s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 726s | git for-each-ref refs/dgit-fetch/test-dummy 726s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 726s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 726s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 726s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 726s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 726s git_lrfetch_sane: tidying any old suite lrfetchrefs 726s | git for-each-ref refs/dgit-fetch/sid 726s git_lrfetch_sane: git fetch --no-insane emulation complete 726s $VAR1 = { 726s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 726s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '5562a727642ddb44984dc445491cc555aff57e3a', 726s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '1b826e3c4f76402727ddfb691b16f9c8836c9077', 726s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd436cfd4171093e37c6f84f60ebb7ad387293b21', 726s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'e794227659d22135a5576598c319a08df8aaa331' 726s }; 726s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 726s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/tags/archive/test-dummy/2.0-1 726s currently refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 726s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/tags/archive/test-dummy/2.0-2 726s currently refs/tags/archive/test-dummy/2.0-2=1b826e3c4f76402727ddfb691b16f9c8836c9077 726s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/tags/test-dummy/2.0-1 726s currently refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 726s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/tags/test-dummy/2.0-2 726s currently refs/tags/test-dummy/2.0-2=e794227659d22135a5576598c319a08df8aaa331 726s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 726s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 726s offered refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 726s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 726s offered refs/tags/archive/test-dummy/2.0-2=1b826e3c4f76402727ddfb691b16f9c8836c9077 726s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 726s offered refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 726s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 726s offered refs/tags/test-dummy/2.0-2=e794227659d22135a5576598c319a08df8aaa331 726s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 726s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 726s get_archive_dsc: Version 2.0-2 726s last upload to archive: specified git info (test-dummy) 726s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 726s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 726s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 726s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s using existing example_2.0.orig.tar.gz 726s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s fetch mergeinfos: 726s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf Dgit field in .dsc from archive 726s fetch hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s | git log -n2 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 726s => `commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf'... 726s is_gitattrs_setup: found nothing 726s | git ls-tree -lrz -- 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf: 726s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 726s + git check-ref-format 'archive/test-dummy/2.0-2+nmu1' 726s | git symbolic-ref -q HEAD 726s => `refs/heads/nmu' 726s | git rev-parse 'HEAD~0' 726s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 726s ffq_prev_branchinfo branch current refs/heads/nmu 726s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/nmu' 726s => `' 726s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/nmu' 726s => `' 726s | git status --ignored --porcelain 726s => `' 726s nothing quilty to commit, ok. 726s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 726s => `' 726s + git diff --quiet HEAD 726s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 726s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 726s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2+nmu1' 726s => `' 726s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 726s checking that example_2.0-2+nmu1.dsc corresponds to HEAD 726s + dpkg-source -x -- '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2+nmu1.dsc' 726s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2+nmu1.dsc) 726s dpkg-source: info: extracting example in example-2.0 726s dpkg-source: info: unpacking example_2.0.orig.tar.gz 726s dpkg-source: info: unpacking example_2.0-2+nmu1.debian.tar.xz 726s dpkg-source: info: using patch list from debian/patches/series 726s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 726s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 726s dpkg-source: info: applying subdir/addnewups 726s dpkg-source: info: applying 0004-UPSTREAM-NMU.patch 726s CD example-2.0 726s | find -name .git -prune -print0 726s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 726s + git add -Af . 726s | git write-tree 726s => `b5b261782b3ba083e7f9d56d8b6ece45218faf20' 726s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 726s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 726s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 726s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 726s + git diff --quiet b5b261782b3ba083e7f9d56d8b6ece45218faf20 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s files_compare_inputs example_2.0-2+nmu1.dsc 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha256 example_2.0-2+nmu1.debian.tar.xz 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 726s files_compare_inputs example_2.0-2+nmu1.dsc Checksums-Sha1 example_2.0-2+nmu1.debian.tar.xz 726s files_compare_inputs example_2.0-2+nmu1.dsc Files 726s files_compare_inputs example_2.0-2+nmu1.dsc Files example_2.0.orig.tar.gz 726s files_compare_inputs example_2.0-2+nmu1.dsc Files example_2.0-2+nmu1.debian.tar.xz 726s files_compare_inputs example_2.0-2+nmu1_source.changes 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 example_2.0-2+nmu1.dsc 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha256 example_2.0-2+nmu1.debian.tar.xz 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 example_2.0-2+nmu1.dsc 726s files_compare_inputs example_2.0-2+nmu1_source.changes Checksums-Sha1 example_2.0-2+nmu1.debian.tar.xz 726s files_compare_inputs example_2.0-2+nmu1_source.changes Files 726s files_compare_inputs example_2.0-2+nmu1_source.changes Files example_2.0-2+nmu1.dsc 726s files_compare_inputs example_2.0-2+nmu1_source.changes Files example_2.0-2+nmu1.debian.tar.xz 726s checking origs needed (2.0)... 726s checking origs needed placement 'devel extra'... 726s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 726s origs example_2.0.orig.tar.gz is_orig 726s -| sh -ec 'cd "$1"; shift 726s 726s find -name "$1" -print0 | 726s xargs -0r sha256sum 726s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 726s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 726s origs example_2.0.orig.tar.gz $#$have=0 726s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 726s origs example_2.0-2+nmu1.debian.tar.xz | a77c6dbe75698c94323b274b6106df89 1428 example_2.0-2+nmu1.debian.tar.xz 726s ../example_2.0-2+nmu1_source.changes already has appropriate .orig(s) (if any) 726s push_tagwants: $VAR1 = [ 726s '2.0-2+nmu1', 726s '1b09bea8a4b0249eafd6d5623761abfa79446f68', 726s undef, 726s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 726s ]; 726s $VAR2 = [ 726s { 726s 'TagFn' => sub { "DUMMY" }, 726s 'Tfn' => sub { "DUMMY" }, 726s 'View' => 'dgit', 726s 'Tag' => 'archive/test-dummy/2.0-2+nmu1', 726s 'TfSuffix' => '', 726s 'Objid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68' 726s }, 726s { 726s 'Objid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68', 726s 'TfSuffix' => '-dgit', 726s 'Tag' => 'test-dummy/2.0-2+nmu1', 726s 'View' => 'dgit', 726s 'Tfn' => sub { "DUMMY" }, 726s 'TagFn' => sub { "DUMMY" } 726s } 726s ]; 726s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:06 +0000' 726s => `1530000006 +0000' 726s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 726s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 726s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 726s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 726s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 726s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 726s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 726s => `e29324b2b316e3a26c894f118d204dd7c2252253' 726s + git verify-tag e29324b2b316e3a26c894f118d204dd7c2252253 726s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 726s gpg: Signature made Mon Mar 31 12:30:20 2025 UTC 726s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 726s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 726s gpg: WARNING: This key is not certified with a trusted signature! 726s gpg: There is no indication that the signature belongs to the owner. 726s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 726s + git update-ref 'refs/tags/archive/test-dummy/2.0-2+nmu1' e29324b2b316e3a26c894f118d204dd7c2252253 726s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 726s => `0287eb316c75843badfa850fb189b429d1a8e1ff' 726s + git verify-tag 0287eb316c75843badfa850fb189b429d1a8e1ff 726s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 726s gpg: Signature made Mon Mar 31 12:30:20 2025 UTC 726s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 726s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 726s gpg: WARNING: This key is not certified with a trusted signature! 726s gpg: There is no indication that the signature belongs to the owner. 726s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 726s + git update-ref 'refs/tags/test-dummy/2.0-2+nmu1' 0287eb316c75843badfa850fb189b429d1a8e1ff 726s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 726s => `1' 726s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 1b09bea8a4b0249eafd6d5623761abfa79446f68:refs/dgit/sid 'refs/tags/archive/test-dummy/2.0-2+nmu1' 'refs/tags/test-dummy/2.0-2+nmu1' 726s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 726s 6b22dd5..1b09bea 1b09bea8a4b0249eafd6d5623761abfa79446f68 -> refs/dgit/sid 726s * [new tag] archive/test-dummy/2.0-2+nmu1 -> archive/test-dummy/2.0-2+nmu1 726s * [new tag] test-dummy/2.0-2+nmu1 -> test-dummy/2.0-2+nmu1 726s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 1b09bea8a4b0249eafd6d5623761abfa79446f68 726s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A '../example_2.0-2+nmu1_source.changes' 726s signfile dsc ../example_2.0-2+nmu1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 726s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 727s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 727s 727s fixup_changes dsc ../example_2.0-2+nmu1.dsc ../example_2.0-2+nmu1_source.changes 727s signfile changes ../example_2.0-2+nmu1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 727s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 727s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 727s 727s Successfully signed dsc, changes files 727s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy '../example_2.0-2+nmu1_source.changes' 727s gpg: ../example_2.0-2+nmu1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 727s gpg: ../example_2.0-2+nmu1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 727s D: Setting host argument. 727s Checking signature on .changes 727s Checking signature on .dsc 727s Uploading to test-dummy (via local to localhost): 727s Successfully uploaded packages. 727s dgit ok: pushed and uploaded 2.0-2+nmu1 727s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 727s del_lrfetchrefs... 727s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 727s del_lrfetchrefs: 5562a727642ddb44984dc445491cc555aff57e3a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 727s del_lrfetchrefs: 1b826e3c4f76402727ddfb691b16f9c8836c9077 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 727s del_lrfetchrefs: d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 727s del_lrfetchrefs: e794227659d22135a5576598c319a08df8aaa331 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 727s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 727s ' 727s + t-archive-process-incoming sid 727s + local suite=sid 727s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2+nmu1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 727s + t-archive-query sid 727s + local suite=sid 727s + local dscf=main/example_2.0-2+nmu1.dsc 727s + t-archive-query-aq sid example 2.0-2+nmu1 main/example_2.0-2+nmu1.dsc 727s + local suite=sid 727s + local p=example 727s + local v=2.0-2+nmu1 727s + local dscf=main/example_2.0-2+nmu1.dsc 727s + local sha 727s ++ sha256sum 727s + sha='fe0843d2071b74105d1326c3e570a090b0507d07d9085e92deccf23a7f24e3f7 -' 727s + echo '2.0-2+nmu1 fe0843d2071b74105d1326c3e570a090b0507d07d9085e92deccf23a7f24e3f7 main/example_2.0-2+nmu1.dsc' 727s + t-aq-archive-updated sid example 727s + local suite=sid 727s + local p=example 727s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 727s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 727s + perl -wne ' 727s use JSON; 727s use strict; 727s our @v; 727s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 727s push @v, { 727s "version" => "$1", 727s "sha256sum" => "$2", 727s "component" => "$3", 727s "filename" => "$4", 727s }; 727s END { 727s my $json = JSON->new->canonical(); 727s print $json->encode(\@v) or die $!; 727s } 727s ' 727s + : 'rebase nmu onto our branch' 727s + t-git-next-date 727s + GIT_COMMITTER_DATE='1530000007 +0100' 727s + GIT_AUTHOR_DATE='1530000007 +0100' 727s + git checkout master 727s Switched to branch 'master' 727s Your branch is ahead of 'origin/master' by 15 commits. 727s (use "git push" to publish your local commits) 727s + t-nmu-causes-ff-fail 727s + t-dgit fetch 727s + local dgit=dgit 727s + pwd 727s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 727s + : ' 727s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 727s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A fetch 727s | git rev-parse --show-toplevel 727s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 727s | git config -z --get-regexp --local '.*' 727s | git config -z --get-regexp --local '.*' 727s | git config -z --get-regexp --global '.*' 727s | git config -z --get-regexp --system '.*' 727s | git symbolic-ref -q HEAD 727s => `refs/heads/master' 727s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 727s canonical suite name for unstable is sid 727s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 727s => `1' 727s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 727s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 727s git_lrfetch_sane iteration 0 727s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 727s => 1b09bea8a4b0249eafd6d5623761abfa79446f68 refs/dgit/sid 727s => 5562a727642ddb44984dc445491cc555aff57e3a refs/tags/archive/test-dummy/2.0-1 727s => 1b826e3c4f76402727ddfb691b16f9c8836c9077 refs/tags/archive/test-dummy/2.0-2 727s => e29324b2b316e3a26c894f118d204dd7c2252253 refs/tags/archive/test-dummy/2.0-2+nmu1 727s => d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/tags/test-dummy/2.0-1 727s => e794227659d22135a5576598c319a08df8aaa331 refs/tags/test-dummy/2.0-2 727s => 0287eb316c75843badfa850fb189b429d1a8e1ff refs/tags/test-dummy/2.0-2+nmu1 727s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 727s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 727s | git for-each-ref refs/dgit-fetch/test-dummy 727s |> 1b09bea8a4b0249eafd6d5623761abfa79446f68 commit refs/dgit-fetch/test-dummy/dgit/sid 727s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 727s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 727s |> e29324b2b316e3a26c894f118d204dd7c2252253 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 727s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 727s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 727s |> 0287eb316c75843badfa850fb189b429d1a8e1ff tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 727s git_lrfetch_sane: tidying any old suite lrfetchrefs 727s | git for-each-ref refs/dgit-fetch/sid 727s git_lrfetch_sane: git fetch --no-insane emulation complete 727s $VAR1 = { 727s 'refs/dgit-fetch/test-dummy/dgit/sid' => '1b09bea8a4b0249eafd6d5623761abfa79446f68', 727s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1' => 'e29324b2b316e3a26c894f118d204dd7c2252253', 727s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '1b826e3c4f76402727ddfb691b16f9c8836c9077', 727s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => 'e794227659d22135a5576598c319a08df8aaa331', 727s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'd436cfd4171093e37c6f84f60ebb7ad387293b21', 727s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1' => '0287eb316c75843badfa850fb189b429d1a8e1ff', 727s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '5562a727642ddb44984dc445491cc555aff57e3a' 727s }; 727s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 727s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/tags/archive/test-dummy/2.0-1 727s currently refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 727s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/tags/archive/test-dummy/2.0-2 727s currently refs/tags/archive/test-dummy/2.0-2=1b826e3c4f76402727ddfb691b16f9c8836c9077 727s |> e29324b2b316e3a26c894f118d204dd7c2252253 tag refs/tags/archive/test-dummy/2.0-2+nmu1 727s currently refs/tags/archive/test-dummy/2.0-2+nmu1=e29324b2b316e3a26c894f118d204dd7c2252253 727s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/tags/test-dummy/2.0-1 727s currently refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 727s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/tags/test-dummy/2.0-2 727s currently refs/tags/test-dummy/2.0-2=e794227659d22135a5576598c319a08df8aaa331 727s |> 0287eb316c75843badfa850fb189b429d1a8e1ff tag refs/tags/test-dummy/2.0-2+nmu1 727s currently refs/tags/test-dummy/2.0-2+nmu1=0287eb316c75843badfa850fb189b429d1a8e1ff 727s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 727s |> 5562a727642ddb44984dc445491cc555aff57e3a tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 727s offered refs/tags/archive/test-dummy/2.0-1=5562a727642ddb44984dc445491cc555aff57e3a 727s |> 1b826e3c4f76402727ddfb691b16f9c8836c9077 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 727s offered refs/tags/archive/test-dummy/2.0-2=1b826e3c4f76402727ddfb691b16f9c8836c9077 727s |> e29324b2b316e3a26c894f118d204dd7c2252253 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 727s offered refs/tags/archive/test-dummy/2.0-2+nmu1=e29324b2b316e3a26c894f118d204dd7c2252253 727s |> d436cfd4171093e37c6f84f60ebb7ad387293b21 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 727s offered refs/tags/test-dummy/2.0-1=d436cfd4171093e37c6f84f60ebb7ad387293b21 727s |> e794227659d22135a5576598c319a08df8aaa331 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 727s offered refs/tags/test-dummy/2.0-2=e794227659d22135a5576598c319a08df8aaa331 727s |> 0287eb316c75843badfa850fb189b429d1a8e1ff tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 727s offered refs/tags/test-dummy/2.0-2+nmu1=0287eb316c75843badfa850fb189b429d1a8e1ff 727s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 727s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2+nmu1.dsc... 727s get_archive_dsc: Version 2.0-2+nmu1 727s last upload to archive: specified git info (test-dummy) 727s GCF| git cat-file --batch 727s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 727s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 727s GCF>| 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s GCF<| 1b09bea8a4b0249eafd6d5623761abfa79446f68 commit 350 727s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s previous reference hash=1b09bea8a4b0249eafd6d5623761abfa79446f68 727s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s fetch_from_archive: lastfetch=1b09bea8a4b0249eafd6d5623761abfa79446f68 727s using existing example_2.0.orig.tar.gz 727s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s fetch mergeinfos: 727s commit 1b09bea8a4b0249eafd6d5623761abfa79446f68 Dgit field in .dsc from archive 727s fetch hash=1b09bea8a4b0249eafd6d5623761abfa79446f68 727s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git merge-base 1b09bea8a4b0249eafd6d5623761abfa79446f68 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s | git rev-parse '1b09bea8a4b0249eafd6d5623761abfa79446f68~0' 727s => `1b09bea8a4b0249eafd6d5623761abfa79446f68' 727s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s | git log -n2 1b09bea8a4b0249eafd6d5623761abfa79446f68 727s => `commit 1b09bea8a4b0249eafd6d5623761abfa79446f68'... 727s is_gitattrs_setup: found nothing 727s | git ls-tree -lrz -- 1b09bea8a4b0249eafd6d5623761abfa79446f68: 727s dgit ok: fetched into refs/remotes/dgit/dgit/sid 727s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 727s del_lrfetchrefs... 727s del_lrfetchrefs: 1b09bea8a4b0249eafd6d5623761abfa79446f68 refs/dgit-fetch/test-dummy/dgit/sid 727s del_lrfetchrefs: 5562a727642ddb44984dc445491cc555aff57e3a refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 727s del_lrfetchrefs: 1b826e3c4f76402727ddfb691b16f9c8836c9077 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 727s del_lrfetchrefs: e29324b2b316e3a26c894f118d204dd7c2252253 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2+nmu1 727s del_lrfetchrefs: d436cfd4171093e37c6f84f60ebb7ad387293b21 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 727s del_lrfetchrefs: e794227659d22135a5576598c319a08df8aaa331 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 727s del_lrfetchrefs: 0287eb316c75843badfa850fb189b429d1a8e1ff refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2+nmu1 727s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 727s ' 727s + t-expect-fail 'E:Not.*fast-forward' git merge --ff-only dgit/dgit/sid 727s + local 'mpat=E:Not.*fast-forward' 727s + shift 727s + set +o pipefail 727s + LC_MESSAGES=C 727s + LANGUAGE=C 727s + git merge --ff-only dgit/dgit/sid 727s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s fatal: Not possible to fast-forward, aborting. 727s + local 'ps=128 0' 727s + set -o pipefail 727s + case $ps in 727s + t-grep-mpat 'E:Not.*fast-forward' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local 'mpat=E:Not.*fast-forward' 727s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local grepper=fgrep 727s + case "$mpat" in 727s + case "$mpat" in 727s + grepper=egrep 727s + mpat='Not.*fast-forward' 727s + egrep -e 'Not.*fast-forward' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s fatal: Not possible to fast-forward, aborting. 727s + t-expect-fail 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' t-git-debrebase 727s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 727s + shift 727s + set +o pipefail 727s + LC_MESSAGES=C 727s + LANGUAGE=C 727s + t-git-debrebase 727s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local gdr=git-debrebase 727s + : ' 727s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 727s + git-debrebase --dgit=dgit -D 727s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 727s git-debrebase ffq check_specs * 727s git-debrebase ffq merge master 727s git-debrebase ffq check_remote origin remote fetch/merge branch 727s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 727s OK, you are ahead of refs/remotes/origin/master 727s git-debrebase ffq check_remote undef remote push branch 727s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 727s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 727s 727s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 727s + local 'ps=255 0' 727s + set -o pipefail 727s + case $ps in 727s + t-grep-mpat 'E:-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local 'mpat=E:-fdiverged.*refs/remotes/dgit/dgit/sid' 727s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local grepper=fgrep 727s + case "$mpat" in 727s + case "$mpat" in 727s + grepper=egrep 727s + mpat='-fdiverged.*refs/remotes/dgit/dgit/sid' 727s + egrep -e '-fdiverged.*refs/remotes/dgit/dgit/sid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid 727s + git checkout dgit/dgit/sid 727s Note: switching to 'dgit/dgit/sid'. 727s 727s You are in 'detached HEAD' state. You can look around, make experimental 727s changes and commit them, and you can discard any commits you make in this 727s state without impacting any branches by switching back to a branch. 727s 727s If you want to create a new branch to retain commits you create, you may 727s do so (now or later) by using -c with the switch command. Example: 727s 727s git switch -c 727s 727s Or undo this operation with: 727s 727s git switch - 727s 727s Turn off this advice by setting config variable advice.detachedHead to false 727s 727s HEAD is now at 1b09bea Commit patch queue (exported by git-debrebase) 727s + t-expect-fail 'E:CONFLICT.*Commit patch queue' git rebase master 727s + local 'mpat=E:CONFLICT.*Commit patch queue' 727s + shift 727s + set +o pipefail 727s + LC_MESSAGES=C 727s + LANGUAGE=C 727s + git rebase master 727s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s Rebasing (1/4) Rebasing (2/4) Rebasing (3/4) Rebasing (4/4) CONFLICT (modify/delete): debian/patches/series deleted in HEAD and modified in 1b09bea (Commit patch queue (exported by git-debrebase)). Version 1b09bea (Commit patch queue (exported by git-debrebase)) of debian/patches/series left in tree. 727s error: could not apply 1b09bea... Commit patch queue (exported by git-debrebase) 727s hint: Resolve all conflicts manually, mark them as resolved with 727s hint: "git add/rm ", then run "git rebase --continue". 727s hint: You can instead skip this commit: run "git rebase --skip". 727s hint: To abort and get back to the state before "git rebase", run "git rebase --abort". 727s Could not apply 1b09bea... Commit patch queue (exported by git-debrebase) 727s + local 'ps=1 0' 727s + set -o pipefail 727s + case $ps in 727s + t-grep-mpat 'E:CONFLICT.*Commit patch queue' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local 'mpat=E:CONFLICT.*Commit patch queue' 727s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s + local grepper=fgrep 727s + case "$mpat" in 727s + case "$mpat" in 727s + grepper=egrep 727s + mpat='CONFLICT.*Commit patch queue' 727s + egrep -e 'CONFLICT.*Commit patch queue' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 727s Rebasing (1/4) Rebasing (2/4) Rebasing (3/4) Rebasing (4/4) CONFLICT (modify/delete): debian/patches/series deleted in HEAD and modified in 1b09bea (Commit patch queue (exported by git-debrebase)). Version 1b09bea (Commit patch queue (exported by git-debrebase)) of debian/patches/series left in tree. 727s + git rebase --skip 727s Successfully rebased and updated detached HEAD. 727s + git push . HEAD:master 727s To . 727s 74d5f58..6e3d7e5 HEAD -> master 727s + git checkout master 727s Switched to branch 'master' 727s Your branch is ahead of 'origin/master' by 18 commits. 727s (use "git push" to publish your local commits) 727s + t-nmu-reconciled-good nmu 727s + local nmutree=nmu 727s + : 'check that what we have is what is expected' 727s + git checkout -b compare.nmu origin/master~0 727s Switched to a new branch 'compare.nmu' 727s + git checkout nmu . 727s Updated 4 paths from b5b2617 727s + git rm -rf debian/patches 727s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 727s rm 'debian/patches/0002-Edit-the-.c-file.patch' 727s rm 'debian/patches/0004-UPSTREAM-NMU.patch' 727s rm 'debian/patches/series' 727s rm 'debian/patches/subdir/addnewups' 727s + git commit -m 'rm patches nmu' 727s [compare.nmu b6a6629] rm patches nmu 727s 6 files changed, 7 insertions(+), 50 deletions(-) 727s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 727s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 727s delete mode 100644 debian/patches/series 727s delete mode 100644 debian/patches/subdir/addnewups 727s create mode 100644 newsrc.c 727s + git checkout -b compare.maintainer origin/master~0 727s Switched to a new branch 'compare.maintainer' 727s + git checkout did.maintainer . 727s Updated 3 paths from 27ebb24 727s + git rm -rf --ignore-unmatch debian/patches 727s rm 'debian/patches/0001-Add-a-new-upstream-file.patch' 727s rm 'debian/patches/0002-Edit-the-.c-file.patch' 727s rm 'debian/patches/series' 727s rm 'debian/patches/subdir/addnewups' 727s + git commit --allow-empty -m 'rm patches maintainer' 727s [compare.maintainer c6ef209] rm patches maintainer 727s 7 files changed, 10 insertions(+), 50 deletions(-) 727s delete mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 727s delete mode 100644 debian/patches/0002-Edit-the-.c-file.patch 727s delete mode 100644 debian/patches/series 727s delete mode 100644 debian/patches/subdir/addnewups 727s create mode 100644 debian/zorkmid 727s + git merge compare.nmu 727s Auto-merging debian/changelog 727s Merge made by the 'ort' strategy. 727s debian/changelog | 6 ++++++ 727s newsrc.c | 1 + 727s 2 files changed, 7 insertions(+) 727s create mode 100644 newsrc.c 727s + git diff --quiet master 727s + : 'check that dgit still likes it' 727s + git checkout master 727s Switched to branch 'master' 727s Your branch is ahead of 'origin/master' by 18 commits. 727s (use "git push" to publish your local commits) 727s + t-dgit -wgf quilt-fixup 727s + local dgit=dgit 727s + pwd 727s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 727s + : ' 727s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 727s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 728s | git rev-parse --show-toplevel 728s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 728s | git config -z --get-regexp --local '.*' 728s | git config -z --get-regexp --local '.*' 728s | git config -z --get-regexp --global '.*' 728s | git config -z --get-regexp --system '.*' 728s format 3.0 (quilt), quilt mode linear 728s Format `3.0 (quilt)', need to check/update patch stack 728s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 728s => `' 728s + git diff --quiet HEAD 728s + git clean -xdff 728s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 728s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 728s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 728s | git rev-parse 'HEAD~0' 728s => `6e3d7e5dc883530475bbf126c39e6594671419bd' 728s | git symbolic-ref -q HEAD 728s => `refs/heads/master' 728s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 728s CD work 728s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 728s + git reset -q --hard 6e3d7e5dc883530475bbf126c39e6594671419bd 728s examining quilt state (multiple patches, linear mode) 728s branch_is_gdr 6e3d7e5dc883530475bbf126c39e6594671419bd... 728s branch_is_gdr 74d5f586ed443ce47434f30fbbeff3eacb36748d gdr pseudomerge YES 728s + git reset -q --hard 6e3d7e5dc883530475bbf126c39e6594671419bd 728s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 728s HEAD is now at 21f6391 Commit patch queue (exported by git-debrebase) 728s | git rev-parse 'HEAD~0' 728s => `21f639160e5dacd131368f53dfa4359a434ed750' 728s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 728s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 728s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 728s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 728s CD fake 728s | find -name .git -prune -print0 728s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 728s + git checkout -f 21f639160e5dacd131368f53dfa4359a434ed750 -- debian 728s + git add -Af . 728s | git write-tree 728s => `1fa546e6d762855593875b228f8ace524e583faa' 728s fake orig tree object 1fa546e6d762855593875b228f8ace524e583faa 728s CD .. 728s + git reset -q --hard 21f639160e5dacd131368f53dfa4359a434ed750 728s CD ../fake 728s + git add -Af . 728s | git write-tree 728s => `4f034dbfc0af0cdca7861e42ea8735719d11b63f' 728s fake o+d/p tree object 1fa546e6d762855593875b228f8ace524e583faa 728s CD ../work 728s | git ls-tree --name-only -z 21f639160e5dacd131368f53dfa4359a434ed750 728s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 728s | git diff-tree -z --no-renames -r 1fa546e6d762855593875b228f8ace524e583faa 21f639160e5dacd131368f53dfa4359a434ed750 728s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:000000 100644 0000000000000000000000000000000000000000 20f7624364ec18735d627fc84c64fce3dee6115b A\x00newsrc.c\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 27e8e51c7f66da756b386ed5ebb1d42aef75fbc3 M\x00src.c\x00' 728s quiltify_trees_differ 1fa546e6d762855593875b228f8ace524e583faa 21f639160e5dacd131368f53dfa4359a434ed750 => 1 728s | git diff-tree -z --no-renames --name-only -r 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f 728s => `' 728s quiltify_trees_differ 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 0 728s | git diff-tree -z --no-renames --name-only -r 1fa546e6d762855593875b228f8ace524e583faa 4f034dbfc0af0cdca7861e42ea8735719d11b63f 728s => `lib.c\x00new-upstream-file\x00newsrc.c\x00src.c\x00' 728s quiltify_trees_differ 1fa546e6d762855593875b228f8ace524e583faa 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 1 728s differences @dl ## ## == == == ==. 728s dgit: base trees orig=1fa546e6d76285559387 o+d/p=4f034dbfc0af0cdca786 728s dgit: quilt differences: src: ## orig ## gitignores: == orig == 728s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 728s starting quiltify (multiple patches, linear mode) 728s | git ls-tree --name-only 21f639160e5dacd131368f53dfa4359a434ed750 -- debian/rules debian/control 728s => `debian/control'... 728s quiltify investigate 21f639160e5dacd131368f53dfa4359a434ed750 728s | git diff-tree -z --no-renames --name-only 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f 728s => `' 728s quiltify_trees_differ 21f639160e5dacd131368f53dfa4359a434ed750 4f034dbfc0af0cdca7861e42ea8735719d11b63f => 0 728s search finished hooray! 728s quiltify linearisation planning successful, executing... 728s + git checkout -q master 728s | git status --ignored --porcelain 728s => `?? .pc/' 728s nothing quilty to commit, ok. 728s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 728s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 728s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 728s ' 728s + t-ok 728s + : ======================================== 728s + t-check-only-bpd 728s + '[' .. = .. ']' 728s + return 728s + t-fscks 728s + shopt -s nullglob 728s + for d in $tmp/*/.git $tmp/git/*.git 728s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 728s + t-git-fsck 728s ++ git rev-parse --git-dir 728s + local fsckerrs=.git/dgit-test-fsck.errs 728s + set +e 728s + LC_MESSAGES=C 728s + git fsck --no-dangling --strict 728s + tee .git/dgit-test-fsck.errs 728s + ps='0 0' 728s + set -e 728s + local pats 728s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 728s + test '0 0' = '0 0' 728s + pats+=(-e 'notice: HEAD points to an unborn branch') 728s + pats+=(-e 'notice: No default references') 728s + set +e 728s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 728s + rc=1 728s + set -e 728s + case $rc in 728s + for d in $tmp/*/.git $tmp/git/*.git 728s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 728s + t-git-fsck 728s ++ git rev-parse --git-dir 728s + local fsckerrs=./dgit-test-fsck.errs 728s + set +e 728s + LC_MESSAGES=C 728s + git fsck --no-dangling --strict 728s + tee ./dgit-test-fsck.errs 728s notice: HEAD points to an unborn branch (master) 728s + ps='0 0' 728s + set -e 728s + local pats 728s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 728s + test '0 0' = '0 0' 728s + pats+=(-e 'notice: HEAD points to an unborn branch') 728s + pats+=(-e 'notice: No default references') 728s + set +e 728s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 728s + rc=1 728s + set -e 728s + case $rc in 728s + t-save-artifacts 728s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts 728s + '[' x/tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts = x ']' 728s + '[' xtmp = x ']' 728s + GZIP=-1v 728s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-diverge-nmu-dgit-artifacts/gdr-diverge-nmu-dgit.tar.gz '--exclude=*.tar' . 728s gzip: warning: GZIP environment variable is deprecated; use an alias or script 728s 80.5% 728s + echo ok. 728s ok. 728s + rc=0 728s + set +x 728s + set +e 728s + pwd 728s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 728s + '[' x '!=' x ']' 728s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 728s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 728s + set -e 728s + test 0 = 0 729s autopkgtest [12:30:23]: test gdr-diverge-nmu-dgit: -----------------------] 729s autopkgtest [12:30:23]: test gdr-diverge-nmu-dgit: - - - - - - - - - - results - - - - - - - - - - 729s gdr-diverge-nmu-dgit PASS 729s autopkgtest [12:30:23]: test gdr-edits: preparing testbed 729s Reading package lists... 729s Building dependency tree... 730s Reading state information... 730s Starting pkgProblemResolver with broken count: 0 730s Starting 2 pkgProblemResolver with broken count: 0 730s Done 730s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 730s autopkgtest [12:30:24]: test gdr-edits: [----------------------- 730s ++ set -o pipefail 730s ++ . tests/lib-core 730s ++ . tests/lib-restricts 730s ++ trap ' 730s rc=$? 730s set +x 730s test $rc = 0 || echo " 730s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 730s 730s Most relevant logs are just before assignment rc=$rc 730s Will now do cleanup etc. 730s " 730s set -x 730s set +e 730s pwd 730s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 730s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 730s set -e 730s test $rc = 0 || t-report-failure 730s ' EXIT 730s ++ t-filter-out-git-hyphen-dir 730s ++ local pathent 730s +++ type -p git-rev-parse 730s +++ : 730s ++ pathent= 730s ++ case "$pathent" in 730s ++ return 730s ++ t-set-intree 730s ++ '[' x = x ']' 730s ++ return 730s ++ : -D 730s ++ export DGIT_TEST_DEBUG 730s ++ : x 730s ++ export DGIT_TEST_DEBPUSH_DEBUG 730s ++ : 730s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 730s ++ GIT_COMMITTER_DATE='1530000000 +0100' 730s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 730s ++ GIT_AUTHOR_DATE='1530000000 +0100' 730s ++ export LC_CTYPE=C.UTF-8 730s ++ LC_CTYPE=C.UTF-8 730s ++ unset CDPATH 730s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 730s ++ FILTER_BRANCH_SQUELCH_WARNING=1 730s +++ pwd 730s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 730s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ testname=gdr-edits 730s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ bpd=.. 730s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 730s ++ '[' x '!=' x ']' 730s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s +++ pwd 730s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ t-set-using-tmp 730s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 730s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 730s ++ export 'DEBFULLNAME=dgit test git user' 730s ++ DEBFULLNAME='dgit test git user' 730s ++ git config --global user.email dgit-test@debian.example.net 730s ++ git config --global user.name 'dgit test git user' 730s ++ git config --global protocol.ext.allow always 730s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 730s ++ env -0 730s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 730s ++ export DEBCHANGE_VENDOR=dpkg 730s ++ DEBCHANGE_VENDOR=dpkg 730s ++ unset VISUAL 730s ++ unset GIT_EDITOR 730s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 730s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 730s ++ cat 730s ++ schroot=build 730s ++ : aq 730s ++ : archive/test-dummy 730s ++ : sid:unstable 730s ++ t-git-config dgit.default.old-dsc-distro test-dummy 730s ++ git config --global dgit.default.old-dsc-distro test-dummy 730s ++ for import in ${autoimport-gnupg} 730s ++ case "$0" in 730s ++ t-setup-import gnupg 730s ++ local setupname=gnupg 730s ++ local setupsrc 730s ++ local lock 730s ++ '[' x = x ']' 730s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 730s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 730s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 730s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 730s cd "$1"; shift 730s setupname="$1"; shift 730s simport="$1"; shift 730s if [ -e "$simport" ]; then exit 0; fi 730s env - "$@" \ 730s "tests/setup/$setupname" 730s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 730s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 730s + shift 730s + setupname=gnupg 730s + shift 730s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 730s + shift 730s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 730s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-edits-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-edits-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-edits-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-edits -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-edits' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-edits-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-edits-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 730s ++ set -o pipefail 730s ++ . tests/lib-core 730s ++ . tests/lib-restricts 730s ++ trap ' 730s rc=$? 730s set +x 730s test $rc = 0 || echo " 730s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 730s 730s Most relevant logs are just before assignment rc=$rc 730s Will now do cleanup etc. 730s " 730s set -x 730s set +e 730s pwd 730s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 730s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 730s set -e 730s test $rc = 0 || t-report-failure 730s ' EXIT 730s ++ t-filter-out-git-hyphen-dir 730s ++ local pathent 730s +++ type -p git-rev-parse 730s +++ : 730s ++ pathent= 730s ++ case "$pathent" in 730s ++ return 730s ++ t-set-intree 730s ++ '[' x = x ']' 730s ++ return 730s ++ : -D 730s ++ export DGIT_TEST_DEBUG 730s ++ : x 730s ++ export DGIT_TEST_DEBPUSH_DEBUG 730s ++ : 730s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 730s ++ GIT_COMMITTER_DATE='1530000000 +0100' 730s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 730s ++ GIT_AUTHOR_DATE='1530000000 +0100' 730s ++ export LC_CTYPE=C.UTF-8 730s ++ LC_CTYPE=C.UTF-8 730s ++ unset CDPATH 730s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 730s ++ FILTER_BRANCH_SQUELCH_WARNING=1 730s +++ pwd 730s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 730s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ testname=gnupg 730s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 730s ++ bpd=.. 730s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 730s ++ '[' x '!=' x ']' 730s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s +++ pwd 730s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ t-set-using-tmp 730s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 730s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 730s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 730s ++ export 'DEBFULLNAME=dgit test git user' 730s ++ DEBFULLNAME='dgit test git user' 730s ++ git config --global user.email dgit-test@debian.example.net 730s ++ git config --global user.name 'dgit test git user' 730s ++ git config --global protocol.ext.allow always 730s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 730s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 730s ++ export DEBCHANGE_VENDOR=dpkg 730s ++ DEBCHANGE_VENDOR=dpkg 730s ++ unset VISUAL 730s ++ unset GIT_EDITOR 730s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 730s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 730s ++ cat 730s ++ schroot=build 730s ++ : aq 730s ++ : archive/test-dummy 730s ++ : sid:unstable 730s ++ t-git-config dgit.default.old-dsc-distro test-dummy 730s ++ git config --global dgit.default.old-dsc-distro test-dummy 730s ++ for import in ${autoimport-gnupg} 730s ++ case "$0" in 730s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 730s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 730s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 730s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 730s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 730s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 730s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 730s + setup=' 730s export GNUPGHOME=$tmp/gnupg 730s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 730s 730s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 730s ssb rsa2048 2013-11-17 [E] 730s 730s sec rsa2048 2014-01-26 [SC] 730s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 730s uid [ultimate] Populus Romanus (test key) 730s ssb rsa2048 2014-01-26 [E] 730s 730s sec rsa2048 2014-01-26 [SC] 730s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 730s uid [ unknown] Hannibal (test key) 730s ssb rsa2048 2014-01-26 [E] 730s 731s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 731s export GNUPGHOME=$tmp/gnupg 731s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 731s 731s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 731s delete mode 100644 debian/source/format 731s + git tag v1.0 731s + : 'fake up that our quilt-tip was descended from upstream' 731s + git checkout quilt-tip 731s Switched to branch 'quilt-tip' 731s + git merge --no-edit -s ours upstream 731s Merge made by the 'ours' strategy. 731s + : 'fake up that our quilt-tip had the patch queue in it' 731s + git checkout patch-queue/quilt-tip 731s Switched to branch 'patch-queue/quilt-tip' 731s + gbp pq export 731s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 731s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 731s + git add debian/patches 731s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 731s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 731s 4 files changed, 50 insertions(+) 731s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 731s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 731s create mode 100644 debian/patches/series 731s create mode 100644 debian/patches/subdir/addnewups 731s + : 'make branch names more conventional' 731s + git branch -D master 731s Deleted branch master (was 17d67db). 731s + git branch -m quilt-tip master 731s + not-gdr-processable origin 731s + git branch gdr-unprocessable/origin 731s + t-git-debrebase analyse 731s + grep 'Unknown Unprocessable' 731s + local gdr=git-debrebase 731s + : ' 731s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 731s + git-debrebase --dgit=dgit -D analyse 731s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 731s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 731s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 731s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 731s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 731s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 731s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 731s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => $VAR1->{"Parents"}[0]} 731s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 731s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 731s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2,"Ix" => 0}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 731s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 731s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 731s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Type" => "Mixed","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 731s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 731s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 731s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Msg" => "echo EXAMPLE RULES TARGET\n"} 731s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 731s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 731s git-debrebase = Packaging {"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 731s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 731s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 731s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging"} 731s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 731s git-debrebase ** Unknown 731s git-debrebase *** WALK BOMB unrecognised 731s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 731s ' 731s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 731s + : 'fake up an upstream 2.0' 731s + git branch make-upstream upstream 731s + t-make-new-upstream-tarball 2.0 731s + local uv=2.0 731s + git checkout make-upstream 731s Switched to branch 'make-upstream' 731s + echo 'upstream 2.0' 731s + git commit -a -m 'upstream 2.0 tarball' 731s [make-upstream 4db56a8] upstream 2.0 tarball 731s 1 file changed, 1 insertion(+) 731s + t-make-orig example 2.0 make-upstream 731s + local p=example 731s + local v=2.0 731s + local tag=make-upstream 731s + ust=example_2.0.orig.tar.gz 731s + GZIP=-1 731s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 731s gzip: warning: GZIP environment variable is deprecated; use an alias or script 731s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 731s + git branch -D quilt-tip-2 731s Deleted branch quilt-tip-2 (was 99fcab4). 731s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 731s + git branch -D gitish-only 731s Deleted branch gitish-only (was 2b2ddc8). 731s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 731s + git branch -D quilt-tip-1.1 731s Deleted branch quilt-tip-1.1 (was 7fc34be). 731s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 731s + git branch -D patch-queue/quilt-tip 731s Deleted branch patch-queue/quilt-tip (was d843a68). 731s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 731s + git branch -D indep-arch 731s Deleted branch indep-arch (was e215729). 731s + : 'see what gbp import-orig does' 731s + git checkout master 731s Switched to branch 'master' 731s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 731s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 731s gbp:info: Source package is example 731s gbp:info: Upstream version is 2.0 731s gbp:info: Replacing upstream source on 'master' 731s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 731s + not-gdr-processable merge 731s + git branch gdr-unprocessable/merge 731s + t-git-debrebase analyse 731s + local gdr=git-debrebase 731s + : ' 731s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 731s + git-debrebase --dgit=dgit -D analyse 731s + grep 'Unknown Unprocessable' 731s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 731s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 731s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 731s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 731s git-debrebase ** Unknown 731s git-debrebase *** WALK BOMB unrecognised 731s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 731s ' 731s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 731s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 731s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 731s + DEBEMAIL=dgit-tests@example.org 731s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 731s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 731s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 731s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 731s 1 file changed, 6 insertions(+) 731s + t-dch-commit-r 731s + t-dch-r-rune t-dch-commit 731s + local cmd=t-dch-commit 731s + shift 731s + local suite=unstable 731s + t-dch-commit -r -D unstable '' 731s + t-debchange -r -D unstable '' 731s + DEBEMAIL=dgit-tests@example.org 731s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 731s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 731s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 731s libdistro-info-perl is not installed, Debian release names are not known. 731s libdistro-info-perl is not installed, Ubuntu release names are not known. 731s + git commit -m 'dch -r -D unstable ' debian/changelog 731s [master f31021f] dch -r -D unstable 731s 1 file changed, 3 insertions(+), 2 deletions(-) 731s + echo garbage 731s + git add debian/patches/garbage 731s + git commit -m 'add garbage' debian/patches/garbage 731s [master eb10718] add garbage 731s 1 file changed, 1 insertion(+) 731s create mode 100644 debian/patches/garbage 731s + t-archive-none example 731s + t-select-package example 731s + p=example 731s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 731s + t-archive-none-aq 731s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 731s + : 731s + local 'jsondelim=[' 731s + local suitespec 731s + for suitespec in $suitespecs 731s + local suite=sid 731s + local sname=unstable 731s + t-aq-archive-updated sid example 731s + local suite=sid 731s + local p=example 731s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 731s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 731s + perl -wne ' 731s use JSON; 731s use strict; 731s our @v; 731s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 731s push @v, { 731s "version" => "$1", 731s "sha256sum" => "$2", 731s "component" => "$3", 731s "filename" => "$4", 731s }; 731s END { 731s my $json = JSON->new->canonical(); 731s print $json->encode(\@v) or die $!; 731s } 731s ' 731s + t-aq-archive-updated new example 731s + local suite=new 731s + local p=example 731s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 731s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 731s + perl -wne ' 731s use JSON; 731s use strict; 731s our @v; 731s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 731s push @v, { 731s "version" => "$1", 731s "sha256sum" => "$2", 731s "component" => "$3", 731s "filename" => "$4", 731s }; 731s END { 731s my $json = JSON->new->canonical(); 731s print $json->encode(\@v) or die $!; 731s } 731s ' 731s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 731s + cat 731s + jsondelim=' },' 731s + cat 731s + t-git-none 731s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 731s + set -e 731s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 731s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 731s + t-dgit -wgf --gbp push-source --new 731s + local dgit=dgit 731s + pwd 731s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 731s + : ' 731s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 731s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 732s | git rev-parse --show-toplevel 732s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 732s | git config -z --get-regexp --local '.*' 732s | git config -z --get-regexp --local '.*' 732s | git config -z --get-regexp --global '.*' 732s | git config -z --get-regexp --system '.*' 732s format 3.0 (quilt), quilt mode gbp 732s Format `3.0 (quilt)', need to check/update patch stack 732s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 732s => `' 732s + git diff --quiet HEAD 732s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 732s canonical suite name for unstable is sid 732s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 732s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 732s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 732s | git rev-parse 'HEAD~0' 732s => `eb10718ab213ccfa83613ebbddefbffda941a548' 732s | git symbolic-ref -q HEAD 732s => `refs/heads/master' 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 732s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 732s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 732s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 732s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 732s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 3525ec8c5a1122de8512681d802118665edbc69b48f09597b8eab7fa21a62f7f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 732s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 732s >(no reflog) 732s splitbrain cache miss 732s CD work 732s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 732s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 732s + git checkout -q -b dgit-view 732s examining quilt state (multiple patches, gbp mode) 732s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 732s CD fake 732s | find -name .git -prune -print0 732s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 732s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 732s + git add -Af . 732s | git write-tree 732s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 732s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 732s CD .. 732s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 732s CD ../fake 732s + git add -Af . 732s | git write-tree 732s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 732s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 732s CD ../work 732s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 732s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 732s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 732s => `' 732s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 732s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 732s => `lib.c\x00new-upstream-file\x00src.c\x00' 732s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 732s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 732s => `lib.c\x00new-upstream-file\x00src.c\x00' 732s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 732s differences @dl == ## ## == == ==. 732s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 732s dgit: quilt differences: src: == orig ## gitignores: == orig == 732s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 732s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 732s => `1530000000 +0000' 732s dgit view: creating patches-applied version using gbp pq 732s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 732s + git update-ref refs/heads/dgit-view HEAD 732s + git checkout -q dgit-view 732s | git rev-parse 'HEAD~0' 732s => `45ea71a69fa522ce760afdab8a420200443753e9' 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 732s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 732s => `' 732s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 3525ec8c5a1122de8512681d802118665edbc69b48f09597b8eab7fa21a62f7f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 732s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 732s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 732s | git rev-parse 'HEAD~0' 732s => `eb10718ab213ccfa83613ebbddefbffda941a548' 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 732s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 732s dpkg-source: info: using source format '3.0 (quilt)' 732s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 732s dpkg-source: info: using patch list from debian/patches/series 732s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 732s dpkg-source: info: building example in example_2.0-1.dsc 732s CD work 732s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 732s package seems new, not specifying -v 732s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 732s dpkg-genchanges: info: not including original source code in upload 732s CD .. 732s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 732s renaming (Files) example_2.0.orig.tar.gz 732s renaming (Files) example_2.0-1.debian.tar.xz 732s renaming (dsc) example_2.0-1.dsc 732s renaming (changes) example_2.0-1_source.changes 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 732s actually entering push 732s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 732s => `0' 732s + git config remote.dgit.skipdefaultupdate true 732s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 732s get_archive_dsc: nothing in archive, returning undef 732s no version available from the archive 732s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 732s => `' 732s previous reference hash= 732s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 732s => `' 732s fetch_from_archive: lastfetch= 732s nothing found! 732s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 732s + git check-ref-format archive/test-dummy/2.0-1 732s | git symbolic-ref -q HEAD 732s => `refs/heads/master' 732s | git rev-parse 'HEAD~0' 732s => `eb10718ab213ccfa83613ebbddefbffda941a548' 732s ffq_prev_branchinfo branch current refs/heads/master 732s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 732s => `' 732s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 732s => `' 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 732s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 732s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 732s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 732s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 732s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 3525ec8c5a1122de8512681d802118665edbc69b48f09597b8eab7fa21a62f7f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 732s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 732s CD work 732s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 732s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 732s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 732s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 732s splitbrain_pseudomerge... 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 732s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 732s => `' 732s + git diff --quiet HEAD 732s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 732s => `' 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 732s checking that example_2.0-1.dsc corresponds to HEAD 732s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 732s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 732s dpkg-source: info: extracting example in example-2.0 732s dpkg-source: info: unpacking example_2.0.orig.tar.gz 732s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 732s dpkg-source: info: using patch list from debian/patches/series 732s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 732s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 732s dpkg-source: info: applying subdir/addnewups 732s CD example-2.0 732s | find -name .git -prune -print0 732s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 732s + git add -Af . 732s | git write-tree 732s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 732s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 732s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 732s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 732s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 732s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 732s files_compare_inputs example_2.0-1.dsc 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 732s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 732s files_compare_inputs example_2.0-1.dsc Files 732s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 732s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 732s files_compare_inputs example_2.0-1_source.changes 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 732s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 732s files_compare_inputs example_2.0-1_source.changes Files 732s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 732s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 732s checking origs needed (2.0)... 732s checking origs needed placement 'devel extra'... 732s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 732s origs example_2.0.orig.tar.gz is_orig 732s -| sh -ec 'cd "$1"; shift 732s 732s find -name "$1" -print0 | 732s xargs -0r sha256sum 732s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 732s origs example_2.0.orig.tar.gz $#$have=-1 732s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 732s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 732s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 732s push_tagwants: $VAR1 = [ 732s '2.0-1', 732s '45ea71a69fa522ce760afdab8a420200443753e9', 732s 'eb10718ab213ccfa83613ebbddefbffda941a548', 732s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 732s ]; 732s $VAR2 = [ 732s { 732s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 732s 'Tag' => 'archive/test-dummy/2.0-1', 732s 'TfSuffix' => '', 732s 'TagFn' => sub { "DUMMY" }, 732s 'Tfn' => sub { "DUMMY" }, 732s 'View' => 'dgit' 732s }, 732s { 732s 'View' => 'maint', 732s 'Tfn' => sub { "DUMMY" }, 732s 'TfSuffix' => '-maintview', 732s 'TagFn' => sub { "DUMMY" }, 732s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 732s 'Tag' => 'test-dummy/2.0-1' 732s } 732s ]; 732s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 732s => `1530000000 +0000' 732s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 733s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 733s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 733s => `7a1411309d59816b6d8ebb65d239ac3739d8ac97' 733s + git verify-tag 7a1411309d59816b6d8ebb65d239ac3739d8ac97 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s gpg: Signature made Mon Mar 31 12:30:26 2025 UTC 733s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 733s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 733s gpg: WARNING: This key is not certified with a trusted signature! 733s gpg: There is no indication that the signature belongs to the owner. 733s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 733s + git update-ref refs/tags/archive/test-dummy/2.0-1 7a1411309d59816b6d8ebb65d239ac3739d8ac97 733s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 733s => `5321d467d2b15389865869a1959ddf06cd732480' 733s + git verify-tag 5321d467d2b15389865869a1959ddf06cd732480 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s gpg: Signature made Mon Mar 31 12:30:26 2025 UTC 733s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 733s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 733s gpg: WARNING: This key is not certified with a trusted signature! 733s gpg: There is no indication that the signature belongs to the owner. 733s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 733s + git update-ref refs/tags/test-dummy/2.0-1 5321d467d2b15389865869a1959ddf06cd732480 733s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 733s => `0' 733s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 733s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 733s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 733s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 733s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 733s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 733s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 733s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 733s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s 733s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 733s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 733s 733s Successfully signed dsc, changes files 733s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 733s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 733s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 733s D: Setting host argument. 733s Checking signature on .changes 733s Checking signature on .dsc 733s Uploading to test-dummy (via local to localhost): 733s Successfully uploaded packages. 733s dgit ok: pushed and uploaded 2.0-1 733s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 733s del_lrfetchrefs... 733s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 733s ' 733s + t-salsa-add-remote 733s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 733s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 733s + set -e 733s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 733s + git init --bare 733s hint: Using 'master' as the name for the initial branch. This default branch name 733s hint: is subject to change. To configure the initial branch name to use in all 733s hint: of your new repositories, which will suppress this warning, call: 733s hint: 733s hint: git config --global init.defaultBranch 733s hint: 733s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 733s hint: 'development'. The just-created branch can be renamed via this command: 733s hint: 733s hint: git branch -m 733s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 733s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 733s + git push --set-upstream origin master 733s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 733s * [new branch] master -> master 733s Branch 'master' set up to track remote branch 'master' from 'origin'. 733s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 733s + local 'mpat=E:identical in upstream files' 733s + shift 733s + set +o pipefail 733s + LC_MESSAGES=C 733s + LANGUAGE=C 733s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 733s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 733s + local gdr=git-debrebase 733s + : ' 733s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 733s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 733s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 733s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 733s docs/README | 1 + 733s 1 file changed, 1 insertion(+) 733s 733s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 733s git-debrebase: identical in upstream files. See diffstat above, or run 733s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 733s + local 'ps=255 0' 733s + set -o pipefail 733s + case $ps in 733s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 733s + local 'mpat=E:identical in upstream files' 733s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 733s + local grepper=fgrep 733s + case "$mpat" in 733s + case "$mpat" in 733s + grepper=egrep 733s + mpat='identical in upstream files' 733s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 733s git-debrebase: identical in upstream files. See diffstat above, or run 733s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 733s + local 'mpat=E:Unused patch file garbage will be discarded' 733s + shift 733s + set +o pipefail 733s + LC_MESSAGES=C 733s + LANGUAGE=C 733s + t-git-debrebase -fupstream-has-debian convert-from-gbp 733s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 733s + local gdr=git-debrebase 733s + : ' 733s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 733s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 733s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 733s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 733s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 733s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 734s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 734s $VAR2 = bless( do{\(my $o = { 734s 'allow_duplicate' => 0, 734s 'allow_pgp' => 1, 734s 'keep_duplicate' => 0, 734s 'is_pgp_signed' => 0, 734s 'fields' => { 734s 'Source' => 'example', 734s 'Version' => '2.0-1', 734s 'Distribution' => 'unstable', 734s 'Urgency' => 'medium', 734s 'Maintainer' => 'dgit test git user ', 734s 'Timestamp' => '1530000000', 734s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 734s 'Changes' => ' 734s example (2.0-1) unstable; urgency=medium 734s 734s [ Ian Jackson ] 734s * new upstream (did gbp import-orig)' 734s }, 734s 'in_order' => [ 734s 'Source', 734s 'Version', 734s 'Distribution', 734s 'Urgency', 734s 'Maintainer', 734s 'Timestamp', 734s 'Date', 734s 'Changes' 734s ], 734s 'drop_empty' => 0, 734s 'name' => 'debian/changelog, entry no.1', 734s 'out_order' => [] 734s })}, 'Dpkg::Control::Hash' ); 734s last finished-looking changelog entry: (2.0-1) unstable 734s will stitch in dgit view, archive/test-dummy/2.0-1 734s git-debrebase: snags: 1 overriden by individual -f options 734s 734s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 734s + local 'ps=255 0' 734s + set -o pipefail 734s + case $ps in 734s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 734s + local 'mpat=E:Unused patch file garbage will be discarded' 734s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 734s + local grepper=fgrep 734s + case "$mpat" in 734s + case "$mpat" in 734s + grepper=egrep 734s + mpat='Unused patch file garbage will be discarded' 734s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 734s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 734s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 734s + local gdr=git-debrebase 734s + : ' 734s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 734s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 734s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 734s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 734s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 734s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 734s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 734s $VAR2 = bless( do{\(my $o = { 734s 'out_order' => [], 734s 'allow_pgp' => 1, 734s 'allow_duplicate' => 0, 734s 'fields' => { 734s 'Source' => 'example', 734s 'Version' => '2.0-1', 734s 'Distribution' => 'unstable', 734s 'Urgency' => 'medium', 734s 'Maintainer' => 'dgit test git user ', 734s 'Timestamp' => '1530000000', 734s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 734s 'Changes' => ' 734s example (2.0-1) unstable; urgency=medium 734s 734s [ Ian Jackson ] 734s * new upstream (did gbp import-orig)' 734s }, 734s 'is_pgp_signed' => 0, 734s 'in_order' => [ 734s 'Source', 734s 'Version', 734s 'Distribution', 734s 'Urgency', 734s 'Maintainer', 734s 'Timestamp', 734s 'Date', 734s 'Changes' 734s ], 734s 'name' => 'debian/changelog, entry no.1', 734s 'drop_empty' => 0, 734s 'keep_duplicate' => 0 734s })}, 'Dpkg::Control::Hash' ); 734s last finished-looking changelog entry: (2.0-1) unstable 734s will stitch in dgit view, archive/test-dummy/2.0-1 734s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 734s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 734s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 734s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 734s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 734s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 734s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 734s git-debrebase ffq check_specs * 734s git-debrebase ffq merge master 734s git-debrebase ffq check_remote origin remote fetch/merge branch 734s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 734s OK, you are ahead of refs/remotes/origin/master 734s git-debrebase ffq check_remote undef remote push branch 734s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 734s OK, you are ahead of refs/remotes/dgit/dgit/sid 734s git-debrebase: snags: 2 overriden by individual -f options 734s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 734s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 734s git-debrebase >$ 734s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 734s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 734s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 734s ' 734s + git branch converted-from-gbp 734s + v=2.0-2 734s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 734s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 734s + DEBEMAIL=dgit-tests@example.org 734s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 734s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 734s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 734s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 734s 1 file changed, 6 insertions(+) 734s + t-dch-commit-r 734s + t-dch-r-rune t-dch-commit 734s + local cmd=t-dch-commit 734s + shift 734s + local suite=unstable 734s + t-dch-commit -r -D unstable '' 734s + t-debchange -r -D unstable '' 734s + DEBEMAIL=dgit-tests@example.org 734s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 734s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 734s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 734s libdistro-info-perl is not installed, Debian release names are not known. 734s libdistro-info-perl is not installed, Ubuntu release names are not known. 734s + git commit -m 'dch -r -D unstable ' debian/changelog 734s [master 4af0243] dch -r -D unstable 734s 1 file changed, 1 insertion(+), 1 deletion(-) 734s + t-dgit -wgf push-source --new 734s + local dgit=dgit 734s + pwd 734s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 734s + : ' 734s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 734s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 734s | git rev-parse --show-toplevel 734s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 734s | git config -z --get-regexp --local '.*' 734s | git config -z --get-regexp --local '.*' 734s | git config -z --get-regexp --global '.*' 734s | git config -z --get-regexp --system '.*' 734s format 3.0 (quilt), quilt mode linear 734s Format `3.0 (quilt)', need to check/update patch stack 734s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 734s => `' 734s + git diff --quiet HEAD 734s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 734s canonical suite name for unstable is sid 734s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 734s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 734s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 734s | git rev-parse 'HEAD~0' 734s => `4af0243f9227b0d695fbff38df345aca23969e2e' 734s | git symbolic-ref -q HEAD 734s => `refs/heads/master' 734s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 734s CD work 734s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 734s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 734s examining quilt state (multiple patches, linear mode) 734s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 734s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 734s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 734s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 735s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 735s | git rev-parse 'HEAD~0' 735s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 735s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 735s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 735s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 735s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 735s CD fake 735s | find -name .git -prune -print0 735s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 735s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 735s + git add -Af . 735s | git write-tree 735s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 735s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 735s CD .. 735s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s CD ../fake 735s + git add -Af . 735s | git write-tree 735s => `607612c46d7ea5b66697b830f1a50f069061d460' 735s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 735s CD ../work 735s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 735s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 735s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 735s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 735s => `' 735s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 735s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 735s => `lib.c\x00new-upstream-file\x00src.c\x00' 735s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 735s differences @dl ## ## == == == ==. 735s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 735s dgit: quilt differences: src: ## orig ## gitignores: == orig == 735s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 735s starting quiltify (multiple patches, linear mode) 735s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 735s => `debian/control'... 735s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 735s => `' 735s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 735s search finished hooray! 735s quiltify linearisation planning successful, executing... 735s + git checkout -q master 735s | git status --ignored --porcelain 735s => `?? .pc/' 735s nothing quilty to commit, ok. 735s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 735s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 735s | git rev-parse 'HEAD~0' 735s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 735s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 735s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 735s CD work 735s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 735s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s CD .. 735s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 735s dpkg-source: info: using source format '3.0 (quilt)' 735s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 735s dpkg-source: info: using patch list from debian/patches/series 735s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 735s dpkg-source: info: building example in example_2.0-2.dsc 735s CD work 735s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 735s package seems new, not specifying -v 735s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 735s dpkg-genchanges: info: not including original source code in upload 735s CD .. 735s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 735s renaming (Files) example_2.0.orig.tar.gz 735s renaming (Files) example_2.0-2.debian.tar.xz 735s renaming (dsc) example_2.0-2.dsc 735s renaming (changes) example_2.0-2_source.changes 735s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 735s actually entering push 735s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 735s => `1' 735s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 735s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 735s git_lrfetch_sane iteration 0 735s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 735s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 735s => 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/tags/archive/test-dummy/2.0-1 735s => 5321d467d2b15389865869a1959ddf06cd732480 refs/tags/test-dummy/2.0-1 735s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 735s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 735s | git for-each-ref refs/dgit-fetch/test-dummy 735s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 735s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 735s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 735s git_lrfetch_sane: tidying any old suite lrfetchrefs 735s | git for-each-ref refs/dgit-fetch/sid 735s git_lrfetch_sane: git fetch --no-insane emulation complete 735s $VAR1 = { 735s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '5321d467d2b15389865869a1959ddf06cd732480', 735s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '7a1411309d59816b6d8ebb65d239ac3739d8ac97', 735s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 735s }; 735s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 735s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/tags/archive/test-dummy/2.0-1 735s currently refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 735s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/tags/test-dummy/2.0-1 735s currently refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 735s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 735s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 735s offered refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 735s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 735s offered refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 735s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 735s get_archive_dsc: nothing in archive, returning undef 735s no version available from the archive 735s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 735s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 735s 735s Package not found in the archive, but has allegedly been pushed using dgit. 735s Perhaps the upload is stuck in incoming. Using the version from git. 735s 735s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s fetch mergeinfos: 735s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 735s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 735s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 735s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 735s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 735s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 735s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 735s + git check-ref-format archive/test-dummy/2.0-2 735s | git symbolic-ref -q HEAD 735s => `refs/heads/master' 735s | git rev-parse 'HEAD~0' 735s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 735s ffq_prev_branchinfo branch current refs/heads/master 735s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 735s => `' 735s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 735s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 735s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 735s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 735s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 735s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 735s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 735s | git status --ignored --porcelain 735s => `' 735s nothing quilty to commit, ok. 735s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 735s => `' 735s + git diff --quiet HEAD 735s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 735s => `45ea71a69fa522ce760afdab8a420200443753e9' 735s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 735s => `' 735s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 735s checking that example_2.0-2.dsc corresponds to HEAD 735s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 735s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 735s dpkg-source: info: extracting example in example-2.0 735s dpkg-source: info: unpacking example_2.0.orig.tar.gz 735s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 735s dpkg-source: info: using patch list from debian/patches/series 735s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 735s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 735s dpkg-source: info: applying subdir/addnewups 735s CD example-2.0 735s | find -name .git -prune -print0 735s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 736s + git add -Af . 736s | git write-tree 736s => `607612c46d7ea5b66697b830f1a50f069061d460' 736s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 736s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 736s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 736s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 736s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 736s files_compare_inputs example_2.0-2.dsc 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 736s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 736s files_compare_inputs example_2.0-2.dsc Files 736s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 736s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 736s files_compare_inputs example_2.0-2_source.changes 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 736s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 736s files_compare_inputs example_2.0-2_source.changes Files 736s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 736s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 736s checking origs needed (2.0)... 736s checking origs needed placement 'devel extra'... 736s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 736s origs example_2.0.orig.tar.gz is_orig 736s -| sh -ec 'cd "$1"; shift 736s 736s find -name "$1" -print0 | 736s xargs -0r sha256sum 736s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 736s origs example_2.0.orig.tar.gz $#$have=-1 736s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 736s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 736s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 736s push_tagwants: $VAR1 = [ 736s '2.0-2', 736s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 736s undef, 736s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 736s ]; 736s $VAR2 = [ 736s { 736s 'TagFn' => sub { "DUMMY" }, 736s 'Tag' => 'archive/test-dummy/2.0-2', 736s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 736s 'View' => 'dgit', 736s 'TfSuffix' => '', 736s 'Tfn' => sub { "DUMMY" } 736s }, 736s { 736s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 736s 'View' => 'dgit', 736s 'Tag' => 'test-dummy/2.0-2', 736s 'TagFn' => sub { "DUMMY" }, 736s 'Tfn' => sub { "DUMMY" }, 736s 'TfSuffix' => '-dgit' 736s } 736s ]; 736s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 736s => `1530000000 +0000' 736s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 736s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 736s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 736s => `3f4f9cd709229d294801bafc0015fe2ec36cac94' 736s + git verify-tag 3f4f9cd709229d294801bafc0015fe2ec36cac94 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s gpg: Signature made Mon Mar 31 12:30:29 2025 UTC 736s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 736s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 736s gpg: WARNING: This key is not certified with a trusted signature! 736s gpg: There is no indication that the signature belongs to the owner. 736s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 736s + git update-ref refs/tags/archive/test-dummy/2.0-2 3f4f9cd709229d294801bafc0015fe2ec36cac94 736s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 736s => `659a7f09c29b2c1398610b9a08354d39cd707293' 736s + git verify-tag 659a7f09c29b2c1398610b9a08354d39cd707293 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s gpg: Signature made Mon Mar 31 12:30:29 2025 UTC 736s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 736s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 736s gpg: WARNING: This key is not certified with a trusted signature! 736s gpg: There is no indication that the signature belongs to the owner. 736s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 736s + git update-ref refs/tags/test-dummy/2.0-2 659a7f09c29b2c1398610b9a08354d39cd707293 736s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 736s => `1' 736s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 736s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 736s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 736s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 736s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 736s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 736s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 736s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s 736s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 736s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 736s 736s Successfully signed dsc, changes files 736s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 736s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 736s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 736s D: Setting host argument. 736s Checking signature on .changes 736s Checking signature on .dsc 736s Package includes an .orig.tar.gz file although the debian revision suggests 736s that it might not be required. Multiple uploads of the .orig.tar.gz may be 736s rejected by the upload queue management software. 736s Uploading to test-dummy (via local to localhost): 736s Successfully uploaded packages. 736s dgit ok: pushed and uploaded 2.0-2 736s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 736s del_lrfetchrefs... 736s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 736s del_lrfetchrefs: 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 736s del_lrfetchrefs: 5321d467d2b15389865869a1959ddf06cd732480 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 736s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 736s ' 736s + git push 736s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 736s eb10718..6b22dd5 master -> master 736s + cd .. 736s + t-archive-process-incoming sid 736s + local suite=sid 736s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 736s + t-archive-query sid 736s + local suite=sid 736s + local dscf=main/example_2.0-2.dsc 736s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 736s + local suite=sid 736s + local p=example 736s + local v=2.0-2 736s + local dscf=main/example_2.0-2.dsc 736s + local sha 736s ++ sha256sum 736s + sha='c0e26ebf284c1cbd98eb389da922e5debb5264de2ec5339f243dd179d5b6e1e9 -' 736s + echo '2.0-2 c0e26ebf284c1cbd98eb389da922e5debb5264de2ec5339f243dd179d5b6e1e9 main/example_2.0-2.dsc' 736s + t-aq-archive-updated sid example 736s + local suite=sid 736s + local p=example 736s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 736s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 736s + perl -wne ' 736s use JSON; 736s use strict; 736s our @v; 736s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 736s push @v, { 736s "version" => "$1", 736s "sha256sum" => "$2", 736s "component" => "$3", 736s "filename" => "$4", 736s }; 736s END { 736s my $json = JSON->new->canonical(); 736s print $json->encode(\@v) or die $!; 736s } 736s ' 736s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 736s ++ echo git mirror aq 736s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 736s . $troot/lib-gdr 736s t-tstunt-parsechangelog 736s p=example 736s t-git-next-date 736s ' 736s + local savevars= 736s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 736s + local 'importeval= 736s . $troot/lib-gdr 736s t-tstunt-parsechangelog 736s p=example 736s t-git-next-date 736s ' 736s + local import=IMPORT.gdr-convert-gbp 736s + exec 736s + local vn 736s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 736s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 736s print STDERR "saving-exporting $vn\n"; 736s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 736s or die $!; 736s } 736s ' 736s saving-exporting DGIT_TEST_REAL_GPG 736s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 736s saving-exporting DGIT_TEST_REAL_GPG_AGENT 736s saving-exporting DGIT_TEST_REAL_DEBCHANGE 736s + set -e 736s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 736s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 736s + printf '\n%s\n' ' 736s . $troot/lib-gdr 736s t-tstunt-parsechangelog 736s p=example 736s t-git-next-date 736s ' 736s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 736s + rc=0 736s + set +x 736s + set +e 736s + pwd 736s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 736s + '[' x '!=' x ']' 736s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 736s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 736s + set -e 736s + test 0 = 0 736s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 736s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 736s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 736s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 736s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 736s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 736s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 736s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 736s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 736s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 736s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 736s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 736s +++ : -D 736s +++ export GDR_TEST_DEBUG 736s +++ t-tstunt debchange 736s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s +++ local var=PATH 736s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s +++ eval ' 736s case "$PATH" in 736s "$tstunt:"*) ;; 736s *":$tstunt:"*) ;; 736s "") PATH="$tstunt" ;; 736s *) PATH="$tstunt:$PATH" ;; 736s esac 736s export PATH 736s ' 736s ++++ case "$PATH" in 736s ++++ export PATH 736s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s +++ local var=PERLLIB 736s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s +++ eval ' 736s case "$PERLLIB" in 736s "$tstunt:"*) ;; 736s *":$tstunt:"*) ;; 736s "") PERLLIB="$tstunt" ;; 736s *) PERLLIB="$tstunt:$PERLLIB" ;; 736s esac 736s export PERLLIB 736s ' 736s ++++ case "$PERLLIB" in 736s ++++ export PERLLIB 736s +++ local f 736s +++ for f in "$@" 736s +++ t-tstunt--save-real debchange 736s +++ local f=debchange 736s +++ case "$f" in 736s +++ local rc 736s +++ local real 736s +++ set +e 736s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 736s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 736s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s ++++ type -p debchange 736s +++ real=/usr/bin/debchange 736s +++ rc=0 736s +++ set -e 736s +++ case $rc in 736s +++ local varname=debchange 736s +++ varname=DGIT_TEST_REAL_DEBCHANGE 736s +++ eval ' 736s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 736s export DGIT_TEST_REAL_DEBCHANGE 736s ' 736s ++++ : /usr/bin/debchange 736s ++++ export DGIT_TEST_REAL_DEBCHANGE 736s +++ f=./debchange 736s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 736s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 736s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 736s ++ t-tstunt-parsechangelog 736s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 736s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s ++ local var=PATH 736s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s ++ eval ' 736s case "$PATH" in 736s "$tstunt:"*) ;; 736s *":$tstunt:"*) ;; 736s "") PATH="$tstunt" ;; 736s *) PATH="$tstunt:$PATH" ;; 736s esac 736s export PATH 736s ' 736s +++ case "$PATH" in 736s +++ export PATH 736s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s ++ local var=PERLLIB 736s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 736s ++ eval ' 736s case "$PERLLIB" in 736s "$tstunt:"*) ;; 736s *":$tstunt:"*) ;; 736s "") PERLLIB="$tstunt" ;; 736s *) PERLLIB="$tstunt:$PERLLIB" ;; 736s esac 736s export PERLLIB 736s ' 736s +++ case "$PERLLIB" in 736s +++ export PERLLIB 736s ++ local f 736s ++ for f in "$@" 736s ++ t-tstunt--save-real dpkg-parsechangelog 736s ++ local f=dpkg-parsechangelog 736s ++ case "$f" in 736s ++ local rc 736s ++ local real 736s ++ set +e 736s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 736s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 736s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 736s +++ type -p dpkg-parsechangelog 736s ++ real=/usr/bin/dpkg-parsechangelog 736s ++ rc=0 736s ++ set -e 736s ++ case $rc in 736s ++ local varname=dpkg_parsechangelog 736s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 736s ++ eval ' 736s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 736s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 736s ' 736s +++ : /usr/bin/dpkg-parsechangelog 736s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 736s ++ f=./dpkg-parsechangelog 736s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 736s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 736s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 736s ++ for f in "$@" 736s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 736s ++ local f=Dpkg/Changelog/Parse.pm 736s ++ case "$f" in 736s ++ return 736s ++ f=./Dpkg/Changelog/Parse.pm 736s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 736s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 736s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 736s ++ p=example 736s ++ t-git-next-date 736s ++ GIT_COMMITTER_DATE='1530000001 +0100' 736s ++ GIT_AUTHOR_DATE='1530000001 +0100' 736s + git config --global init.defaultBranch trunk 736s + cd example 736s + v=2.0-3 736s + t-dch-commit -v 2.0-3 -m testing 736s + t-debchange -v 2.0-3 -m testing 736s + DEBEMAIL=dgit-tests@example.org 736s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-3 -m testing 736s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange -v 2.0-3 -m testing 737s + git commit -m 'dch -v 2.0-3 -m testing' debian/changelog 737s [master e3ea5bf] dch -v 2.0-3 -m testing 737s 1 file changed, 6 insertions(+) 737s + t-git-debrebase analyse 737s + local gdr=git-debrebase 737s + : ' 737s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 737s + git-debrebase --dgit=dgit -D analyse 737s + tee ../anal.1 737s git-debrebase *** WALK e3ea5bfb0516ddc14aa79d0498e07ca91defd33b 1 *main::STDOUT 737s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 737s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 737s git-debrebase = Changelog {"Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","Msg" => "dch -v 2.0-3 -m testing\n","Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 737s e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Changeloggit-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 737s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 737s git-debrebase = AddPatches {"Type" => "AddPatches","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}]} 737s 737s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf AddPatchesgit-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 737s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 737s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}]} 737s 737s 4af0243f9227b0d695fbff38df345aca23969e2e Changeloggit-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 737s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 737s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 737s 737s 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Changeloggit-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 737s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 737s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 737s git-debrebase = Pseudomerge {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Overwritten" => [{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Contributor" => {"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Type" => "Pseudomerge"} 737s 737s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b Pseudomerge Contributor=178896af44c5b02e05a3442df6c33233b6acb807git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 737s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 737s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}]} 737s 737s 178896af44c5b02e05a3442df6c33233b6acb807 Upstreamgit-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 737s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 737s git-debrebase = Upstream {"Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream"} 737s 737s 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstreamgit-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 737s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 737s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream"} 737s 737s 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstreamgit-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 737s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 737s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 737s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 737s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 2 upp 4 proc 10 pm 0 737s 737s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor 737s Anchor 737s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 737s ' 737s + cat ../anal.1 737s e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Changelog 737s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf AddPatches 737s 4af0243f9227b0d695fbff38df345aca23969e2e Changelog 737s 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Changelog 737s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b Pseudomerge Contributor=178896af44c5b02e05a3442df6c33233b6acb807 737s 178896af44c5b02e05a3442df6c33233b6acb807 Upstream 737s 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream 737s 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream 737s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor 737s Anchor 737s + t-some-changes edits 737s + local token=edits 737s + local which=dum 737s + local fsuffix= 737s + t-git-next-date 737s + GIT_COMMITTER_DATE='1530000002 +0100' 737s + GIT_AUTHOR_DATE='1530000002 +0100' 737s + case "$which" in 737s + echo '// debian edits' 737s + git add debian/zorkmid 737s + git commit -m 'DEBIAN add zorkmid (edits)' 737s [master 1ee5d13] DEBIAN add zorkmid (edits) 737s 1 file changed, 1 insertion(+) 737s create mode 100644 debian/zorkmid 737s + case "$which" in 737s + echo '// upstream edits' 737s + git add src.c 737s + git commit -m 'UPSTREAM edit src.c (edits)' 737s [master 2ceed12] UPSTREAM edit src.c (edits) 737s 1 file changed, 1 insertion(+) 737s + case "$which" in 737s + for f in debian/zorkmid$fsuffix src$fsuffix.c 737s + echo '// both! edits' 737s + git add debian/zorkmid 737s + for f in debian/zorkmid$fsuffix src$fsuffix.c 737s + echo '// both! edits' 737s + git add src.c 737s + git commit -m 'MIXED add both() (edits)' 737s [master cd1a73b] MIXED add both() (edits) 737s 2 files changed, 2 insertions(+) 737s + t-git-next-date 737s + GIT_COMMITTER_DATE='1530000003 +0100' 737s + GIT_AUTHOR_DATE='1530000003 +0100' 737s + t-dch-commit-r 737s + t-dch-r-rune t-dch-commit 737s + local cmd=t-dch-commit 737s + shift 737s + local suite=unstable 737s + t-dch-commit -r -D unstable '' 737s + t-debchange -r -D unstable '' 737s + DEBEMAIL=dgit-tests@example.org 737s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 737s + exec env TZ=UTC faketime -f 2018-06-26 08:00:03 env -u TZ /usr/bin/debchange -r -D unstable 737s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 737s libdistro-info-perl is not installed, Debian release names are not known. 737s libdistro-info-perl is not installed, Ubuntu release names are not known. 737s + git commit -m 'dch -r -D unstable ' debian/changelog 737s [master 2a87115] dch -r -D unstable 737s 1 file changed, 2 insertions(+), 2 deletions(-) 737s + git tag t.before 737s + t-git-debrebase 737s + local gdr=git-debrebase 737s + : ' 737s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 737s + git-debrebase --dgit=dgit -D 737s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 737s git-debrebase ffq check_specs * 737s git-debrebase ffq merge master 737s git-debrebase ffq check_remote origin remote fetch/merge branch 737s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 737s OK, you are ahead of refs/remotes/origin/master 737s git-debrebase ffq check_remote undef remote push branch 737s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 737s OK, you are ahead of refs/remotes/dgit/dgit/sid 737s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 0 - 737s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 737s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 737s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061"}],"Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619"} 737s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 737s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 737s git-debrebase = Mixed {"Type" => "Mixed","Msg" => "MIXED add both() (edits)\n","Hdr" => "tree d46f208b7607ba8804649163cd2bead722b3dcd1\nparent 2ceed1229dd14a9c7bd40480c061a7e55243e34f\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Parents" => [{"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Ix" => 0,"Differs" => 34}],"Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061"} 737s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 737s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 737s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Ix" => 0,"Differs" => 2}],"Tree" => "e0f113b557570441f656fe976c2e2317cf95b193","CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Hdr" => "tree e0f113b557570441f656fe976c2e2317cf95b193\nparent 1ee5d138031b9e8febce2769522b7ff8faa92fe3\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 737s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 737s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 737s git-debrebase = Packaging {"Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b"}],"Msg" => "DEBIAN add zorkmid (edits)\n","Hdr" => "tree f9239e94551063b14f3d1dca12ff06dbd096b2af\nparent e3ea5bfb0516ddc14aa79d0498e07ca91defd33b\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Packaging"} 737s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 737s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 737s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Type" => "Changelog","Msg" => "dch -v 2.0-3 -m testing\n","Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 737s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 737s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 737s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 737s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 737s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 737s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}]} 737s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 737s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 737s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}]} 737s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 737s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 737s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 737s git-debrebase = Pseudomerge {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},"Overwritten" => [{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge"} 737s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 737s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 737s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 737s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 737s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 737s git-debrebase = Upstream {"Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 737s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 737s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 737s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 737s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 737s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 737s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 737s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 737s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 737s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 737s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 737s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 737s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 737s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 737s git-debrebase WALK REWRITING NOW cl=HASH(0x5557d891bbe8) procd=HASH(0x5557d8923768) 737s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 737s git-debrebase WALK BUILD e3ea5bfb0516ddc14aa79d0498e07ca91defd33b Debian (rewriting=1) 737s git-debrebase WALK BUILD 1ee5d138031b9e8febce2769522b7ff8faa92fe3 Debian (rewriting=1) 737s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 737s git-debrebase WALK BUILD cd1a73b0d571c79ca12a7d8b4a4a93b863931061 Debian (rewriting=1) 737s git-debrebase WALK BUILD 2a87115bc3f8ca826ea007ce753107074ca7c619 Debian (rewriting=1) 737s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 737s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 737s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 737s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 737s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 737s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 737s git-debrebase WALK BUILD 2ceed1229dd14a9c7bd40480c061a7e55243e34f Upstream (rewriting=1) 737s git-debrebase WALK BUILD cd1a73b0d571c79ca12a7d8b4a4a93b863931061 Upstream (rewriting=1) 737s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 737s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 2a87115bc3f8ca826ea007ce753107074ca7c619 = 0x4 737s git-debrebase *** WALK RETURN 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 cd67898e896264914067d3c0dee667e61099f3c8 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 737s git-debrebase: laundered (head was 2a87115bc3f8ca826ea007ce753107074ca7c619) 737s git-debrebase >= update refs/ffq-prev/heads/master 2a87115bc3f8ca826ea007ce753107074ca7c619 0000000000000000000000000000000000000000 737s git-debrebase >= delete refs/debrebase-last/heads/master 737s git-debrebase >= update HEAD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 2a87115bc3f8ca826ea007ce753107074ca7c619 737s git-debrebase >$ 737s Recorded previous head for preservation 737s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 737s ' 737s + t-gdr-good laundered 737s + local state=laundered 737s + local beforetag= 737s + case $state in 737s + git diff --quiet -- :. ':!debian/patches' 737s + LC_MESSAGES=C 737s + t-git-debrebase status 737s + local gdr=git-debrebase 737s + : ' 737s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 737s + git-debrebase --dgit=dgit -D status 737s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 737s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 737s git-debrebase = Upstream {"Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 737s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 737s git-debrebase = Upstream {"Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Msg" => "UPSTREAM edit src.c (edits)\n","Type" => "Upstream","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 737s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 737s git-debrebase = Upstream {"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 737s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 737s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Ix" => 0,"Differs" => 2}],"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"} 737s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 737s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 737s git-debrebase = Upstream {"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"}],"Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 737s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 737s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 737s git-debrebase = Changelog {"Parents" => [{"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16,"Ix" => 0}],"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 737s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 737s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 737s git-debrebase = Packaging {"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Type" => "Packaging","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10"} 737s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 737s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 737s git-debrebase = Packaging {"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}],"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (edits)\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d"} 737s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 737s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 737s git-debrebase = Changelog {"Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Msg" => "dch -v 2.0-3 -m testing\n","Type" => "Changelog","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e"} 737s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 737s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 737s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 737s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 737s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 737s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 737s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 737s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 737s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 737s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 737s ' 737s + case $state in 737s + egrep '^ *branch is laundered' ../status.check 737s branch is laundered 737s + t-gdr-good-analyse HEAD laundered 737s + local head=HEAD 737s + local state=laundered 737s + local wsfx= 737s + local etypes bwtip 737s + case $state in 737s + etypes=Upstream 737s ++ t-git-debrebase breakwater 737s ++ local gdr=git-debrebase 737s ++ : ' 737s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 737s ++ git-debrebase --dgit=dgit -D breakwater 737s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 737s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 737s git-debrebase = Upstream {"Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Type" => "Upstream","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"} 737s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 737s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 737s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c (edits)\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0,"Differs" => 2}]} 737s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 737s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 737s git-debrebase = Upstream {"Parents" => [{"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0,"Differs" => 2}],"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Type" => "Upstream"} 737s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 737s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 737s git-debrebase = Upstream {"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}]} 737s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 737s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 737s git-debrebase = Upstream {"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Type" => "Upstream","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0,"Differs" => 2}]} 737s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 737s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 737s git-debrebase = Changelog {"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Type" => "Changelog","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}]} 737s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 737s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 737s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Type" => "Packaging"} 737s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 737s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 737s git-debrebase = Packaging {"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Msg" => "DEBIAN add zorkmid (edits)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}]} 737s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 737s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 737s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Msg" => "dch -v 2.0-3 -m testing\n","Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Type" => "Changelog","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"} 737s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 737s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 737s git-debrebase = Changelog {"Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Ix" => 0,"Differs" => 16}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 737s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 737s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 737s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 737s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 737s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 737s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 737s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 737s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 737s ' 737s + bwtip=Y:cd67898e896264914067d3c0dee667e61099f3c8 737s + anal=../anal 737s + t-git-debrebase analyse HEAD 737s + local gdr=git-debrebase 737s + : ' 737s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 737s + git-debrebase --dgit=dgit -D analyse HEAD 738s git-debrebase *** WALK 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 1 *main::STDOUT 738s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 738s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 738s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Differs" => 2}],"Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"} 738s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 738s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 738s git-debrebase = Upstream {"Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"} 738s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 738s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 738s git-debrebase = Upstream {"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 738s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 738s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 738s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5"} 738s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 738s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 738s git-debrebase = Upstream {"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0}],"Type" => "Upstream"} 738s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 738s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 738s git-debrebase = Changelog {"Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}]} 738s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 738s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 738s git-debrebase = Packaging {"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32,"Ix" => 0}],"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"} 738s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 738s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 738s git-debrebase = Packaging {"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Msg" => "DEBIAN add zorkmid (edits)\n","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Differs" => 32}],"Type" => "Packaging"} 738s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 738s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 738s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Differs" => 16}],"Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-3 -m testing\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e"} 738s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 738s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 738s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 738s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 738s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 738s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "9214201f528bae71f4647709e2357407746739d5"} 738s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 738s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 738s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 738s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 738s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 4 proc 11 pm -1 738s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 738s ' 738s ++ git rev-parse HEAD 738s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 738s + exec 738s + local cid ctype info nparents 738s + read cid ctype info 738s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 738s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 738s + local cetype=Upstream 738s + '[' xUpstream = xUpstream ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 738s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 738s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 738s + enparents=1 738s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 738s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 738s + local cetype=Upstream 738s + '[' xUpstream = xUpstream ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 738s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 738s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 738s + enparents=1 738s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 738s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 738s + local cetype=Upstream 738s + '[' xUpstream = xUpstream ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 738s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 738s + expect=af4f554362ff02a1bbae558a182bb3c926512138 738s + enparents=1 738s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 738s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 738s + local cetype=Upstream 738s + '[' xUpstream = xUpstream ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 738s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 738s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 738s + enparents=1 738s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 738s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 738s + local cetype=Upstream 738s + '[' xUpstream = xUpstream ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 738s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 738s + expect=cd67898e896264914067d3c0dee667e61099f3c8 738s + enparents=1 738s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 738s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 738s + local cetype=Upstream 738s + '[' xChangelog = xUpstream ']' 738s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 738s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s + enparents=1 738s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + '[' xY:cd67898e896264914067d3c0dee667e61099f3c8 '!=' x ']' 738s + test Y:cd67898e896264914067d3c0dee667e61099f3c8 = Y:cd67898e896264914067d3c0dee667e61099f3c8 738s + bwtip= 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 738s + etypes=Packaging 738s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 738s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s + local cetype=Packaging 738s + '[' xPackaging = xPackaging ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 738s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 738s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 738s + enparents=1 738s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 738s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 738s + etypes=Packaging 738s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 738s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 738s + local cetype=Packaging 738s + '[' xPackaging = xPackaging ']' 738s + cetype=SAME 738s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 738s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 738s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 738s + enparents=1 738s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 738s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 738s + etypes=Packaging 738s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 738s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 738s + local cetype=Packaging 738s + '[' xChangelog = xPackaging ']' 738s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 738s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 738s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 738s + enparents=1 738s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 738s + etypes=Packaging 738s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 738s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 738s + local cetype=Packaging 738s + '[' xChangelog = xPackaging ']' 738s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 738s + local parents=9214201f528bae71f4647709e2357407746739d5 738s + expect=9214201f528bae71f4647709e2357407746739d5 738s + enparents=1 738s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 738s + etypes=Packaging 738s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo 9214201f528bae71f4647709e2357407746739d5 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 738s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 738s + local cetype=Packaging 738s + '[' xChangelog = xPackaging ']' 738s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 738s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s + enparents=1 738s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 738s + etypes=Packaging 738s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s ++ wc -w 738s + local cnparents=1 738s + test 1 = 1 738s ++ for f in $parents 738s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s ++ wc -w 738s ++ t-sort -u 738s ++ LC_COLLATE=C 738s ++ sort -u 738s + local cndparents=1 738s + test 1 = 1 738s + case "$parents" in 738s + case "$ctype" in 738s + read cid ctype info 738s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 738s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s + local cetype=Packaging 738s + '[' xAnchor = xPackaging ']' 738s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 738s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 738s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 738s + enparents=1 738s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 738s + case "$ctype/$cetype" in 738s + case "$ctype/$etypes" in 738s + case "$cetype" in 738s + case "$ctype" in 738s + break 738s + t-dgit push-source 738s + local dgit=dgit 738s + pwd 738s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 738s + : ' 738s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 738s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push-source 738s | git rev-parse --show-toplevel 738s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 738s | git config -z --get-regexp --local '.*' 738s | git config -z --get-regexp --local '.*' 738s | git config -z --get-regexp --global '.*' 738s | git config -z --get-regexp --system '.*' 738s format 3.0 (quilt), quilt mode linear 738s Format `3.0 (quilt)', need to check/update patch stack 738s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 738s => `' 738s + git diff --quiet HEAD 738s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 738s canonical suite name for unstable is sid 738s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 738s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 738s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 738s | git rev-parse 'HEAD~0' 738s => `701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0' 738s | git symbolic-ref -q HEAD 738s => `refs/heads/master' 738s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 738s CD work 738s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 738s + git reset -q --hard 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 738s examining quilt state (multiple patches, linear mode) 738s branch_is_gdr 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0... 738s branch_is_gdr 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 gdr anchor YES 738s + git reset -q --hard 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 738s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 738s HEAD is now at cb1f7fd Commit patch queue (exported by git-debrebase) 738s | git rev-parse 'HEAD~0' 738s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 738s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 738s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 738s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 738s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 738s CD fake 738s | find -name .git -prune -print0 738s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 738s + git checkout -f cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- debian 738s + git add -Af . 738s | git write-tree 738s => `f904c66e1710e1151bce7bfcbc6763f6ea826c19' 738s fake orig tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 739s CD .. 739s + git reset -q --hard cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 739s CD ../fake 739s + git add -Af . 739s | git write-tree 739s => `02ab455c92be6f90e27681286d7d90d9169dff59' 739s fake o+d/p tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 739s CD ../work 739s | git ls-tree --name-only -z cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 739s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 739s | git diff-tree -z --no-renames -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 739s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 79d7648325e46750eaed0cbc018ead4b8fa870ac M\x00src.c\x00' 739s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe => 1 739s | git diff-tree -z --no-renames --name-only -r cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 739s => `' 739s quiltify_trees_differ cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 739s | git diff-tree -z --no-renames --name-only -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 739s => `lib.c\x00new-upstream-file\x00src.c\x00' 739s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 => 1 739s differences @dl ## ## == == == ==. 739s dgit: base trees orig=f904c66e1710e1151bce o+d/p=02ab455c92be6f90e276 739s dgit: quilt differences: src: ## orig ## gitignores: == orig == 739s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 739s starting quiltify (multiple patches, linear mode) 739s | git ls-tree --name-only cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- debian/rules debian/control 739s => `debian/control'... 739s quiltify investigate cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 739s | git diff-tree -z --no-renames --name-only cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 739s => `' 739s quiltify_trees_differ cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 739s search finished hooray! 739s quiltify linearisation planning successful, executing... 739s + git checkout -q master 739s | git status --ignored --porcelain 739s => `?? .pc/' 739s nothing quilty to commit, ok. 739s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 739s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 739s | git rev-parse 'HEAD~0' 739s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 739s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 739s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 739s CD work 739s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 739s + git reset -q --hard cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 739s CD .. 739s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 739s dpkg-source: info: using source format '3.0 (quilt)' 739s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 739s dpkg-source: info: using patch list from debian/patches/series 739s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 739s dpkg-source: info: building example in example_2.0-3.dsc 739s CD work 739s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 739s changelog will contain changes since 2.0-2 739s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S -v2.0-2 739s dpkg-genchanges: info: not including original source code in upload 739s CD .. 739s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 739s renaming (Files) example_2.0.orig.tar.gz 739s renaming (Files) example_2.0-3.debian.tar.xz 739s renaming (dsc) example_2.0-3.dsc 739s renaming (changes) example_2.0-3_source.changes 739s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 739s actually entering push 739s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 739s => `1' 739s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 739s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 739s git_lrfetch_sane iteration 0 739s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 739s => 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit/sid 739s => 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/tags/archive/test-dummy/2.0-1 739s => 3f4f9cd709229d294801bafc0015fe2ec36cac94 refs/tags/archive/test-dummy/2.0-2 739s => 5321d467d2b15389865869a1959ddf06cd732480 refs/tags/test-dummy/2.0-1 739s => 659a7f09c29b2c1398610b9a08354d39cd707293 refs/tags/test-dummy/2.0-2 739s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 739s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 739s | git for-each-ref refs/dgit-fetch/test-dummy 739s |> 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit refs/dgit-fetch/test-dummy/dgit/sid 739s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 739s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 739s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 739s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 739s git_lrfetch_sane: tidying any old suite lrfetchrefs 739s | git for-each-ref refs/dgit-fetch/sid 739s git_lrfetch_sane: git fetch --no-insane emulation complete 739s $VAR1 = { 739s 'refs/dgit-fetch/test-dummy/dgit/sid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 739s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '659a7f09c29b2c1398610b9a08354d39cd707293', 739s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '5321d467d2b15389865869a1959ddf06cd732480', 739s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '7a1411309d59816b6d8ebb65d239ac3739d8ac97', 739s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '3f4f9cd709229d294801bafc0015fe2ec36cac94' 739s }; 739s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 739s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/tags/archive/test-dummy/2.0-1 739s currently refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 739s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/tags/archive/test-dummy/2.0-2 739s currently refs/tags/archive/test-dummy/2.0-2=3f4f9cd709229d294801bafc0015fe2ec36cac94 739s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/tags/test-dummy/2.0-1 739s currently refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 739s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/tags/test-dummy/2.0-2 739s currently refs/tags/test-dummy/2.0-2=659a7f09c29b2c1398610b9a08354d39cd707293 739s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 739s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 739s offered refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 739s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 739s offered refs/tags/archive/test-dummy/2.0-2=3f4f9cd709229d294801bafc0015fe2ec36cac94 739s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 739s offered refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 739s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 739s offered refs/tags/test-dummy/2.0-2=659a7f09c29b2c1398610b9a08354d39cd707293 739s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 739s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 739s get_archive_dsc: Version 2.0-2 739s last upload to archive: specified git info (test-dummy) 739s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 739s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 739s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 739s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s previous reference hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s fetch_from_archive: lastfetch=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s using existing example_2.0.orig.tar.gz 739s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s fetch mergeinfos: 739s commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf Dgit field in .dsc from archive 739s fetch hash=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s | git log -n2 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 739s => `commit 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf'... 739s | git ls-tree -lrz -- 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf: 739s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 739s + git check-ref-format archive/test-dummy/2.0-3 739s | git symbolic-ref -q HEAD 739s => `refs/heads/master' 739s | git rev-parse 'HEAD~0' 739s => `cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe' 739s ffq_prev_branchinfo branch current refs/heads/master 739s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 739s => `2a87115bc3f8ca826ea007ce753107074ca7c619' 739s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 739s => `' 739s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 2a87115bc3f8ca826ea007ce753107074ca7c619 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s + git-debrebase stitch 739s | git rev-parse 'HEAD~0' 739s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 739s | git status --ignored --porcelain 739s => `' 739s nothing quilty to commit, ok. 739s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 739s => `' 739s + git diff --quiet HEAD 739s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 282c3564ae1a8872cefacb527c7d9dbc05362dc5 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 739s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 739s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 739s => `' 739s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 739s checking that example_2.0-3.dsc corresponds to HEAD 739s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-3.dsc 739s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-3.dsc) 739s dpkg-source: info: extracting example in example-2.0 739s dpkg-source: info: unpacking example_2.0.orig.tar.gz 739s dpkg-source: info: unpacking example_2.0-3.debian.tar.xz 739s dpkg-source: info: using patch list from debian/patches/series 739s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 739s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 739s dpkg-source: info: applying subdir/addnewups 739s dpkg-source: info: applying 0004-UPSTREAM-edit-src.c-edits.patch 739s dpkg-source: info: applying 0005-MIXED-add-both-edits.patch 739s CD example-2.0 739s | find -name .git -prune -print0 739s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 739s + git add -Af . 739s | git write-tree 739s => `02ab455c92be6f90e27681286d7d90d9169dff59' 739s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 739s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 739s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 739s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 739s + git diff --quiet 02ab455c92be6f90e27681286d7d90d9169dff59 282c3564ae1a8872cefacb527c7d9dbc05362dc5 739s files_compare_inputs example_2.0-3.dsc 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0.orig.tar.gz 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha256 example_2.0-3.debian.tar.xz 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0.orig.tar.gz 739s files_compare_inputs example_2.0-3.dsc Checksums-Sha1 example_2.0-3.debian.tar.xz 739s files_compare_inputs example_2.0-3.dsc Files 739s files_compare_inputs example_2.0-3.dsc Files example_2.0.orig.tar.gz 739s files_compare_inputs example_2.0-3.dsc Files example_2.0-3.debian.tar.xz 739s files_compare_inputs example_2.0-3_source.changes 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.dsc 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha256 example_2.0-3.debian.tar.xz 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.dsc 739s files_compare_inputs example_2.0-3_source.changes Checksums-Sha1 example_2.0-3.debian.tar.xz 739s files_compare_inputs example_2.0-3_source.changes Files 739s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.dsc 739s files_compare_inputs example_2.0-3_source.changes Files example_2.0-3.debian.tar.xz 739s checking origs needed (2.0)... 739s checking origs needed placement 'devel extra'... 739s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 739s origs example_2.0.orig.tar.gz is_orig 739s -| sh -ec 'cd "$1"; shift 739s 739s find -name "$1" -print0 | 739s xargs -0r sha256sum 739s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 739s | 0e1bd42ce3bea52885dcc33e1deaea0259dd4088494c1ecdfa4c50fbea0aceb2 ./pool/main/example_2.0.orig.tar.gz 739s origs example_2.0.orig.tar.gz $#$have=0 739s origs example_2.0.orig.tar.gz f.same=1 #f._differ=-1 739s origs example_2.0-3.debian.tar.xz | 209fa3d86e30862d4d2e508d0a168538 1552 example_2.0-3.debian.tar.xz 739s ../example_2.0-3_source.changes already has appropriate .orig(s) (if any) 739s push_tagwants: $VAR1 = [ 739s '2.0-3', 739s '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 739s undef, 739s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 739s ]; 739s $VAR2 = [ 739s { 739s 'View' => 'dgit', 739s 'TfSuffix' => '', 739s 'Tfn' => sub { "DUMMY" }, 739s 'TagFn' => sub { "DUMMY" }, 739s 'Tag' => 'archive/test-dummy/2.0-3', 739s 'Objid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5' 739s }, 739s { 739s 'TagFn' => sub { "DUMMY" }, 739s 'Tag' => 'test-dummy/2.0-3', 739s 'Objid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 739s 'View' => 'dgit', 739s 'TfSuffix' => '-dgit', 739s 'Tfn' => sub { "DUMMY" } 739s } 739s ]; 739s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:03 +0000' 739s => `1530000003 +0000' 739s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 739s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 739s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 739s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 739s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 740s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 740s => `56c0910646fa7e5620df4576ed58599d80bbd799' 740s + git verify-tag 56c0910646fa7e5620df4576ed58599d80bbd799 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s gpg: Signature made Mon Mar 31 12:30:33 2025 UTC 740s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 740s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 740s gpg: WARNING: This key is not certified with a trusted signature! 740s gpg: There is no indication that the signature belongs to the owner. 740s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 740s + git update-ref refs/tags/archive/test-dummy/2.0-3 56c0910646fa7e5620df4576ed58599d80bbd799 740s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 740s => `d1b70b244f950482ba246b15bff75b01035a36ec' 740s + git verify-tag d1b70b244f950482ba246b15bff75b01035a36ec 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s gpg: Signature made Mon Mar 31 12:30:33 2025 UTC 740s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 740s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 740s gpg: WARNING: This key is not certified with a trusted signature! 740s gpg: There is no indication that the signature belongs to the owner. 740s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 740s + git update-ref refs/tags/test-dummy/2.0-3 d1b70b244f950482ba246b15bff75b01035a36ec 740s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 740s => `1' 740s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 282c3564ae1a8872cefacb527c7d9dbc05362dc5:refs/dgit/sid refs/tags/archive/test-dummy/2.0-3 refs/tags/test-dummy/2.0-3 740s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 740s 6b22dd5..282c356 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -> refs/dgit/sid 740s * [new tag] archive/test-dummy/2.0-3 -> archive/test-dummy/2.0-3 740s * [new tag] test-dummy/2.0-3 -> test-dummy/2.0-3 740s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 282c3564ae1a8872cefacb527c7d9dbc05362dc5 740s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-3_source.changes 740s signfile dsc ../example_2.0-3.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s 740s fixup_changes dsc ../example_2.0-3.dsc ../example_2.0-3_source.changes 740s signfile changes ../example_2.0-3_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 740s 740s Successfully signed dsc, changes files 740s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-3_source.changes 740s gpg: ../example_2.0-3_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 740s gpg: ../example_2.0-3.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 740s D: Setting host argument. 740s Checking signature on .changes 740s Checking signature on .dsc 740s Uploading to test-dummy (via local to localhost): 740s Successfully uploaded packages. 740s dgit ok: pushed and uploaded 2.0-3 740s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 740s del_lrfetchrefs... 740s del_lrfetchrefs: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/dgit-fetch/test-dummy/dgit/sid 740s del_lrfetchrefs: 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 740s del_lrfetchrefs: 3f4f9cd709229d294801bafc0015fe2ec36cac94 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 740s del_lrfetchrefs: 5321d467d2b15389865869a1959ddf06cd732480 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 740s del_lrfetchrefs: 659a7f09c29b2c1398610b9a08354d39cd707293 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 740s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 740s ' 740s + t-gdr-good pushed-interop 740s + local state=pushed-interop 740s + local beforetag= 740s + case $state in 740s + t-gdr-made-patches 740s + git log -n1 --pretty=format:%B 740s + egrep '^\[git-debrebase' 740s [git-debrebase pseudomerge: stitch] 740s + git diff --quiet -- :. ':!debian/patches' 740s + LC_MESSAGES=C 740s + t-git-debrebase status 740s + local gdr=git-debrebase 740s + : ' 740s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 740s + git-debrebase --dgit=dgit -D status 740s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 740s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 740s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 740s git-debrebase = Pseudomerge {"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Overwritten" => [{"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Ix" => 1,"Differs" => 4}],"Contributor" => {"Ix" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Differs" => 0},"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Type" => "Pseudomerge","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 740s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 740s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 740s git-debrebase = AddPatches {"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Type" => "AddPatches"} 740s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 740s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 740s git-debrebase = Upstream {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Ix" => 0,"Differs" => 2}]} 740s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 740s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 740s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e"}],"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n"} 740s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 740s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 740s git-debrebase = Upstream {"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0,"Differs" => 2}],"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 740s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 740s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 740s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 740s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 740s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 740s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f"} 740s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 740s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 740s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16}],"Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e"} 740s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 740s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 740s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}],"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Type" => "Packaging","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n"} 740s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 740s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 740s git-debrebase = Packaging {"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (edits)\n","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Ix" => 0,"Differs" => 32}],"Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d"} 740s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 740s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 740s git-debrebase = Changelog {"Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Ix" => 0}],"Msg" => "dch -v 2.0-3 -m testing\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Type" => "Changelog"} 740s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 740s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 740s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 740s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 740s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 740s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "9214201f528bae71f4647709e2357407746739d5","Type" => "Changelog"} 740s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 740s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 740s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 740s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]]} 740s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 740s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 740s ' 740s + case $state in 740s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 740s branch contains furniture (not laundered) 740s + egrep '^ stitched$' ../status.check 740s stitched 740s + t-gdr-good-analyse HEAD pushed-interop 740s + local head=HEAD 740s + local state=pushed-interop 740s + local wsfx= 740s + local etypes bwtip 740s + case $state in 740s + etypes=Pseudomerge-AddPatchesInterop-Upstream 740s + anal=../anal 740s + t-git-debrebase analyse HEAD 740s + local gdr=git-debrebase 740s + : ' 740s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 740s + git-debrebase --dgit=dgit -D analyse HEAD 740s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1 *main::STDOUT 740s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 740s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 740s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 740s git-debrebase = Pseudomerge {"Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Contributor" => {"Differs" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Ix" => 0},"Overwritten" => [{"Differs" => 4,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Ix" => 1}],"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Type" => "Pseudomerge","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 740s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 740s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 740s git-debrebase = AddPatches {"Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "AddPatches","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Parents" => [{"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Differs" => 4,"Ix" => 0}]} 740s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 740s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 740s git-debrebase = Upstream {"Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 740s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 740s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 740s git-debrebase = Upstream {"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Parents" => [{"Differs" => 2,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0}]} 740s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 740s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 740s git-debrebase = Upstream {"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Parents" => [{"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Ix" => 0}],"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 740s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 740s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 740s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2,"Ix" => 0}],"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Type" => "Upstream","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 740s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 740s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 740s git-debrebase = Upstream {"Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Parents" => [{"Differs" => 2,"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0}]} 740s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 740s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 740s git-debrebase = Changelog {"Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Parents" => [{"Ix" => 0,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16}],"Msg" => "dch -r -D unstable\n","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"} 741s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 741s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 741s git-debrebase = Packaging {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}],"Type" => "Packaging","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 741s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 741s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 741s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Msg" => "DEBIAN add zorkmid (edits)\n","Parents" => [{"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 741s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 741s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 741s git-debrebase = Changelog {"Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Msg" => "dch -v 2.0-3 -m testing\n"} 741s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 741s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 741s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 741s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 741s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 741s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 741s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 741s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 741s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 741s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 741s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 741s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 741s ' 741s ++ git rev-parse HEAD 741s + expect=282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s + exec 741s + local cid ctype info nparents 741s + read cid ctype info 741s + : ===== 282c3564ae1a8872cefacb527c7d9dbc05362dc5 Pseudomerge Contributor=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe ===== 741s + test 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s + local cetype=Pseudomerge 741s + '[' xPseudomerge = xPseudomerge ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P 282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s + local 'parents=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 741s + expect='cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 741s + enparents=1 741s + : Pseudomerge/SAME 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 741s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 741s + enparents=2 741s + git diff --quiet cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe..282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s + etypes=AddPatchesInterop-Upstream 741s + : 'reject pointless pseudomerges' 741s + local 'overwritten= 2a87115bc3f8ca826ea007ce753107074ca7c619' 741s + overwritten=2a87115bc3f8ca826ea007ce753107074ca7c619 741s + t-git-debrebase analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 741s + local gdr=git-debrebase 741s + : ' 741s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 741s + git-debrebase --dgit=dgit -D analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 741s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 1 *main::STDOUT 741s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 741s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 741s git-debrebase = Changelog {"Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Differs" => 16}]} 741s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 741s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 741s git-debrebase = Mixed {"Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Type" => "Mixed","Hdr" => "tree d46f208b7607ba8804649163cd2bead722b3dcd1\nparent 2ceed1229dd14a9c7bd40480c061a7e55243e34f\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f"}],"Msg" => "MIXED add both() (edits)\n"} 741s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 741s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 741s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (edits)\n","Parents" => [{"Ix" => 0,"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Differs" => 2}],"Hdr" => "tree e0f113b557570441f656fe976c2e2317cf95b193\nparent 1ee5d138031b9e8febce2769522b7ff8faa92fe3\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Upstream","CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Tree" => "e0f113b557570441f656fe976c2e2317cf95b193"} 741s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 741s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 741s git-debrebase = Packaging {"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","Hdr" => "tree f9239e94551063b14f3d1dca12ff06dbd096b2af\nparent e3ea5bfb0516ddc14aa79d0498e07ca91defd33b\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b"}],"Msg" => "DEBIAN add zorkmid (edits)\n"} 741s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 741s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 741s git-debrebase = Changelog {"Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 16}],"Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Changelog","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b"} 741s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 741s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 741s git-debrebase = AddPatches {"Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4,"Ix" => 0}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches"} 741s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 741s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 741s git-debrebase = Changelog {"Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog"} 741s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 741s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 741s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16}]} 741s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 741s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 741s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 741s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Parents" => [{"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0},{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]]} 741s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 741s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 741s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 741s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 741s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 741s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 741s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 741s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 741s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 741s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 741s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 741s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 741s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 741s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 741s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 741s ' 741s + local ocid otype oinfo 741s + read ocid otype oinfo 741s + case "$otype" in 741s ++ printf %s 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 741s ++ wc -w 741s + local cnparents=2 741s + test 2 = 2 741s ++ for f in $parents 741s ++ echo cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 741s ++ for f in $parents 741s ++ echo 2a87115bc3f8ca826ea007ce753107074ca7c619 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=2 741s + test 2 = 2 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe AddPatches ===== 741s + test cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe = cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 741s + local cetype=AddPatchesInterop 741s + '[' xAddPatches = xAddPatchesInterop ']' 741s ++ git log -n1 --pretty=format:%P cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 741s + local parents=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s + enparents=1 741s + : AddPatches/AddPatchesInterop 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + git log -n1 --pretty=format:%B 741s + grep '^\[git-debrebase[ :]' 741s [git-debrebase pseudomerge: stitch] 741s + case "$ctype" in 741s + git diff --quiet 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0..cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- :. ':!debian/patches' 741s + etypes=Upstream 741s ++ printf %s 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 741s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s + local cetype=Upstream 741s + '[' xUpstream = xUpstream ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 741s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 741s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 741s + enparents=1 741s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 741s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 741s + local cetype=Upstream 741s + '[' xUpstream = xUpstream ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 741s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 741s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 741s + enparents=1 741s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 741s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 741s + local cetype=Upstream 741s + '[' xUpstream = xUpstream ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 741s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 741s + expect=af4f554362ff02a1bbae558a182bb3c926512138 741s + enparents=1 741s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 741s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 741s + local cetype=Upstream 741s + '[' xUpstream = xUpstream ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 741s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 741s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 741s + enparents=1 741s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 741s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 741s + local cetype=Upstream 741s + '[' xUpstream = xUpstream ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 741s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 741s + expect=cd67898e896264914067d3c0dee667e61099f3c8 741s + enparents=1 741s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 741s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 741s + local cetype=Upstream 741s + '[' xChangelog = xUpstream ']' 741s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 741s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s + enparents=1 741s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + '[' x '!=' x ']' 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 741s + etypes=Packaging 741s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 741s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s + local cetype=Packaging 741s + '[' xPackaging = xPackaging ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 741s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 741s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 741s + enparents=1 741s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 741s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 741s + etypes=Packaging 741s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 741s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 741s + local cetype=Packaging 741s + '[' xPackaging = xPackaging ']' 741s + cetype=SAME 741s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 741s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 741s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 741s + enparents=1 741s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 741s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 741s + etypes=Packaging 741s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 741s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 741s + local cetype=Packaging 741s + '[' xChangelog = xPackaging ']' 741s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 741s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 741s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 741s + enparents=1 741s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 741s + etypes=Packaging 741s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 741s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 741s + local cetype=Packaging 741s + '[' xChangelog = xPackaging ']' 741s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 741s + local parents=9214201f528bae71f4647709e2357407746739d5 741s + expect=9214201f528bae71f4647709e2357407746739d5 741s + enparents=1 741s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 741s + etypes=Packaging 741s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 9214201f528bae71f4647709e2357407746739d5 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 741s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 741s + local cetype=Packaging 741s + '[' xChangelog = xPackaging ']' 741s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 741s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s + enparents=1 741s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 741s + etypes=Packaging 741s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s ++ wc -w 741s + local cnparents=1 741s + test 1 = 1 741s ++ for f in $parents 741s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s ++ wc -w 741s ++ t-sort -u 741s ++ LC_COLLATE=C 741s ++ sort -u 741s + local cndparents=1 741s + test 1 = 1 741s + case "$parents" in 741s + case "$ctype" in 741s + read cid ctype info 741s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 741s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s + local cetype=Packaging 741s + '[' xAnchor = xPackaging ']' 741s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 741s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 741s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 741s + enparents=1 741s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 741s + case "$ctype/$cetype" in 741s + case "$ctype/$etypes" in 741s + case "$cetype" in 741s + case "$ctype" in 741s + break 741s + t-expect-fail 'E:add a new changelog stanza.*and try again' t-dgit push-source 741s + local 'mpat=E:add a new changelog stanza.*and try again' 741s + shift 741s + set +o pipefail 741s + LC_MESSAGES=C 741s + LANGUAGE=C 741s + t-dgit push-source 741s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 741s + local dgit=dgit 741s + pwd 741s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 741s + : ' 741s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 741s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A push-source 741s | git rev-parse --show-toplevel 741s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 741s | git config -z --get-regexp --local '.*' 741s | git config -z --get-regexp --local '.*' 741s | git config -z --get-regexp --global '.*' 741s | git config -z --get-regexp --system '.*' 741s format 3.0 (quilt), quilt mode linear 741s Format `3.0 (quilt)', need to check/update patch stack 741s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 741s => `' 741s + git diff --quiet HEAD 741s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 741s canonical suite name for unstable is sid 741s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 741s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 741s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 741s | git rev-parse 'HEAD~0' 741s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 741s | git symbolic-ref -q HEAD 741s => `refs/heads/master' 741s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 741s CD work 741s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 741s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s examining quilt state (multiple patches, linear mode) 741s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5... 741s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5 gdr pseudomerge YES 741s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 741s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 741s | git rev-parse 'HEAD~0' 741s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 741s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 741s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 741s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 741s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 742s CD fake 742s | find -name .git -prune -print0 742s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 742s + git checkout -f 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -- debian 742s + git add -Af . 742s | git write-tree 742s => `f904c66e1710e1151bce7bfcbc6763f6ea826c19' 742s fake orig tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 742s CD .. 742s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s CD ../fake 742s + git add -Af . 742s | git write-tree 742s => `02ab455c92be6f90e27681286d7d90d9169dff59' 742s fake o+d/p tree object f904c66e1710e1151bce7bfcbc6763f6ea826c19 742s CD ../work 742s | git ls-tree --name-only -z 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 742s | git diff-tree -z --no-renames -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 79d7648325e46750eaed0cbc018ead4b8fa870ac M\x00src.c\x00' 742s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 282c3564ae1a8872cefacb527c7d9dbc05362dc5 => 1 742s | git diff-tree -z --no-renames --name-only -r 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 742s => `' 742s quiltify_trees_differ 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 742s | git diff-tree -z --no-renames --name-only -r f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 742s => `lib.c\x00new-upstream-file\x00src.c\x00' 742s quiltify_trees_differ f904c66e1710e1151bce7bfcbc6763f6ea826c19 02ab455c92be6f90e27681286d7d90d9169dff59 => 1 742s differences @dl ## ## == == == ==. 742s dgit: base trees orig=f904c66e1710e1151bce o+d/p=02ab455c92be6f90e276 742s dgit: quilt differences: src: ## orig ## gitignores: == orig == 742s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 742s starting quiltify (multiple patches, linear mode) 742s | git ls-tree --name-only 282c3564ae1a8872cefacb527c7d9dbc05362dc5 -- debian/rules debian/control 742s => `debian/control'... 742s quiltify investigate 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s | git diff-tree -z --no-renames --name-only 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 742s => `' 742s quiltify_trees_differ 282c3564ae1a8872cefacb527c7d9dbc05362dc5 02ab455c92be6f90e27681286d7d90d9169dff59 => 0 742s search finished hooray! 742s quiltify linearisation planning successful, executing... 742s + git checkout -q master 742s | git status --ignored --porcelain 742s => `?? .pc/' 742s nothing quilty to commit, ok. 742s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 742s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 742s | git rev-parse 'HEAD~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 742s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 742s CD work 742s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 742s + git reset -q --hard 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s CD .. 742s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 742s dpkg-source: info: using source format '3.0 (quilt)' 742s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 742s dpkg-source: info: using patch list from debian/patches/series 742s dpkg-source: info: building example in example_2.0-3.debian.tar.xz 742s dpkg-source: info: building example in example_2.0-3.dsc 742s CD work 742s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 742s changelog will contain changes since 2.0-2 742s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-3_source.changes dpkg-genchanges -S -v2.0-2 742s dpkg-genchanges: info: not including original source code in upload 742s CD .. 742s moving example_2.0-3.dsc, example_2.0-3_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 742s renaming (Files) example_2.0.orig.tar.gz 742s renaming (Files) example_2.0-3.debian.tar.xz 742s renaming (dsc) example_2.0-3.dsc 742s renaming (changes) example_2.0-3_source.changes 742s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 742s actually entering push 742s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 742s => `1' 742s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 742s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 742s git_lrfetch_sane iteration 0 742s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 742s => 282c3564ae1a8872cefacb527c7d9dbc05362dc5 refs/dgit/sid 742s => 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/tags/archive/test-dummy/2.0-1 742s => 3f4f9cd709229d294801bafc0015fe2ec36cac94 refs/tags/archive/test-dummy/2.0-2 742s => 56c0910646fa7e5620df4576ed58599d80bbd799 refs/tags/archive/test-dummy/2.0-3 742s => 5321d467d2b15389865869a1959ddf06cd732480 refs/tags/test-dummy/2.0-1 742s => 659a7f09c29b2c1398610b9a08354d39cd707293 refs/tags/test-dummy/2.0-2 742s => d1b70b244f950482ba246b15bff75b01035a36ec refs/tags/test-dummy/2.0-3 742s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 742s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 742s | git for-each-ref refs/dgit-fetch/test-dummy 742s |> 282c3564ae1a8872cefacb527c7d9dbc05362dc5 commit refs/dgit-fetch/test-dummy/dgit/sid 742s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 742s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 742s |> 56c0910646fa7e5620df4576ed58599d80bbd799 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 742s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 742s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 742s |> d1b70b244f950482ba246b15bff75b01035a36ec tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 742s git_lrfetch_sane: tidying any old suite lrfetchrefs 742s | git for-each-ref refs/dgit-fetch/sid 742s git_lrfetch_sane: git fetch --no-insane emulation complete 742s $VAR1 = { 742s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3' => '56c0910646fa7e5620df4576ed58599d80bbd799', 742s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '5321d467d2b15389865869a1959ddf06cd732480', 742s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3' => 'd1b70b244f950482ba246b15bff75b01035a36ec', 742s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2' => '3f4f9cd709229d294801bafc0015fe2ec36cac94', 742s 'refs/dgit-fetch/test-dummy/dgit/sid' => '282c3564ae1a8872cefacb527c7d9dbc05362dc5', 742s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2' => '659a7f09c29b2c1398610b9a08354d39cd707293', 742s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '7a1411309d59816b6d8ebb65d239ac3739d8ac97' 742s }; 742s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 742s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/tags/archive/test-dummy/2.0-1 742s currently refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 742s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/tags/archive/test-dummy/2.0-2 742s currently refs/tags/archive/test-dummy/2.0-2=3f4f9cd709229d294801bafc0015fe2ec36cac94 742s |> 56c0910646fa7e5620df4576ed58599d80bbd799 tag refs/tags/archive/test-dummy/2.0-3 742s currently refs/tags/archive/test-dummy/2.0-3=56c0910646fa7e5620df4576ed58599d80bbd799 742s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/tags/test-dummy/2.0-1 742s currently refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 742s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/tags/test-dummy/2.0-2 742s currently refs/tags/test-dummy/2.0-2=659a7f09c29b2c1398610b9a08354d39cd707293 742s |> d1b70b244f950482ba246b15bff75b01035a36ec tag refs/tags/test-dummy/2.0-3 742s currently refs/tags/test-dummy/2.0-3=d1b70b244f950482ba246b15bff75b01035a36ec 742s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 742s |> 7a1411309d59816b6d8ebb65d239ac3739d8ac97 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 742s offered refs/tags/archive/test-dummy/2.0-1=7a1411309d59816b6d8ebb65d239ac3739d8ac97 742s |> 3f4f9cd709229d294801bafc0015fe2ec36cac94 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 742s offered refs/tags/archive/test-dummy/2.0-2=3f4f9cd709229d294801bafc0015fe2ec36cac94 742s |> 56c0910646fa7e5620df4576ed58599d80bbd799 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 742s offered refs/tags/archive/test-dummy/2.0-3=56c0910646fa7e5620df4576ed58599d80bbd799 742s |> 5321d467d2b15389865869a1959ddf06cd732480 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 742s offered refs/tags/test-dummy/2.0-1=5321d467d2b15389865869a1959ddf06cd732480 742s |> 659a7f09c29b2c1398610b9a08354d39cd707293 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 742s offered refs/tags/test-dummy/2.0-2=659a7f09c29b2c1398610b9a08354d39cd707293 742s |> d1b70b244f950482ba246b15bff75b01035a36ec tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 742s offered refs/tags/test-dummy/2.0-3=d1b70b244f950482ba246b15bff75b01035a36ec 742s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 742s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_2.0-2.dsc... 742s get_archive_dsc: Version 2.0-2 742s last upload to archive: specified git info (test-dummy) 742s GCF>| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map 742s GCF<| refs/dgit-fetch/test-dummy/dgit-rewrite/map:map missing 742s GCF>| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 742s GCF<| 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf commit 350 742s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s previous reference hash=282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s fetch_from_archive: lastfetch=282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s using existing example_2.0.orig.tar.gz 742s | git merge-base 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 742s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 742s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 742s | git rev-parse '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf~0' 742s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 742s 742s Git commit in archive is behind the last version allegedly pushed/uploaded. 742s Commit referred to by archive: 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 742s Last version pushed with dgit: 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s Perhaps the upload is stuck in incoming. Using the version from git. 742s 742s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s fetch mergeinfos: 742s commit 282c3564ae1a8872cefacb527c7d9dbc05362dc5 dgit suite branch on dgit git server 742s fetch hash=282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s | git log -n2 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `commit 282c3564ae1a8872cefacb527c7d9dbc05362dc5'... 742s | git ls-tree -lrz -- 282c3564ae1a8872cefacb527c7d9dbc05362dc5: 742s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 742s + git check-ref-format archive/test-dummy/2.0-3 742s | git symbolic-ref -q HEAD 742s => `refs/heads/master' 742s | git rev-parse 'HEAD~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s ffq_prev_branchinfo branch current refs/heads/master 742s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 742s => `' 742s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git status --ignored --porcelain 742s => `' 742s nothing quilty to commit, ok. 742s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 742s => `' 742s + git diff --quiet HEAD 742s | git merge-base 282c3564ae1a8872cefacb527c7d9dbc05362dc5 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git rev-parse '282c3564ae1a8872cefacb527c7d9dbc05362dc5~0' 742s => `282c3564ae1a8872cefacb527c7d9dbc05362dc5' 742s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-3' 742s => `56c0910646fa7e5620df4576ed58599d80bbd799' 742s 742s Version 2.0-3 has already been tagged (pushed?) 742s If this was a failed (or incomplete or rejected) upload by you, just 742s add a new changelog stanza for a new version number and try again. 742s 742s dgit: error: Tag archive/test-dummy/2.0-3 already exists. 742s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 742s del_lrfetchrefs... 742s del_lrfetchrefs: 282c3564ae1a8872cefacb527c7d9dbc05362dc5 refs/dgit-fetch/test-dummy/dgit/sid 742s del_lrfetchrefs: 7a1411309d59816b6d8ebb65d239ac3739d8ac97 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 742s del_lrfetchrefs: 3f4f9cd709229d294801bafc0015fe2ec36cac94 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-2 742s del_lrfetchrefs: 56c0910646fa7e5620df4576ed58599d80bbd799 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-3 742s del_lrfetchrefs: 5321d467d2b15389865869a1959ddf06cd732480 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 742s del_lrfetchrefs: 659a7f09c29b2c1398610b9a08354d39cd707293 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-2 742s del_lrfetchrefs: d1b70b244f950482ba246b15bff75b01035a36ec refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-3 742s + local 'ps=255 0' 742s + set -o pipefail 742s + case $ps in 742s + t-grep-mpat 'E:add a new changelog stanza.*and try again' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 742s + local 'mpat=E:add a new changelog stanza.*and try again' 742s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 742s + local grepper=fgrep 742s + case "$mpat" in 742s + case "$mpat" in 742s + grepper=egrep 742s + mpat='add a new changelog stanza.*and try again' 742s + egrep -e 'add a new changelog stanza.*and try again' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 742s add a new changelog stanza for a new version number and try again. 742s + git branch before-noop 742s + t-git-next-date 742s + GIT_COMMITTER_DATE='1530000004 +0100' 742s + GIT_AUTHOR_DATE='1530000004 +0100' 742s + t-git-debrebase 742s + local gdr=git-debrebase 742s + : ' 742s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 742s + git-debrebase --dgit=dgit -D 742s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 742s git-debrebase ffq check_specs * 742s git-debrebase ffq merge master 742s git-debrebase ffq check_remote origin remote fetch/merge branch 742s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 742s OK, you are ahead of refs/remotes/origin/master 742s git-debrebase ffq check_remote undef remote push branch 742s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 742s OK, you are ahead of refs/remotes/dgit/dgit/sid 742s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0 - 742s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 742s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 742s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 742s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Contributor" => {"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Ix" => 0,"Differs" => 0},"Parents" => [$VAR1->{"Contributor"},{"Differs" => 4,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Ix" => 1}],"Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n"} 742s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 742s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 742s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Ix" => 0}]} 742s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 742s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 742s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Type" => "Upstream","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 742s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 742s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 742s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (edits)\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Parents" => [{"Ix" => 0,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2}]} 742s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 742s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 742s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Differs" => 2}],"Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream"} 742s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 742s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 742s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Parents" => [{"Ix" => 0,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2}],"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 742s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 742s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 742s git-debrebase = Upstream {"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0,"Differs" => 2}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Type" => "Upstream","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 742s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 742s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 742s git-debrebase = Changelog {"Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Ix" => 0,"Differs" => 16}],"Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"} 742s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 742s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 742s git-debrebase = Packaging {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Ix" => 0}],"Type" => "Packaging","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10"} 742s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 742s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 742s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (edits)\n","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}]} 742s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 742s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 742s git-debrebase = Changelog {"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 742s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 742s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 742s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 742s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 742s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 742s git-debrebase = Changelog {"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 742s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 742s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 742s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 742s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 742s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 742s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 742s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 742s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 742s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 742s git-debrebase WALK BUILD 9214201f528bae71f4647709e2357407746739d5 Debian (rewriting=0) 742s git-debrebase WALK BUILD 32b1b8f0bdc575561b14de2ec9711d768a12d928 Debian (rewriting=0) 742s git-debrebase WALK BUILD c7dc423ffb995d941617811c9612ee6d65ee3b84 Debian (rewriting=0) 742s git-debrebase WALK BUILD a1a56f704487b6339119bdb910659f5519f0c84d Debian (rewriting=0) 742s git-debrebase WALK BUILD 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Debian (rewriting=0) 742s git-debrebase WALK BUILD cd67898e896264914067d3c0dee667e61099f3c8 Debian (rewriting=0) 742s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 742s git-debrebase WALK BUILD b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream (rewriting=0) 742s git-debrebase WALK BUILD af4f554362ff02a1bbae558a182bb3c926512138 Upstream (rewriting=0) 742s git-debrebase WALK BUILD 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream (rewriting=0) 742s git-debrebase WALK BUILD ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream (rewriting=0) 742s git-debrebase WALK BUILD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream (rewriting=0) 742s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 742s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 742s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 742s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 0x4 742s git-debrebase *** WALK RETURN 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 cd67898e896264914067d3c0dee667e61099f3c8 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 742s git-debrebase: laundered (head was 282c3564ae1a8872cefacb527c7d9dbc05362dc5) 742s git-debrebase >= update refs/ffq-prev/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0000000000000000000000000000000000000000 742s git-debrebase >= delete refs/debrebase-last/heads/master 742s git-debrebase >= update HEAD 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 742s git-debrebase >$ 742s Recorded previous head for preservation 742s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 742s ' 742s + t-git-debrebase stitch 742s + local gdr=git-debrebase 742s + : ' 742s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 742s + git-debrebase --dgit=dgit -D stitch 743s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 743s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 743s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 743s git-debrebase = Upstream {"Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114"} 743s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 743s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 743s git-debrebase = Upstream {"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (edits)\n","Type" => "Upstream","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9"} 743s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 743s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 743s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Parents" => [{"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Differs" => 2,"Ix" => 0}]} 743s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 743s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 743s git-debrebase = Upstream {"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5"} 743s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 743s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 743s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Ix" => 0,"Differs" => 2}]} 743s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 743s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 743s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Ix" => 0,"Differs" => 16}]} 743s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 743s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 743s git-debrebase = Packaging {"Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10"} 743s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 743s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 743s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}],"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Msg" => "DEBIAN add zorkmid (edits)\n","Type" => "Packaging"} 743s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 743s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 743s git-debrebase = Changelog {"Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Msg" => "dch -v 2.0-3 -m testing\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"} 743s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 743s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 743s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"} 743s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 743s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 743s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 743s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 743s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 743s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 743s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 743s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 0x4 743s git-debrebase >= delete refs/ffq-prev/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s git-debrebase >= update refs/debrebase-last/heads/master 282c3564ae1a8872cefacb527c7d9dbc05362dc5 0000000000000000000000000000000000000000 743s git-debrebase >= update HEAD 282c3564ae1a8872cefacb527c7d9dbc05362dc5 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s git-debrebase >$ 743s HEAD is now at 282c356 Declare fast forward / record previous work 743s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 743s ' 743s + t-gdr-good pushed-interop 743s + local state=pushed-interop 743s + local beforetag= 743s + case $state in 743s + t-gdr-made-patches 743s + egrep '^\[git-debrebase' 743s + git log -n1 --pretty=format:%B 743s [git-debrebase pseudomerge: stitch] 743s + git diff --quiet -- :. ':!debian/patches' 743s + LC_MESSAGES=C 743s + t-git-debrebase status 743s + local gdr=git-debrebase 743s + : ' 743s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 743s + git-debrebase --dgit=dgit -D status 743s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 743s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 743s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 743s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Differs" => 0},"CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Type" => "Pseudomerge","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [$VAR1->{"Contributor"},{"Differs" => 4,"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Ix" => 1}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59"} 743s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 743s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 743s git-debrebase = AddPatches {"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Differs" => 4,"Ix" => 0}],"Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "AddPatches","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"} 743s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 743s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 743s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Differs" => 2}],"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Type" => "Upstream","CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 743s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 743s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 743s git-debrebase = Upstream {"Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Msg" => "UPSTREAM edit src.c (edits)\n","Parents" => [{"Differs" => 2,"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Ix" => 0}],"Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Type" => "Upstream"} 743s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 743s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 743s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Type" => "Upstream"} 743s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 743s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 743s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"} 743s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 743s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 743s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2,"Ix" => 0}],"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f"} 743s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 743s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 743s git-debrebase = Changelog {"Parents" => [{"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8"} 743s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 743s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 743s git-debrebase = Packaging {"Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Differs" => 32}],"Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Type" => "Packaging","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 743s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 743s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 743s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (edits)\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Type" => "Packaging"} 743s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 743s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 743s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Msg" => "dch -v 2.0-3 -m testing\n","Parents" => [{"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Ix" => 0}]} 743s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 743s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 743s git-debrebase = Changelog {"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 743s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 743s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 743s git-debrebase = Changelog {"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 743s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 743s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 743s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 743s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 743s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 743s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 743s ' 743s + case $state in 743s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 743s branch contains furniture (not laundered) 743s + egrep '^ stitched$' ../status.check 743s stitched 743s + t-gdr-good-analyse HEAD pushed-interop 743s + local head=HEAD 743s + local state=pushed-interop 743s + local wsfx= 743s + local etypes bwtip 743s + case $state in 743s + etypes=Pseudomerge-AddPatchesInterop-Upstream 743s + anal=../anal 743s + t-git-debrebase analyse HEAD 743s + local gdr=git-debrebase 743s + : ' 743s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 743s + git-debrebase --dgit=dgit -D analyse HEAD 743s git-debrebase *** WALK 282c3564ae1a8872cefacb527c7d9dbc05362dc5 1 *main::STDOUT 743s git-debrebase get_differs cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 02ab455c92be6f90e27681286d7d90d9169dff59 = 0 743s git-debrebase get_differs 2a87115bc3f8ca826ea007ce753107074ca7c619 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 743s git-debrebase classify 282c3564ae1a8872cefacb527c7d9dbc05362dc5 $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe/0 2a87115bc3f8ca826ea007ce753107074ca7c619/0x4 743s git-debrebase = Pseudomerge {"Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Type" => "Pseudomerge","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe\nparent 2a87115bc3f8ca826ea007ce753107074ca7c619\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","CommitId" => "282c3564ae1a8872cefacb527c7d9dbc05362dc5","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe"},{"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Differs" => 4,"Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0]} 743s git-debrebase get_differs 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 02ab455c92be6f90e27681286d7d90d9169dff59 = 0x4 743s git-debrebase classify cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe $t=02ab455c92be6f90e27681286d7d90d9169dff59 @p 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0/0x4 743s git-debrebase = AddPatches {"Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0"}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe","Hdr" => "tree 02ab455c92be6f90e27681286d7d90d9169dff59\nparent 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "02ab455c92be6f90e27681286d7d90d9169dff59","Type" => "AddPatches"} 743s git-debrebase get_differs ccfbba34db87d1958014a2d21910c0101c8899d6 ebb9a97d544852034b312587552ef5dbc685c114 = 0x2 743s git-debrebase classify 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 $t=ebb9a97d544852034b312587552ef5dbc685c114 @p ccfbba34db87d1958014a2d21910c0101c8899d6/0x2 743s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6"}],"CommitId" => "701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree ebb9a97d544852034b312587552ef5dbc685c114\nparent ccfbba34db87d1958014a2d21910c0101c8899d6\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "ebb9a97d544852034b312587552ef5dbc685c114","Type" => "Upstream"} 743s git-debrebase get_differs 57c5b974d287db76460be14f71b4dc55a9bf276e 94e903d12c4fea0802bc29bcc0c98af09b26c2f9 = 0x2 743s git-debrebase classify ccfbba34db87d1958014a2d21910c0101c8899d6 $t=94e903d12c4fea0802bc29bcc0c98af09b26c2f9 @p 57c5b974d287db76460be14f71b4dc55a9bf276e/0x2 743s git-debrebase = Upstream {"Parents" => [{"CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (edits)\n","CommitId" => "ccfbba34db87d1958014a2d21910c0101c8899d6","Hdr" => "tree 94e903d12c4fea0802bc29bcc0c98af09b26c2f9\nparent 57c5b974d287db76460be14f71b4dc55a9bf276e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "94e903d12c4fea0802bc29bcc0c98af09b26c2f9","Type" => "Upstream"} 743s git-debrebase get_differs af4f554362ff02a1bbae558a182bb3c926512138 f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef = 0x2 743s git-debrebase classify 57c5b974d287db76460be14f71b4dc55a9bf276e $t=f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef @p af4f554362ff02a1bbae558a182bb3c926512138/0x2 743s git-debrebase = Upstream {"Hdr" => "tree f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef\nparent af4f554362ff02a1bbae558a182bb3c926512138\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "f6a70b653e8155f4a7fc5bcc8cd4c3c1f07819ef","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "57c5b974d287db76460be14f71b4dc55a9bf276e"} 743s git-debrebase get_differs b013e77447acc11029f98a8aa19d74b4c2c315d7 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 = 0x2 743s git-debrebase classify af4f554362ff02a1bbae558a182bb3c926512138 $t=0afd237d5ffe90b0064ef1fd44fa18e6211c38f5 @p b013e77447acc11029f98a8aa19d74b4c2c315d7/0x2 743s git-debrebase = Upstream {"Hdr" => "tree 0afd237d5ffe90b0064ef1fd44fa18e6211c38f5\nparent b013e77447acc11029f98a8aa19d74b4c2c315d7\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "0afd237d5ffe90b0064ef1fd44fa18e6211c38f5","Parents" => [{"CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Differs" => 2,"Ix" => 0}],"CommitId" => "af4f554362ff02a1bbae558a182bb3c926512138","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 743s git-debrebase get_differs cd67898e896264914067d3c0dee667e61099f3c8 dc05b239bb4c78149815951c716d1e1fa093e48f = 0x2 743s git-debrebase classify b013e77447acc11029f98a8aa19d74b4c2c315d7 $t=dc05b239bb4c78149815951c716d1e1fa093e48f @p cd67898e896264914067d3c0dee667e61099f3c8/0x2 743s git-debrebase = Upstream {"Tree" => "dc05b239bb4c78149815951c716d1e1fa093e48f","Type" => "Upstream","Hdr" => "tree dc05b239bb4c78149815951c716d1e1fa093e48f\nparent cd67898e896264914067d3c0dee667e61099f3c8\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "b013e77447acc11029f98a8aa19d74b4c2c315d7","Parents" => [{"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Differs" => 2,"Ix" => 0}]} 743s git-debrebase get_differs 8e4834ab8bffee2a148fe5e4a53f45b914afd569 49d731dc7acf72ce4b2bcf6973269d99d628006e = 0x10 743s git-debrebase classify cd67898e896264914067d3c0dee667e61099f3c8 $t=49d731dc7acf72ce4b2bcf6973269d99d628006e @p 8e4834ab8bffee2a148fe5e4a53f45b914afd569/0x10 743s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569"}],"CommitId" => "cd67898e896264914067d3c0dee667e61099f3c8","Msg" => "dch -r -D unstable\n","Hdr" => "tree 49d731dc7acf72ce4b2bcf6973269d99d628006e\nparent 8e4834ab8bffee2a148fe5e4a53f45b914afd569\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "49d731dc7acf72ce4b2bcf6973269d99d628006e","Type" => "Changelog"} 743s git-debrebase get_differs a1a56f704487b6339119bdb910659f5519f0c84d 94b74a84b4a0a0460454e297068317bdc35cfb10 = 0x20 743s git-debrebase classify 8e4834ab8bffee2a148fe5e4a53f45b914afd569 $t=94b74a84b4a0a0460454e297068317bdc35cfb10 @p a1a56f704487b6339119bdb910659f5519f0c84d/0x20 743s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "94b74a84b4a0a0460454e297068317bdc35cfb10","Hdr" => "tree 94b74a84b4a0a0460454e297068317bdc35cfb10\nparent a1a56f704487b6339119bdb910659f5519f0c84d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "8e4834ab8bffee2a148fe5e4a53f45b914afd569","Msg" => "MIXED add both() (edits)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d","Ix" => 0,"Differs" => 32}]} 743s git-debrebase get_differs c7dc423ffb995d941617811c9612ee6d65ee3b84 3dc2df073616cf7c45768e37f228bae67a5fd97d = 0x20 743s git-debrebase classify a1a56f704487b6339119bdb910659f5519f0c84d $t=3dc2df073616cf7c45768e37f228bae67a5fd97d @p c7dc423ffb995d941617811c9612ee6d65ee3b84/0x20 743s git-debrebase = Packaging {"Hdr" => "tree 3dc2df073616cf7c45768e37f228bae67a5fd97d\nparent c7dc423ffb995d941617811c9612ee6d65ee3b84\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3dc2df073616cf7c45768e37f228bae67a5fd97d","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84"}],"Msg" => "DEBIAN add zorkmid (edits)\n","CommitId" => "a1a56f704487b6339119bdb910659f5519f0c84d"} 743s git-debrebase get_differs 32b1b8f0bdc575561b14de2ec9711d768a12d928 b89348f5d96604173feba80c38b2d9346b49d90e = 0x10 743s git-debrebase classify c7dc423ffb995d941617811c9612ee6d65ee3b84 $t=b89348f5d96604173feba80c38b2d9346b49d90e @p 32b1b8f0bdc575561b14de2ec9711d768a12d928/0x10 743s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928"}],"Msg" => "dch -v 2.0-3 -m testing\n","CommitId" => "c7dc423ffb995d941617811c9612ee6d65ee3b84","Hdr" => "tree b89348f5d96604173feba80c38b2d9346b49d90e\nparent 32b1b8f0bdc575561b14de2ec9711d768a12d928\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b89348f5d96604173feba80c38b2d9346b49d90e","Type" => "Changelog"} 743s git-debrebase get_differs 9214201f528bae71f4647709e2357407746739d5 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 743s git-debrebase classify 32b1b8f0bdc575561b14de2ec9711d768a12d928 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 9214201f528bae71f4647709e2357407746739d5/0x10 743s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "32b1b8f0bdc575561b14de2ec9711d768a12d928","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "9214201f528bae71f4647709e2357407746739d5"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 9214201f528bae71f4647709e2357407746739d5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 743s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 743s git-debrebase classify 9214201f528bae71f4647709e2357407746739d5 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 743s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "9214201f528bae71f4647709e2357407746739d5","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 743s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 743s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 743s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 743s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 743s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 15 pm 0 743s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 743s ' 743s ++ git rev-parse HEAD 743s + expect=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + exec 743s + local cid ctype info nparents 743s + read cid ctype info 743s + : ===== 282c3564ae1a8872cefacb527c7d9dbc05362dc5 Pseudomerge Contributor=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe ===== 743s + test 282c3564ae1a8872cefacb527c7d9dbc05362dc5 = 282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + local cetype=Pseudomerge 743s + '[' xPseudomerge = xPseudomerge ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P 282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + local 'parents=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 743s + expect='cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 743s + enparents=1 743s + : Pseudomerge/SAME 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 743s + expect=cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 743s + enparents=2 743s + git diff --quiet cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe..282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + etypes=AddPatchesInterop-Upstream 743s + : 'reject pointless pseudomerges' 743s + local 'overwritten= 2a87115bc3f8ca826ea007ce753107074ca7c619' 743s + overwritten=2a87115bc3f8ca826ea007ce753107074ca7c619 743s + t-git-debrebase analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 743s + local gdr=git-debrebase 743s + : ' 743s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 743s + git-debrebase --dgit=dgit -D analyse 2a87115bc3f8ca826ea007ce753107074ca7c619 743s git-debrebase *** WALK 2a87115bc3f8ca826ea007ce753107074ca7c619 1 *main::STDOUT 743s git-debrebase get_differs cd1a73b0d571c79ca12a7d8b4a4a93b863931061 e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e = 0x10 743s git-debrebase classify 2a87115bc3f8ca826ea007ce753107074ca7c619 $t=e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e @p cd1a73b0d571c79ca12a7d8b4a4a93b863931061/0x10 743s git-debrebase = Changelog {"CommitId" => "2a87115bc3f8ca826ea007ce753107074ca7c619","Tree" => "e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e","Hdr" => "tree e9def31fd4fdde9917f9d9c6d6afeb3b29a36b9e\nparent cd1a73b0d571c79ca12a7d8b4a4a93b863931061\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Differs" => 16,"Ix" => 0}]} 743s git-debrebase get_differs 2ceed1229dd14a9c7bd40480c061a7e55243e34f d46f208b7607ba8804649163cd2bead722b3dcd1 = 0x22 743s git-debrebase classify cd1a73b0d571c79ca12a7d8b4a4a93b863931061 $t=d46f208b7607ba8804649163cd2bead722b3dcd1 @p 2ceed1229dd14a9c7bd40480c061a7e55243e34f/0x22 743s git-debrebase = Mixed {"Hdr" => "tree d46f208b7607ba8804649163cd2bead722b3dcd1\nparent 2ceed1229dd14a9c7bd40480c061a7e55243e34f\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "d46f208b7607ba8804649163cd2bead722b3dcd1","CommitId" => "cd1a73b0d571c79ca12a7d8b4a4a93b863931061","Msg" => "MIXED add both() (edits)\n","Parents" => [{"CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f","Differs" => 34,"Ix" => 0}],"Type" => "Mixed"} 743s git-debrebase get_differs 1ee5d138031b9e8febce2769522b7ff8faa92fe3 e0f113b557570441f656fe976c2e2317cf95b193 = 0x2 743s git-debrebase classify 2ceed1229dd14a9c7bd40480c061a7e55243e34f $t=e0f113b557570441f656fe976c2e2317cf95b193 @p 1ee5d138031b9e8febce2769522b7ff8faa92fe3/0x2 743s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3"}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (edits)\n","Hdr" => "tree e0f113b557570441f656fe976c2e2317cf95b193\nparent 1ee5d138031b9e8febce2769522b7ff8faa92fe3\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "e0f113b557570441f656fe976c2e2317cf95b193","CommitId" => "2ceed1229dd14a9c7bd40480c061a7e55243e34f"} 743s git-debrebase get_differs e3ea5bfb0516ddc14aa79d0498e07ca91defd33b f9239e94551063b14f3d1dca12ff06dbd096b2af = 0x20 743s git-debrebase classify 1ee5d138031b9e8febce2769522b7ff8faa92fe3 $t=f9239e94551063b14f3d1dca12ff06dbd096b2af @p e3ea5bfb0516ddc14aa79d0498e07ca91defd33b/0x20 743s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b"}],"Msg" => "DEBIAN add zorkmid (edits)\n","CommitId" => "1ee5d138031b9e8febce2769522b7ff8faa92fe3","Tree" => "f9239e94551063b14f3d1dca12ff06dbd096b2af","Hdr" => "tree f9239e94551063b14f3d1dca12ff06dbd096b2af\nparent e3ea5bfb0516ddc14aa79d0498e07ca91defd33b\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 743s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 = 0x10 743s git-debrebase classify e3ea5bfb0516ddc14aa79d0498e07ca91defd33b $t=367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x10 743s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Msg" => "dch -v 2.0-3 -m testing\n","CommitId" => "e3ea5bfb0516ddc14aa79d0498e07ca91defd33b","Hdr" => "tree 367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "367ca2f64033f4fd8702cc5e21387c3ae3a5ffd7"} 743s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 743s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 743s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460"} 743s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 743s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 743s git-debrebase = Changelog {"Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Msg" => "dch -r -D unstable\n"} 743s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 743s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 743s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Parents" => [{"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16}],"Type" => "Changelog"} 743s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 743s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 743s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 743s git-debrebase = Pseudomerge {"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0]} 743s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 743s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 743s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}]} 743s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 743s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 743s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 743s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 743s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 743s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Type" => "Upstream"} 743s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 743s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 743s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 743s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 743s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 6 upp 6 proc 15 pm 0 743s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 743s ' 743s + local ocid otype oinfo 743s + read ocid otype oinfo 743s + case "$otype" in 743s ++ printf %s 'cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 2a87115bc3f8ca826ea007ce753107074ca7c619' 743s ++ wc -w 743s + local cnparents=2 743s + test 2 = 2 743s ++ for f in $parents 743s ++ echo cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 743s ++ for f in $parents 743s ++ echo 2a87115bc3f8ca826ea007ce753107074ca7c619 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=2 743s + test 2 = 2 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe AddPatches ===== 743s + test cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe = cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 743s + local cetype=AddPatchesInterop 743s + '[' xAddPatches = xAddPatchesInterop ']' 743s ++ git log -n1 --pretty=format:%P cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe 743s + local parents=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s + expect=701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s + enparents=1 743s + : AddPatches/AddPatchesInterop 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + git log -n1 --pretty=format:%B 743s + grep '^\[git-debrebase[ :]' 743s [git-debrebase pseudomerge: stitch] 743s + case "$ctype" in 743s + git diff --quiet 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0..cb1f7fd3d57f4a419bd2cbff8f28c2e8b7b9fbbe -- :. ':!debian/patches' 743s + etypes=Upstream 743s ++ printf %s 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 Upstream ===== 743s + test 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 = 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s + local cetype=Upstream 743s + '[' xUpstream = xUpstream ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0 743s + local parents=ccfbba34db87d1958014a2d21910c0101c8899d6 743s + expect=ccfbba34db87d1958014a2d21910c0101c8899d6 743s + enparents=1 743s + : Upstream/SAME ccfbba34db87d1958014a2d21910c0101c8899d6 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s ++ printf %s ccfbba34db87d1958014a2d21910c0101c8899d6 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo ccfbba34db87d1958014a2d21910c0101c8899d6 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== ccfbba34db87d1958014a2d21910c0101c8899d6 Upstream ===== 743s + test ccfbba34db87d1958014a2d21910c0101c8899d6 = ccfbba34db87d1958014a2d21910c0101c8899d6 743s + local cetype=Upstream 743s + '[' xUpstream = xUpstream ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P ccfbba34db87d1958014a2d21910c0101c8899d6 743s + local parents=57c5b974d287db76460be14f71b4dc55a9bf276e 743s + expect=57c5b974d287db76460be14f71b4dc55a9bf276e 743s + enparents=1 743s + : Upstream/SAME 57c5b974d287db76460be14f71b4dc55a9bf276e 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s ++ printf %s 57c5b974d287db76460be14f71b4dc55a9bf276e 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 57c5b974d287db76460be14f71b4dc55a9bf276e 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 57c5b974d287db76460be14f71b4dc55a9bf276e Upstream ===== 743s + test 57c5b974d287db76460be14f71b4dc55a9bf276e = 57c5b974d287db76460be14f71b4dc55a9bf276e 743s + local cetype=Upstream 743s + '[' xUpstream = xUpstream ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P 57c5b974d287db76460be14f71b4dc55a9bf276e 743s + local parents=af4f554362ff02a1bbae558a182bb3c926512138 743s + expect=af4f554362ff02a1bbae558a182bb3c926512138 743s + enparents=1 743s + : Upstream/SAME af4f554362ff02a1bbae558a182bb3c926512138 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s ++ printf %s af4f554362ff02a1bbae558a182bb3c926512138 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo af4f554362ff02a1bbae558a182bb3c926512138 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== af4f554362ff02a1bbae558a182bb3c926512138 Upstream ===== 743s + test af4f554362ff02a1bbae558a182bb3c926512138 = af4f554362ff02a1bbae558a182bb3c926512138 743s + local cetype=Upstream 743s + '[' xUpstream = xUpstream ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P af4f554362ff02a1bbae558a182bb3c926512138 743s + local parents=b013e77447acc11029f98a8aa19d74b4c2c315d7 743s + expect=b013e77447acc11029f98a8aa19d74b4c2c315d7 743s + enparents=1 743s + : Upstream/SAME b013e77447acc11029f98a8aa19d74b4c2c315d7 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s ++ printf %s b013e77447acc11029f98a8aa19d74b4c2c315d7 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo b013e77447acc11029f98a8aa19d74b4c2c315d7 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== b013e77447acc11029f98a8aa19d74b4c2c315d7 Upstream ===== 743s + test b013e77447acc11029f98a8aa19d74b4c2c315d7 = b013e77447acc11029f98a8aa19d74b4c2c315d7 743s + local cetype=Upstream 743s + '[' xUpstream = xUpstream ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P b013e77447acc11029f98a8aa19d74b4c2c315d7 743s + local parents=cd67898e896264914067d3c0dee667e61099f3c8 743s + expect=cd67898e896264914067d3c0dee667e61099f3c8 743s + enparents=1 743s + : Upstream/SAME cd67898e896264914067d3c0dee667e61099f3c8 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s ++ printf %s cd67898e896264914067d3c0dee667e61099f3c8 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo cd67898e896264914067d3c0dee667e61099f3c8 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== cd67898e896264914067d3c0dee667e61099f3c8 Changelog ===== 743s + test cd67898e896264914067d3c0dee667e61099f3c8 = cd67898e896264914067d3c0dee667e61099f3c8 743s + local cetype=Upstream 743s + '[' xChangelog = xUpstream ']' 743s ++ git log -n1 --pretty=format:%P cd67898e896264914067d3c0dee667e61099f3c8 743s + local parents=8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s + expect=8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s + enparents=1 743s + : Changelog/Upstream 8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + '[' x '!=' x ']' 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet 8e4834ab8bffee2a148fe5e4a53f45b914afd569..cd67898e896264914067d3c0dee667e61099f3c8 -- :. ':!debian/changelog' 743s + etypes=Packaging 743s ++ printf %s 8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 8e4834ab8bffee2a148fe5e4a53f45b914afd569 Packaging ===== 743s + test 8e4834ab8bffee2a148fe5e4a53f45b914afd569 = 8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s + local cetype=Packaging 743s + '[' xPackaging = xPackaging ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P 8e4834ab8bffee2a148fe5e4a53f45b914afd569 743s + local parents=a1a56f704487b6339119bdb910659f5519f0c84d 743s + expect=a1a56f704487b6339119bdb910659f5519f0c84d 743s + enparents=1 743s + : Packaging/SAME a1a56f704487b6339119bdb910659f5519f0c84d 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :. ':!debian' 743s + git diff --quiet a1a56f704487b6339119bdb910659f5519f0c84d..8e4834ab8bffee2a148fe5e4a53f45b914afd569 -- :debian/patches 743s + etypes=Packaging 743s ++ printf %s a1a56f704487b6339119bdb910659f5519f0c84d 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo a1a56f704487b6339119bdb910659f5519f0c84d 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== a1a56f704487b6339119bdb910659f5519f0c84d Packaging ===== 743s + test a1a56f704487b6339119bdb910659f5519f0c84d = a1a56f704487b6339119bdb910659f5519f0c84d 743s + local cetype=Packaging 743s + '[' xPackaging = xPackaging ']' 743s + cetype=SAME 743s ++ git log -n1 --pretty=format:%P a1a56f704487b6339119bdb910659f5519f0c84d 743s + local parents=c7dc423ffb995d941617811c9612ee6d65ee3b84 743s + expect=c7dc423ffb995d941617811c9612ee6d65ee3b84 743s + enparents=1 743s + : Packaging/SAME c7dc423ffb995d941617811c9612ee6d65ee3b84 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :. ':!debian' 743s + git diff --quiet c7dc423ffb995d941617811c9612ee6d65ee3b84..a1a56f704487b6339119bdb910659f5519f0c84d -- :debian/patches 743s + etypes=Packaging 743s ++ printf %s c7dc423ffb995d941617811c9612ee6d65ee3b84 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo c7dc423ffb995d941617811c9612ee6d65ee3b84 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== c7dc423ffb995d941617811c9612ee6d65ee3b84 Changelog ===== 743s + test c7dc423ffb995d941617811c9612ee6d65ee3b84 = c7dc423ffb995d941617811c9612ee6d65ee3b84 743s + local cetype=Packaging 743s + '[' xChangelog = xPackaging ']' 743s ++ git log -n1 --pretty=format:%P c7dc423ffb995d941617811c9612ee6d65ee3b84 743s + local parents=32b1b8f0bdc575561b14de2ec9711d768a12d928 743s + expect=32b1b8f0bdc575561b14de2ec9711d768a12d928 743s + enparents=1 743s + : Changelog/Packaging 32b1b8f0bdc575561b14de2ec9711d768a12d928 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet 32b1b8f0bdc575561b14de2ec9711d768a12d928..c7dc423ffb995d941617811c9612ee6d65ee3b84 -- :. ':!debian/changelog' 743s + etypes=Packaging 743s ++ printf %s 32b1b8f0bdc575561b14de2ec9711d768a12d928 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 32b1b8f0bdc575561b14de2ec9711d768a12d928 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 32b1b8f0bdc575561b14de2ec9711d768a12d928 Changelog ===== 743s + test 32b1b8f0bdc575561b14de2ec9711d768a12d928 = 32b1b8f0bdc575561b14de2ec9711d768a12d928 743s + local cetype=Packaging 743s + '[' xChangelog = xPackaging ']' 743s ++ git log -n1 --pretty=format:%P 32b1b8f0bdc575561b14de2ec9711d768a12d928 743s + local parents=9214201f528bae71f4647709e2357407746739d5 743s + expect=9214201f528bae71f4647709e2357407746739d5 743s + enparents=1 743s + : Changelog/Packaging 9214201f528bae71f4647709e2357407746739d5 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet 9214201f528bae71f4647709e2357407746739d5..32b1b8f0bdc575561b14de2ec9711d768a12d928 -- :. ':!debian/changelog' 743s + etypes=Packaging 743s ++ printf %s 9214201f528bae71f4647709e2357407746739d5 743s ++ wc -w 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 9214201f528bae71f4647709e2357407746739d5 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 9214201f528bae71f4647709e2357407746739d5 Changelog ===== 743s + test 9214201f528bae71f4647709e2357407746739d5 = 9214201f528bae71f4647709e2357407746739d5 743s + local cetype=Packaging 743s + '[' xChangelog = xPackaging ']' 743s ++ git log -n1 --pretty=format:%P 9214201f528bae71f4647709e2357407746739d5 743s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + enparents=1 743s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..9214201f528bae71f4647709e2357407746739d5 -- :. ':!debian/changelog' 743s + etypes=Packaging 743s ++ wc -w 743s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + local cnparents=1 743s + test 1 = 1 743s ++ for f in $parents 743s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s ++ wc -w 743s ++ t-sort -u 743s ++ LC_COLLATE=C 743s ++ sort -u 743s + local cndparents=1 743s + test 1 = 1 743s + case "$parents" in 743s + case "$ctype" in 743s + read cid ctype info 743s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 743s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + local cetype=Packaging 743s + '[' xAnchor = xPackaging ']' 743s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 743s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 743s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 743s + enparents=1 743s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 743s + case "$ctype/$cetype" in 743s + case "$ctype/$etypes" in 743s + case "$cetype" in 743s + case "$ctype" in 743s + break 743s + t-refs-same-start 743s + unset t_ref_val 743s + t_ref_names=() 743s + t-ref-same refs/heads/before-noop 743s + local name=refs/heads/before-noop 743s + local val 743s ++ t-git-get-ref refs/heads/before-noop 743s ++ local ref=refs/heads/before-noop 743s ++ case "$ref" in 743s ++ git show-ref -d refs/heads/before-noop 743s ++ perl -ne ' 743s $x = $1 if m#^(\w+) \Qrefs/heads/before-noop\E(?:\^\{\})?$#; 743s END { print "$x\n" if length $x; } 743s ' 743s + val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + t-ref-same-val refs/heads/before-noop 282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + local name=refs/heads/before-noop 743s + local val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + case "${t_ref_val-unset}" in 743s + t_ref_val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + t_ref_names+=("$name") 743s + t-ref-head 743s + local val 743s ++ git rev-parse HEAD 743s + val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + t-ref-same-val HEAD 282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + local name=HEAD 743s + local val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + case "${t_ref_val-unset}" in 743s + t_ref_val=282c3564ae1a8872cefacb527c7d9dbc05362dc5 743s + t_ref_names+=("$name") 743s + git checkout -b some-new-branch 743s Switched to a new branch 'some-new-branch' 743s + t-some-changes 2nd-maintainer 743s + local token=2nd-maintainer 743s + local which=dum 743s + local fsuffix= 743s + t-git-next-date 743s + GIT_COMMITTER_DATE='1530000005 +0100' 743s + GIT_AUTHOR_DATE='1530000005 +0100' 743s + case "$which" in 743s + echo '// debian 2nd-maintainer' 743s + git add debian/zorkmid 743s + git commit -m 'DEBIAN add zorkmid (2nd-maintainer)' 743s [some-new-branch e5f51ca] DEBIAN add zorkmid (2nd-maintainer) 743s 1 file changed, 1 insertion(+) 743s + case "$which" in 743s + echo '// upstream 2nd-maintainer' 743s + git add src.c 743s + git commit -m 'UPSTREAM edit src.c (2nd-maintainer)' 743s [some-new-branch b7ab765] UPSTREAM edit src.c (2nd-maintainer) 743s 1 file changed, 1 insertion(+) 743s + case "$which" in 743s + for f in debian/zorkmid$fsuffix src$fsuffix.c 743s + echo '// both! 2nd-maintainer' 743s + git add debian/zorkmid 743s + for f in debian/zorkmid$fsuffix src$fsuffix.c 743s + echo '// both! 2nd-maintainer' 743s + git add src.c 743s + git commit -m 'MIXED add both() (2nd-maintainer)' 743s [some-new-branch 9825434] MIXED add both() (2nd-maintainer) 743s 2 files changed, 2 insertions(+) 743s + t-git-next-date 743s + GIT_COMMITTER_DATE='1530000006 +0100' 743s + GIT_AUTHOR_DATE='1530000006 +0100' 743s + t-dgit quilt-fixup 743s + local dgit=dgit 743s + pwd 743s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 743s + : ' 743s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 743s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 743s | git rev-parse --show-toplevel 743s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 743s | git config -z --get-regexp --local '.*' 743s | git config -z --get-regexp --local '.*' 743s | git config -z --get-regexp --global '.*' 743s | git config -z --get-regexp --system '.*' 743s format 3.0 (quilt), quilt mode linear 743s Format `3.0 (quilt)', need to check/update patch stack 743s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 743s => `' 743s + git diff --quiet HEAD 743s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 743s dpkg-buildpackage: info: source package example 743s dpkg-buildpackage: info: source version 2.0-3 743s dpkg-buildpackage: info: source distribution unstable 743s dpkg-buildpackage: info: source changed by dgit test git user 744s fakeroot debian/rules clean 744s EXAMPLE RULES TARGET clean 744s dh_clean 744s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 744s | git clean -dn 744s => `' 744s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 744s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 744s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 744s | git rev-parse 'HEAD~0' 744s => `98254340cd9a78095ae96287fad0e8a131d0d94d' 744s | git symbolic-ref -q HEAD 744s => `refs/heads/some-new-branch' 744s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 744s CD work 744s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 744s + git reset -q --hard 98254340cd9a78095ae96287fad0e8a131d0d94d 744s examining quilt state (multiple patches, linear mode) 744s branch_is_gdr 98254340cd9a78095ae96287fad0e8a131d0d94d... 744s branch_is_gdr 282c3564ae1a8872cefacb527c7d9dbc05362dc5 gdr pseudomerge YES 744s + git reset -q --hard 98254340cd9a78095ae96287fad0e8a131d0d94d 744s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 744s git-debrebase: snag ignored (-funclean-mixed): found mixed upstream/packaging commit (98254340cd9a78095ae96287fad0e8a131d0d94d) 744s git-debrebase: snag ignored (-funclean-ordering): packaging change (e5f51cad32cde61921399fae2d3b4026e127031e) follows upstream change (eg 701b2eff779bc9feab35d91bb4bcbbe28e1f1ca0) 744s git-debrebase: snags: 2 overriden by individual -f options 744s HEAD is now at 959f253 Commit patch queue (exported by git-debrebase) 744s | git rev-parse 'HEAD~0' 744s => `959f253da81a94e2348c21f5026c6dcc53274027' 744s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 744s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 744s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 744s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 744s CD fake 744s | find -name .git -prune -print0 744s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 744s + git checkout -f 959f253da81a94e2348c21f5026c6dcc53274027 -- debian 744s + git add -Af . 744s | git write-tree 744s => `0656de82f5ba28624a42a01bf6f06c10a66abebc' 744s fake orig tree object 0656de82f5ba28624a42a01bf6f06c10a66abebc 744s CD .. 744s + git reset -q --hard 959f253da81a94e2348c21f5026c6dcc53274027 744s CD ../fake 744s + git add -Af . 744s | git write-tree 744s => `c9bb90a388a4224fbe0402d107756b300f698fda' 744s fake o+d/p tree object 0656de82f5ba28624a42a01bf6f06c10a66abebc 744s CD ../work 744s | git ls-tree --name-only -z 959f253da81a94e2348c21f5026c6dcc53274027 744s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 744s | git diff-tree -z --no-renames -r 0656de82f5ba28624a42a01bf6f06c10a66abebc 959f253da81a94e2348c21f5026c6dcc53274027 744s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc cd4042b95d8dc41c076945915cb368476305ff34 M\x00src.c\x00' 744s quiltify_trees_differ 0656de82f5ba28624a42a01bf6f06c10a66abebc 959f253da81a94e2348c21f5026c6dcc53274027 => 1 744s | git diff-tree -z --no-renames --name-only -r 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda 744s => `' 744s quiltify_trees_differ 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda => 0 744s | git diff-tree -z --no-renames --name-only -r 0656de82f5ba28624a42a01bf6f06c10a66abebc c9bb90a388a4224fbe0402d107756b300f698fda 744s => `lib.c\x00new-upstream-file\x00src.c\x00' 744s quiltify_trees_differ 0656de82f5ba28624a42a01bf6f06c10a66abebc c9bb90a388a4224fbe0402d107756b300f698fda => 1 744s differences @dl ## ## == == == ==. 744s dgit: base trees orig=0656de82f5ba28624a42 o+d/p=c9bb90a388a4224fbe04 744s dgit: quilt differences: src: ## orig ## gitignores: == orig == 744s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 744s starting quiltify (multiple patches, linear mode) 744s | git ls-tree --name-only 959f253da81a94e2348c21f5026c6dcc53274027 -- debian/rules debian/control 744s => `debian/control'... 744s quiltify investigate 959f253da81a94e2348c21f5026c6dcc53274027 744s | git diff-tree -z --no-renames --name-only 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda 744s => `' 744s quiltify_trees_differ 959f253da81a94e2348c21f5026c6dcc53274027 c9bb90a388a4224fbe0402d107756b300f698fda => 0 744s search finished hooray! 744s quiltify linearisation planning successful, executing... 744s + git checkout -q master 744s | git status --ignored --porcelain 744s => `?? .pc/' 744s nothing quilty to commit, ok. 744s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 744s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 744s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 744s ' 744s + t-gdr-made-patches 744s + git log -n1 --pretty=format:%B 744s + egrep '^\[git-debrebase' 744s [git-debrebase make-patches: export and commit patches] 744s + t-ok 744s + : ======================================== 744s + t-check-only-bpd 744s + '[' .. = .. ']' 744s + return 744s + t-fscks 744s + shopt -s nullglob 744s + for d in $tmp/*/.git $tmp/git/*.git 744s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 744s + t-git-fsck 744s ++ git rev-parse --git-dir 744s + local fsckerrs=.git/dgit-test-fsck.errs 744s + set +e 744s + LC_MESSAGES=C 744s + git fsck --no-dangling --strict 744s + tee .git/dgit-test-fsck.errs 744s + ps='0 0' 744s + set -e 744s + local pats 744s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 744s + test '0 0' = '0 0' 744s + pats+=(-e 'notice: HEAD points to an unborn branch') 744s + pats+=(-e 'notice: No default references') 744s + set +e 744s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 744s + rc=1 744s + set -e 744s + case $rc in 744s + for d in $tmp/*/.git $tmp/git/*.git 744s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 744s + t-git-fsck 744s ++ git rev-parse --git-dir 744s + local fsckerrs=./dgit-test-fsck.errs 744s + set +e 744s + tee ./dgit-test-fsck.errs 744s + LC_MESSAGES=C 744s + git fsck --no-dangling --strict 744s notice: HEAD points to an unborn branch (master) 744s + ps='0 0' 744s + set -e 744s + local pats 744s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 744s + test '0 0' = '0 0' 744s + pats+=(-e 'notice: HEAD points to an unborn branch') 744s + pats+=(-e 'notice: No default references') 744s + set +e 744s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 744s + rc=1 744s + set -e 744s + case $rc in 744s + t-save-artifacts 744s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-edits-artifacts 744s + '[' x/tmp/autopkgtest.ztMUxl/gdr-edits-artifacts = x ']' 744s + '[' xtmp = x ']' 744s + GZIP=-1v 744s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-edits-artifacts/gdr-edits.tar.gz '--exclude=*.tar' . 744s gzip: warning: GZIP environment variable is deprecated; use an alias or script 744s 80.4% 744s + echo ok. 744s ok. 744s + rc=0 744s + set +x 744s + set +e 744s + pwd 744s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 744s + '[' x '!=' x ']' 744s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 744s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 744s + set -e 744s + test 0 = 0 745s autopkgtest [12:30:39]: test gdr-edits: -----------------------] 745s gdr-edits PASS 745s autopkgtest [12:30:39]: test gdr-edits: - - - - - - - - - - results - - - - - - - - - - 745s autopkgtest [12:30:39]: test gdr-fresh: preparing testbed 745s Reading package lists... 745s Building dependency tree... 745s Reading state information... 746s Starting pkgProblemResolver with broken count: 0 746s Starting 2 pkgProblemResolver with broken count: 0 746s Done 746s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 746s autopkgtest [12:30:40]: test gdr-fresh: [----------------------- 747s ++ set -o pipefail 747s ++ . tests/lib-core 747s ++ . tests/lib-restricts 747s ++ trap ' 747s rc=$? 747s set +x 747s test $rc = 0 || echo " 747s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 747s 747s Most relevant logs are just before assignment rc=$rc 747s Will now do cleanup etc. 747s " 747s set -x 747s set +e 747s pwd 747s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 747s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 747s set -e 747s test $rc = 0 || t-report-failure 747s ' EXIT 747s ++ t-filter-out-git-hyphen-dir 747s ++ local pathent 747s +++ type -p git-rev-parse 747s +++ : 747s ++ pathent= 747s ++ case "$pathent" in 747s ++ return 747s ++ t-set-intree 747s ++ '[' x = x ']' 747s ++ return 747s ++ : -D 747s ++ export DGIT_TEST_DEBUG 747s ++ : x 747s ++ export DGIT_TEST_DEBPUSH_DEBUG 747s ++ : 747s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 747s ++ GIT_COMMITTER_DATE='1530000000 +0100' 747s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 747s ++ GIT_AUTHOR_DATE='1530000000 +0100' 747s ++ export LC_CTYPE=C.UTF-8 747s ++ LC_CTYPE=C.UTF-8 747s ++ unset CDPATH 747s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 747s ++ FILTER_BRANCH_SQUELCH_WARNING=1 747s +++ pwd 747s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 747s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 747s ++ testname=gdr-fresh 747s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 747s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 747s ++ bpd=.. 747s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 747s ++ '[' x '!=' x ']' 747s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s +++ pwd 747s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ t-set-using-tmp 747s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 747s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 747s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 747s ++ export 'DEBFULLNAME=dgit test git user' 747s ++ DEBFULLNAME='dgit test git user' 747s ++ git config --global user.email dgit-test@debian.example.net 747s ++ git config --global user.name 'dgit test git user' 747s ++ git config --global protocol.ext.allow always 747s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 747s ++ env -0 747s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 747s ++ export DEBCHANGE_VENDOR=dpkg 747s ++ DEBCHANGE_VENDOR=dpkg 747s ++ unset VISUAL 747s ++ unset GIT_EDITOR 747s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 747s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 747s ++ cat 747s ++ schroot=build 747s ++ : aq 747s ++ : archive/test-dummy 747s ++ : sid:unstable 747s ++ t-git-config dgit.default.old-dsc-distro test-dummy 747s ++ git config --global dgit.default.old-dsc-distro test-dummy 747s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 747s ++ : -D 747s ++ export GDR_TEST_DEBUG 747s ++ t-tstunt debchange 747s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s ++ local var=PATH 747s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s ++ eval ' 747s case "$PATH" in 747s "$tstunt:"*) ;; 747s *":$tstunt:"*) ;; 747s "") PATH="$tstunt" ;; 747s *) PATH="$tstunt:$PATH" ;; 747s esac 747s export PATH 747s ' 747s +++ case "$PATH" in 747s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 747s +++ export PATH 747s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s ++ local var=PERLLIB 747s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s ++ eval ' 747s case "$PERLLIB" in 747s "$tstunt:"*) ;; 747s *":$tstunt:"*) ;; 747s "") PERLLIB="$tstunt" ;; 747s *) PERLLIB="$tstunt:$PERLLIB" ;; 747s esac 747s export PERLLIB 747s ' 747s +++ case "$PERLLIB" in 747s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 747s +++ export PERLLIB 747s ++ local f 747s ++ for f in "$@" 747s ++ t-tstunt--save-real debchange 747s ++ local f=debchange 747s ++ case "$f" in 747s ++ local rc 747s ++ local real 747s ++ set +e 747s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 747s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 747s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 747s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 747s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 747s +++ type -p debchange 747s ++ real=/usr/bin/debchange 747s ++ rc=0 747s ++ set -e 747s ++ case $rc in 747s ++ local varname=debchange 747s ++ varname=DGIT_TEST_REAL_DEBCHANGE 747s ++ eval ' 747s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 747s export DGIT_TEST_REAL_DEBCHANGE 747s ' 747s +++ : /usr/bin/debchange 747s +++ export DGIT_TEST_REAL_DEBCHANGE 747s ++ f=./debchange 747s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 747s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 747s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 747s + t-dependencies GDR 747s + : 'Hopefully installed: GDR' 747s + t-gdr-gbp-import-core 747s + p=example 747s + t-worktree 1.1 747s + rm -rf example 747s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 747s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 747s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 747s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 747s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 747s + cd example 747s + : 'fake up some kind of upstream' 747s + git checkout -b upstream quilt-tip 747s Switched to a new branch 'upstream' 747s + rm -rf debian 747s + mkdir debian 747s + echo junk 747s + git add debian 747s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-fresh)' 747s [upstream 2e6a887] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-fresh) 747s 6 files changed, 1 insertion(+), 36 deletions(-) 747s delete mode 100644 debian/changelog 747s delete mode 100644 debian/compat 747s delete mode 100644 debian/control 747s delete mode 100644 debian/example.install 747s mode change 100755 => 100644 debian/rules 747s delete mode 100644 debian/source/format 747s + git tag v1.0 747s + t-git-next-date 747s + GIT_COMMITTER_DATE='1530000001 +0100' 747s + GIT_AUTHOR_DATE='1530000001 +0100' 747s + git rm debian/rules 747s rm 'debian/rules' 747s + git commit -m 'strip upstream rules' 747s [upstream b9910b7] strip upstream rules 747s 1 file changed, 1 deletion(-) 747s delete mode 100644 debian/rules 747s + git tag -f v1.0 747s Updated tag 'v1.0' (was 2e6a887) 747s + git branch -m master master.old 747s + git checkout -b master 747s Switched to a new branch 'master' 747s + t-git-next-date 747s + GIT_COMMITTER_DATE='1530000002 +0100' 747s + GIT_AUTHOR_DATE='1530000002 +0100' 747s + git checkout quilt-tip debian 747s Updated 6 paths from 20c64eb 747s + git commit -m 'initial debianisation' 747s [master fbfa09c] initial debianisation 747s 6 files changed, 36 insertions(+) 747s create mode 100644 debian/changelog 747s create mode 100644 debian/compat 747s create mode 100644 debian/control 747s create mode 100644 debian/example.install 747s create mode 100755 debian/rules 747s create mode 100644 debian/source/format 747s + t-make-orig example 1.0 747s + local p=example 747s + local v=1.0 747s + local tag=v1.0 747s + ust=example_1.0.orig.tar.gz 747s + GZIP=-1 747s + git archive -o ../example_1.0.orig.tar.gz --prefix=example-1.0/ v1.0 747s gzip: warning: GZIP environment variable is deprecated; use an alias or script 747s + dgit-quilt-fixup-uses-gdr 747s + t-git-next-date 747s + GIT_COMMITTER_DATE='1530000003 +0100' 747s + GIT_AUTHOR_DATE='1530000003 +0100' 747s + DGIT_TEST_DEBUG=-DD 747s + t-dgit quilt-fixup 747s + tee ../fixup.out 747s + local dgit=dgit 747s + pwd 747s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 747s + : ' 747s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 747s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -DD -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 747s | git rev-parse --show-toplevel 747s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 747s | git config -z --get-regexp --local '.*' 747s | git config -z --get-regexp --local '.*' 747s | git config -z --get-regexp --global '.*' 747s | git config -z --get-regexp --system '.*' 747s format 3.0 (quilt), quilt mode linear 747s Format `3.0 (quilt)', need to check/update patch stack 747s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 747s => `' 747s + git diff --quiet HEAD 747s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 747s dpkg-buildpackage: info: source package example 747s dpkg-buildpackage: info: source version 1.0-1 747s dpkg-buildpackage: info: source distribution unstable 747s dpkg-buildpackage: info: source changed by Ian Jackson 747s fakeroot debian/rules clean 747s EXAMPLE RULES TARGET clean 747s dh_clean 747s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 747s | git clean -dn 747s => `' 747s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 747s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 747s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 747s | git rev-parse 'HEAD~0' 747s => `fbfa09ccb7ed9ececed5c5c588da6989463f95b9' 747s | git symbolic-ref -q HEAD 747s => `refs/heads/master' 747s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 747s CD work 747s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 747s + git reset -q --hard fbfa09ccb7ed9ececed5c5c588da6989463f95b9 747s examining quilt state (multiple patches, linear mode) 747s branch_is_gdr fbfa09ccb7ed9ececed5c5c588da6989463f95b9... 747s quiltify_trees_differ fbfa09ccb7ed9ececed5c5c588da6989463f95b9~ fbfa09ccb7ed9ececed5c5c588da6989463f95b9 => 0 747s branch_is_gdr fbfa09ccb7ed9ececed5c5c588da6989463f95b9 unmarked BreakwaterStart YES 747s + git reset -q --hard fbfa09ccb7ed9ececed5c5c588da6989463f95b9 747s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 747s | git rev-parse 'HEAD~0' 747s => `fbfa09ccb7ed9ececed5c5c588da6989463f95b9' 747s QF linkorigs bpd incoming, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../incoming ? 747s QF linkorigs bpd .save-env, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.save-env ? 747s QF linkorigs bpd .., /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.. ? 747s QF linkorigs bpd example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz ? 747s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 747s QF linkorigs bpd example, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example ? 747s QF linkorigs bpd tstunt, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../tstunt ? 747s QF linkorigs bpd fixup.out, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../fixup.out ? 747s QF linkorigs bpd ssh, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../ssh ? 747s QF linkorigs bpd ., /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../. ? 747s QF linkorigs bpd must-clean, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../must-clean ? 747s QF linkorigs bpd .gitconfig, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.gitconfig ? 747s QF linkorigs bpd dput.cf, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../dput.cf ? 747s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 747s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 747s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 747s CD fake 747s | find -name .git -prune -print0 747s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 747s + git checkout -f fbfa09ccb7ed9ececed5c5c588da6989463f95b9 -- debian 747s + git add -Af . 747s | git write-tree 747s => `20c64ebe6600e246d9769e072e25be7fdf7db102' 747s fake orig tree object 20c64ebe6600e246d9769e072e25be7fdf7db102 748s CD .. 748s + git reset -q --hard fbfa09ccb7ed9ececed5c5c588da6989463f95b9 748s CD ../fake 748s + git add -Af . 748s | git write-tree 748s => `20c64ebe6600e246d9769e072e25be7fdf7db102' 748s fake o+d/p tree object 20c64ebe6600e246d9769e072e25be7fdf7db102 748s CD ../work 748s | git ls-tree --name-only -z fbfa09ccb7ed9ececed5c5c588da6989463f95b9 748s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 748s | git diff-tree -z --no-renames -r 20c64ebe6600e246d9769e072e25be7fdf7db102 fbfa09ccb7ed9ececed5c5c588da6989463f95b9 748s => `' 748s quiltify_trees_differ 20c64ebe6600e246d9769e072e25be7fdf7db102 fbfa09ccb7ed9ececed5c5c588da6989463f95b9 => 0 748s | git diff-tree -z --no-renames --name-only -r fbfa09ccb7ed9ececed5c5c588da6989463f95b9 20c64ebe6600e246d9769e072e25be7fdf7db102 748s => `' 748s quiltify_trees_differ fbfa09ccb7ed9ececed5c5c588da6989463f95b9 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 748s | git diff-tree -z --no-renames --name-only -r 20c64ebe6600e246d9769e072e25be7fdf7db102 20c64ebe6600e246d9769e072e25be7fdf7db102 748s => `' 748s quiltify_trees_differ 20c64ebe6600e246d9769e072e25be7fdf7db102 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 748s differences @dl == == == == == ==. 748s dgit: base trees orig=20c64ebe6600e246d976 o+d/p=20c64ebe6600e246d976 748s dgit: quilt differences: src: == orig == gitignores: == orig == 748s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 748s starting quiltify (multiple patches, linear mode) 748s | git ls-tree --name-only fbfa09ccb7ed9ececed5c5c588da6989463f95b9 -- debian/rules debian/control 748s => `debian/control'... 748s quiltify investigate fbfa09ccb7ed9ececed5c5c588da6989463f95b9 748s | git diff-tree -z --no-renames --name-only fbfa09ccb7ed9ececed5c5c588da6989463f95b9 20c64ebe6600e246d9769e072e25be7fdf7db102 748s => `' 748s quiltify_trees_differ fbfa09ccb7ed9ececed5c5c588da6989463f95b9 20c64ebe6600e246d9769e072e25be7fdf7db102 => 0 748s search finished hooray! 748s quiltify linearisation planning successful, executing... 748s + git checkout -q master 748s | git status --ignored --porcelain 748s => `?? .pc/' 748s nothing quilty to commit, ok. 748s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 748s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 748s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 748s ' 748s + grep '^branch_is_gdr .* YES$' ../fixup.out 748s branch_is_gdr fbfa09ccb7ed9ececed5c5c588da6989463f95b9 unmarked BreakwaterStart YES 748s + git checkout --detach patch-queue/quilt-tip 748s HEAD is now at d843a68 Add another new upstream file 748s + git rebase master 748s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated detached HEAD. 748s + git push . HEAD:master 748s To . 748s fbfa09c..1ec91d7 HEAD -> master 748s + git checkout master 748s Switched to branch 'master' 748s + dgit-quilt-fixup-uses-gdr 748s + t-git-next-date 748s + GIT_COMMITTER_DATE='1530000004 +0100' 748s + GIT_AUTHOR_DATE='1530000004 +0100' 748s + DGIT_TEST_DEBUG=-DD 748s + t-dgit quilt-fixup 748s + tee ../fixup.out 748s + local dgit=dgit 748s + pwd 748s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 748s + : ' 748s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 748s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -DD -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 748s | git rev-parse --show-toplevel 748s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 748s | git config -z --get-regexp --local '.*' 748s | git config -z --get-regexp --local '.*' 748s | git config -z --get-regexp --global '.*' 748s | git config -z --get-regexp --system '.*' 748s format 3.0 (quilt), quilt mode linear 748s Format `3.0 (quilt)', need to check/update patch stack 748s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 748s => `' 748s + git diff --quiet HEAD 748s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 748s dpkg-buildpackage: info: source package example 748s dpkg-buildpackage: info: source version 1.0-1 748s dpkg-buildpackage: info: source distribution unstable 748s dpkg-buildpackage: info: source changed by Ian Jackson 748s fakeroot debian/rules clean 748s EXAMPLE RULES TARGET clean 748s dh_clean 748s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 748s | git clean -dn 748s => `' 748s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 748s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 748s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 748s | git rev-parse 'HEAD~0' 748s => `1ec91d76c7ba8fc5862e0c97d141848dcc341045' 748s | git symbolic-ref -q HEAD 748s => `refs/heads/master' 748s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 748s CD work 748s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 748s + git reset -q --hard 1ec91d76c7ba8fc5862e0c97d141848dcc341045 748s examining quilt state (multiple patches, linear mode) 748s branch_is_gdr 1ec91d76c7ba8fc5862e0c97d141848dcc341045... 748s branch_is_gdr 1ec91d76c7ba8fc5862e0c97d141848dcc341045 plain 748s branch_is_gdr d1992d318a03b56a09780bdbf57653647997b396 plain 748s branch_is_gdr 239e784c5e0bba83a79c6576d116ce47d7baf563 plain 748s quiltify_trees_differ fbfa09ccb7ed9ececed5c5c588da6989463f95b9~ fbfa09ccb7ed9ececed5c5c588da6989463f95b9 => 0 748s branch_is_gdr fbfa09ccb7ed9ececed5c5c588da6989463f95b9 unmarked BreakwaterStart YES 748s + git reset -q --hard 1ec91d76c7ba8fc5862e0c97d141848dcc341045 748s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 748s HEAD is now at 93ee52b Commit patch queue (exported by git-debrebase) 748s | git rev-parse 'HEAD~0' 748s => `93ee52bfa051b022501922650daadd4cff574549' 748s QF linkorigs bpd incoming, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../incoming ? 748s QF linkorigs bpd .save-env, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.save-env ? 748s QF linkorigs bpd .., /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.. ? 748s QF linkorigs bpd example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz ? 748s QF linkorigs example_1.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_1.0.orig.tar.gz Y 748s QF linkorigs bpd example, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example ? 748s QF linkorigs bpd tstunt, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../tstunt ? 748s QF linkorigs bpd fixup.out, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../fixup.out ? 748s QF linkorigs bpd ssh, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../ssh ? 748s QF linkorigs bpd ., /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../. ? 748s QF linkorigs bpd must-clean, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../must-clean ? 748s QF linkorigs bpd .gitconfig, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../.gitconfig ? 748s QF linkorigs bpd dput.cf, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../dput.cf ? 748s + tar -cf './example_1.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 748s + gzip -1n './example_1.0-~~DGITFAKE.debian.tar' 748s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 748s CD fake 748s | find -name .git -prune -print0 748s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 749s + git checkout -f 93ee52bfa051b022501922650daadd4cff574549 -- debian 749s + git add -Af . 749s | git write-tree 749s => `bf7987f1ad573f033a09951c00ab7bdaa7c98445' 749s fake orig tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 749s CD .. 749s + git reset -q --hard 93ee52bfa051b022501922650daadd4cff574549 749s CD ../fake 749s + git add -Af . 749s | git write-tree 749s => `763a72c3d91f517f4a54c0759ccf4876f1fbb304' 749s fake o+d/p tree object bf7987f1ad573f033a09951c00ab7bdaa7c98445 749s CD ../work 749s | git ls-tree --name-only -z 93ee52bfa051b022501922650daadd4cff574549 749s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 749s | git diff-tree -z --no-renames -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 93ee52bfa051b022501922650daadd4cff574549 749s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 749s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 93ee52bfa051b022501922650daadd4cff574549 => 1 749s | git diff-tree -z --no-renames --name-only -r 93ee52bfa051b022501922650daadd4cff574549 763a72c3d91f517f4a54c0759ccf4876f1fbb304 749s => `' 749s quiltify_trees_differ 93ee52bfa051b022501922650daadd4cff574549 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 0 749s | git diff-tree -z --no-renames --name-only -r bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 749s => `lib.c\x00new-upstream-file\x00src.c\x00' 749s quiltify_trees_differ bf7987f1ad573f033a09951c00ab7bdaa7c98445 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 1 749s differences @dl ## ## == == == ==. 749s dgit: base trees orig=bf7987f1ad573f033a09 o+d/p=763a72c3d91f517f4a54 749s dgit: quilt differences: src: ## orig ## gitignores: == orig == 749s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 749s starting quiltify (multiple patches, linear mode) 749s | git ls-tree --name-only 93ee52bfa051b022501922650daadd4cff574549 -- debian/rules debian/control 749s => `debian/control'... 749s quiltify investigate 93ee52bfa051b022501922650daadd4cff574549 749s | git diff-tree -z --no-renames --name-only 93ee52bfa051b022501922650daadd4cff574549 763a72c3d91f517f4a54c0759ccf4876f1fbb304 749s => `' 749s quiltify_trees_differ 93ee52bfa051b022501922650daadd4cff574549 763a72c3d91f517f4a54c0759ccf4876f1fbb304 => 0 749s search finished hooray! 749s quiltify linearisation planning successful, executing... 749s + git checkout -q master 749s | git status --ignored --porcelain 749s => `?? .pc/' 749s nothing quilty to commit, ok. 749s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 749s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 749s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 749s ' 749s + grep '^branch_is_gdr .* YES$' ../fixup.out 749s branch_is_gdr fbfa09ccb7ed9ececed5c5c588da6989463f95b9 unmarked BreakwaterStart YES 749s + t-gdr-made-patches 749s + git log -n1 --pretty=format:%B 749s + egrep '^\[git-debrebase' 749s [git-debrebase make-patches: export and commit patches] 749s + t-ok 749s + : ======================================== 749s + t-check-only-bpd 749s + '[' .. = .. ']' 749s + return 749s + t-fscks 749s + shopt -s nullglob 749s + for d in $tmp/*/.git $tmp/git/*.git 749s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 749s + t-git-fsck 749s ++ git rev-parse --git-dir 749s + local fsckerrs=.git/dgit-test-fsck.errs 749s + set +e 749s + tee .git/dgit-test-fsck.errs 749s + LC_MESSAGES=C 749s + git fsck --no-dangling --strict 749s + ps='0 0' 749s + set -e 749s + local pats 749s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 749s + test '0 0' = '0 0' 749s + pats+=(-e 'notice: HEAD points to an unborn branch') 749s + pats+=(-e 'notice: No default references') 749s + set +e 749s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 749s + rc=1 749s + set -e 749s + case $rc in 749s + t-save-artifacts 749s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-fresh-artifacts 749s + '[' x/tmp/autopkgtest.ztMUxl/gdr-fresh-artifacts = x ']' 749s + '[' xtmp = x ']' 749s + GZIP=-1v 749s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-fresh-artifacts/gdr-fresh.tar.gz '--exclude=*.tar' . 749s gzip: warning: GZIP environment variable is deprecated; use an alias or script 749s 80.3% 749s + echo ok. 749s ok. 749s + rc=0 749s + set +x 749s + set +e 749s + pwd 749s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 749s + '[' x '!=' x ']' 749s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 749s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 749s + set -e 749s + test 0 = 0 749s autopkgtest [12:30:43]: test gdr-fresh: -----------------------] 749s gdr-fresh PASS 749s autopkgtest [12:30:43]: test gdr-fresh: - - - - - - - - - - results - - - - - - - - - - 749s autopkgtest [12:30:43]: test gdr-import-dgitview: preparing testbed 749s Reading package lists... 750s Building dependency tree... 750s Reading state information... 750s Starting pkgProblemResolver with broken count: 0 750s Starting 2 pkgProblemResolver with broken count: 0 750s Done 750s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 751s autopkgtest [12:30:45]: test gdr-import-dgitview: [----------------------- 751s ++ set -o pipefail 751s ++ . tests/lib-core 751s ++ . tests/lib-restricts 751s ++ trap ' 751s rc=$? 751s set +x 751s test $rc = 0 || echo " 751s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 751s 751s Most relevant logs are just before assignment rc=$rc 751s Will now do cleanup etc. 751s " 751s set -x 751s set +e 751s pwd 751s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 751s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 751s set -e 751s test $rc = 0 || t-report-failure 751s ' EXIT 751s ++ t-filter-out-git-hyphen-dir 751s ++ local pathent 751s +++ type -p git-rev-parse 751s +++ : 751s ++ pathent= 751s ++ case "$pathent" in 751s ++ return 751s ++ t-set-intree 751s ++ '[' x = x ']' 751s ++ return 751s ++ : -D 751s ++ export DGIT_TEST_DEBUG 751s ++ : x 751s ++ export DGIT_TEST_DEBPUSH_DEBUG 751s ++ : 751s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 751s ++ GIT_COMMITTER_DATE='1530000000 +0100' 751s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 751s ++ GIT_AUTHOR_DATE='1530000000 +0100' 751s ++ export LC_CTYPE=C.UTF-8 751s ++ LC_CTYPE=C.UTF-8 751s ++ unset CDPATH 751s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 751s ++ FILTER_BRANCH_SQUELCH_WARNING=1 751s +++ pwd 751s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 751s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ testname=gdr-import-dgitview 751s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ bpd=.. 751s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 751s ++ '[' x '!=' x ']' 751s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s +++ pwd 751s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ t-set-using-tmp 751s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 751s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 751s ++ export 'DEBFULLNAME=dgit test git user' 751s ++ DEBFULLNAME='dgit test git user' 751s ++ git config --global user.email dgit-test@debian.example.net 751s ++ git config --global user.name 'dgit test git user' 751s ++ git config --global protocol.ext.allow always 751s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 751s ++ env -0 751s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 751s ++ export DEBCHANGE_VENDOR=dpkg 751s ++ DEBCHANGE_VENDOR=dpkg 751s ++ unset VISUAL 751s ++ unset GIT_EDITOR 751s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 751s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 751s ++ cat 751s ++ schroot=build 751s ++ : aq 751s ++ : archive/test-dummy 751s ++ : sid:unstable 751s ++ t-git-config dgit.default.old-dsc-distro test-dummy 751s ++ git config --global dgit.default.old-dsc-distro test-dummy 751s ++ for import in ${autoimport-gnupg} 751s ++ case "$0" in 751s ++ t-setup-import gnupg 751s ++ local setupname=gnupg 751s ++ local setupsrc 751s ++ local lock 751s ++ '[' x = x ']' 751s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 751s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 751s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 751s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 751s cd "$1"; shift 751s setupname="$1"; shift 751s simport="$1"; shift 751s if [ -e "$simport" ]; then exit 0; fi 751s env - "$@" \ 751s "tests/setup/$setupname" 751s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 751s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 751s + shift 751s + setupname=gnupg 751s + shift 751s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 751s + shift 751s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 751s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgitview -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-dgitview' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 751s ++ set -o pipefail 751s ++ . tests/lib-core 751s ++ . tests/lib-restricts 751s ++ trap ' 751s rc=$? 751s set +x 751s test $rc = 0 || echo " 751s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 751s 751s Most relevant logs are just before assignment rc=$rc 751s Will now do cleanup etc. 751s " 751s set -x 751s set +e 751s pwd 751s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 751s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 751s set -e 751s test $rc = 0 || t-report-failure 751s ' EXIT 751s ++ t-filter-out-git-hyphen-dir 751s ++ local pathent 751s +++ type -p git-rev-parse 751s +++ : 751s ++ pathent= 751s ++ case "$pathent" in 751s ++ return 751s ++ t-set-intree 751s ++ '[' x = x ']' 751s ++ return 751s ++ : -D 751s ++ export DGIT_TEST_DEBUG 751s ++ : x 751s ++ export DGIT_TEST_DEBPUSH_DEBUG 751s ++ : 751s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 751s ++ GIT_COMMITTER_DATE='1530000000 +0100' 751s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 751s ++ GIT_AUTHOR_DATE='1530000000 +0100' 751s ++ export LC_CTYPE=C.UTF-8 751s ++ LC_CTYPE=C.UTF-8 751s ++ unset CDPATH 751s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 751s ++ FILTER_BRANCH_SQUELCH_WARNING=1 751s +++ pwd 751s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 751s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ testname=gnupg 751s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 751s ++ bpd=.. 751s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 751s ++ '[' x '!=' x ']' 751s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s +++ pwd 751s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ t-set-using-tmp 751s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 751s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 751s ++ export 'DEBFULLNAME=dgit test git user' 751s ++ DEBFULLNAME='dgit test git user' 751s ++ git config --global user.email dgit-test@debian.example.net 751s ++ git config --global user.name 'dgit test git user' 751s ++ git config --global protocol.ext.allow always 751s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 751s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 751s ++ export DEBCHANGE_VENDOR=dpkg 751s ++ DEBCHANGE_VENDOR=dpkg 751s ++ unset VISUAL 751s ++ unset GIT_EDITOR 751s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 751s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 751s ++ cat 751s ++ schroot=build 751s ++ : aq 751s ++ : archive/test-dummy 751s ++ : sid:unstable 751s ++ t-git-config dgit.default.old-dsc-distro test-dummy 751s ++ git config --global dgit.default.old-dsc-distro test-dummy 751s ++ for import in ${autoimport-gnupg} 751s ++ case "$0" in 751s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 751s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 751s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 751s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 751s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 751s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 751s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 751s + setup=' 751s export GNUPGHOME=$tmp/gnupg 751s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 751s 751s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 751s ssb rsa2048 2013-11-17 [E] 751s 751s sec rsa2048 2014-01-26 [SC] 751s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 751s uid [ultimate] Populus Romanus (test key) 751s ssb rsa2048 2014-01-26 [E] 751s 751s sec rsa2048 2014-01-26 [SC] 751s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 751s uid [ unknown] Hannibal (test key) 751s ssb rsa2048 2014-01-26 [E] 751s 751s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 751s export GNUPGHOME=$tmp/gnupg 751s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 751s 751s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 751s "sha256sum" => "$2", 751s "component" => "$3", 751s "filename" => "$4", 751s }; 751s END { 751s my $json = JSON->new->canonical(); 751s print $json->encode(\@v) or die $!; 751s } 751s ' 751s + t-aq-archive-updated new example 751s + local suite=new 751s + local p=example 751s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 751s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 751s + perl -wne ' 751s use JSON; 751s use strict; 751s our @v; 751s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 751s push @v, { 751s "version" => "$1", 751s "sha256sum" => "$2", 751s "component" => "$3", 751s "filename" => "$4", 751s }; 751s END { 751s my $json = JSON->new->canonical(); 751s print $json->encode(\@v) or die $!; 751s } 751s ' 751s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 751s + cat 751s + jsondelim=' },' 751s + cat 751s + v=1.0-1 751s + local dscf=example_1.0-1.dsc 751s + rm -f '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/example_*' 751s + ln -s /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+absurd.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.100.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0-1.dsc /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig-docs.tar.gz /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/pkg-srcs/example_1.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 751s + t-archive-query 751s + local suite=sid 751s + local dscf=main/example_1.0-1.dsc 751s + t-archive-query-aq sid example 1.0-1 main/example_1.0-1.dsc 751s + local suite=sid 751s + local p=example 751s + local v=1.0-1 751s + local dscf=main/example_1.0-1.dsc 751s + local sha 751s ++ sha256sum 751s + sha='f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 -' 751s + echo '1.0-1 f58be8985abfc91613b38db1263979e53cf9172276fcdee68d20e930e681a0a4 main/example_1.0-1.dsc' 751s + t-aq-archive-updated sid example 751s + local suite=sid 751s + local p=example 751s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 751s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 751s + perl -wne ' 751s use JSON; 751s use strict; 751s our @v; 751s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 751s push @v, { 751s "version" => "$1", 751s "sha256sum" => "$2", 751s "component" => "$3", 751s "filename" => "$4", 751s }; 751s END { 751s my $json = JSON->new->canonical(); 751s print $json->encode(\@v) or die $!; 751s } 751s ' 751s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 751s + mkdir /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 751s + set -e 751s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/extract 751s + dpkg-source -x ../mirror/pool/main/example_1.0-1.dsc 751s dpkg-source: warning: extracting unsigned source package (../mirror/pool/main/example_1.0-1.dsc) 751s dpkg-source: info: extracting example in example-1.0 751s dpkg-source: info: unpacking example_1.0.orig.tar.gz 751s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 751s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 751s dpkg-source: info: using patch list from debian/patches/series 751s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 751s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 751s dpkg-source: info: applying auto-gitignore 751s + t-git-none 751s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 751s + set -e 751s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 751s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 751s + t-dgit clone example 751s + local dgit=dgit 751s + pwd 751s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 751s + : ' 751s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 751s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example 751s | git config -z --get-regexp --global '.*' 751s | git config -z --get-regexp --system '.*' 751s clone main body 751s CD example 751s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 751s canonical suite name for unstable is sid 751s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 751s => `0' 751s + git init -q 751s | git config -z --get-regexp --local '.*' 751s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 751s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 751s + git config user.name 'dgit test git user' 751s is_gitattrs_setup: found nothing 751s starting new git history 751s + git config remote.dgit.skipdefaultupdate true 751s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 751s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.dsc... 751s get_archive_dsc: Version 1.0-1 751s last upload to archive: NO git hash 751s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 751s => `' 751s previous reference hash= 751s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 751s => `' 751s fetch_from_archive: lastfetch= 751s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 751s considering reusing example_1.0.orig-docs.tar.gz: (No such file or directory) (No such file or directory) absent. 751s ./example_1.0.orig-docs.tar.gz does not exist, need to fetch 751s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig-docs.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0.orig-docs.tar.gz 751s % Total % Received % Xferd Average Speed Time Time Time Current 751s Dload Upload Total Spent Left Speed 751s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 236 100 236 0 0 5487k 0 --:--:-- --:--:-- --:--:-- 5487k 751s considering saving example_1.0.orig-docs.tar.gz: linked. 751s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 751s ./example_1.0.orig.tar.gz does not exist, need to fetch 751s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0.orig.tar.gz 751s % Total % Received % Xferd Average Speed Time Time Time Current 751s Dload Upload Total Spent Left Speed 751s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 373 100 373 0 0 6173k 0 --:--:-- --:--:-- --:--:-- 6173k 751s considering saving example_1.0.orig.tar.gz: linked. 751s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 751s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 751s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.debian.tar.xz 751s % Total % Received % Xferd Average Speed Time Time Time Current 751s Dload Upload Total Spent Left Speed 751s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 1300 100 1300 0 0 22.5M 0 --:--:-- --:--:-- --:--:-- 22.5M 751s considering saving example_1.0-1.debian.tar.xz: linked. 751s import considering example_1.0.orig-docs.tar.gz Y .gz orig-docs 751s + chmod -R '+rwX' _unpack-tar 751s CD _unpack-tar 751s | find -name .git -prune -print0 751s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 751s + git add -Af . 751s | git write-tree 751s => `782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01' 751s | git ls-tree -z 782a5e331b7cf8a8e4bdc9b0fb9ae02d76ed9b01 751s => `040000 tree ba2def58f31d39da8e0d388b13960163f21dd40d\x09example-docs\x00' 751s one subtree ba2def58f31d39da8e0d388b13960163f21dd40d 751s CD .. 751s import considering example_1.0.orig.tar.gz Y .gz orig 751s + chmod -R '+rwX' _unpack-tar 751s CD _unpack-tar 751s | find -name .git -prune -print0 751s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 751s + git add -Af . 751s | git write-tree 751s => `3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6' 751s | git ls-tree -z 3d10c5ebc6a6bdc2887d2e894ec8cf106a5fd8b6 751s => `040000 tree 1529fc3008de28ab463a4ed4009c7fd2bb545166\x09example\x00' 751s one subtree 1529fc3008de28ab463a4ed4009c7fd2bb545166 751s CD .. 751s import considering example_1.0-1.debian.tar.xz Y .xz (none) 751s + chmod -R '+rwX' _unpack-tar 751s CD _unpack-tar 751s | find -name .git -prune -print0 751s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 751s + git add -Af . 751s | git write-tree 751s => `2e32e7dba6662d7204cb623f0685496d9e18ed39' 751s | git ls-tree -z 2e32e7dba6662d7204cb623f0685496d9e18ed39 751s => `040000 tree 4fdcc744fa631b40c7178eee72a6f59c8ca72600\x09debian\x00' 751s one subtree 4fdcc744fa631b40c7178eee72a6f59c8ca72600 751s CD .. 751s + dpkg-source --no-check --skip-patches -x -- example.dsc 751s dpkg-source: info: extracting example in example-1.0 751s dpkg-source: info: unpacking example_1.0.orig.tar.gz 751s dpkg-source: info: unpacking example_1.0.orig-docs.tar.gz 751s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 751s CD example-1.0 751s | find -name .git -prune -print0 751s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 751s + git add -Af . 751s | git write-tree 751s => `faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4' 751s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 751s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 751s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 751s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 752s + git add -Af . 752s | git write-tree 752s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 752s import clog search... 752s | dpkg-parsechangelog --format rfc822 --all 752s import clog 1.0-1 package changelog, entry no.1... 752s import clog 1.0-1 vs 1.0... 752s import clog 1.0-1 becomes r1 752s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 752s => `1431548802 +0000' 752s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 752s => `1431548802 +0000' 752s import tartrees authline Ian Jackson 1431548802 +0000 752s import tartrees r1authline Ian Jackson 1431548802 +0000 752s import tartree example_1.0.orig.tar.gz 1529fc3008de28ab463a4ed4009c7fd2bb545166 752s | git hash-object -w -t commit --stdin 752s => 94c010931d011cbd6c1861bb9d453aa12d826298 752s import tartree example_1.0.orig-docs.tar.gz ba2def58f31d39da8e0d388b13960163f21dd40d 752s | git hash-object -w -t commit --stdin 752s => a5bb1f49c872a76a5d703570fd5352e424719bda 752s import tartree example_1.0-1.debian.tar.xz 4fdcc744fa631b40c7178eee72a6f59c8ca72600 752s | git hash-object -w -t commit --stdin 752s => c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 752s import main commit 752s | git hash-object -w -t commit ../commit.tmp 752s => `1d9c1ab6696b5b0b297493e1cce63577b4834b04' 752s import apply patches... 752s | git hash-object -w -t commit --stdin 752s => 8a6a176760396ad6e2e096974469aa6cf7671956 752s + git checkout -q -b dapplied 8a6a176760396ad6e2e096974469aa6cf7671956 752s + git checkout -q -b unpa 1d9c1ab6696b5b0b297493e1cce63577b4834b04 752s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 752s => `1431548802 +0000' 752s + git checkout -q unpa 752s + git update-ref -d refs/heads/patch-queue/unpa 752s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 752s | git rev-parse 'HEAD~0' 752s => `9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6' 752s | git rev-parse HEAD: 752s => `11828cc23fd68a215b9c13cebc16724e51ea1942' 752s synthesised git commit from .dsc 1.0-1 752s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 752s fetch mergeinfos: 752s commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 Import of source package 752s fetch hash=9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 752s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 752s | git log -n2 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 752s => `commit 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6'... 752s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 752s => `' 752s + git reset --hard refs/remotes/dgit/dgit/sid 752s HEAD is now at 9af62d3 Update .gitignore from Debian packaging branch 752s + bash -ec ' set -o pipefail 752s git ls-tree -r --name-only -z HEAD | '\\' 752s xargs -0r touch -h -r . -- 752s ' 752s dgit ok: ready for work in example 752s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 752s del_lrfetchrefs... 752s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 752s ' 752s + cd example 752s + t-git-debrebase status 752s + local gdr=git-debrebase 752s + : ' 752s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 752s + git-debrebase --dgit=dgit -D status 752s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 752s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 752s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}],"CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Type" => "Upstream","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 752s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 752s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 752s git-debrebase = Upstream {"Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Parents" => [{"Differs" => 2,"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Ix" => 0}]} 752s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 752s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 752s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"}],"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 752s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 752s git-debrebase = DgitImportUnpatched {"NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n","Parents" => [{"IsDgitImport" => "orig","Differs" => 54,"Ix" => 0,"IsOrigin" => 1,"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298"},{"IsOrigin" => 1,"CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","Ix" => 1,"Differs" => 54,"IsDgitImport" => "orig"},{"Differs" => 54,"IsDgitImport" => "tarball","IsOrigin" => 1,"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","Ix" => 2}],"Type" => "DgitImportUnpatched","Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","OrigParents" => [$VAR1->{"Parents"}[0],$VAR1->{"Parents"}[1]],"Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"} 752s current branch contents, in git-debrebase terms: 752s branch not in git-debrebase form 752s found bare dgit dsc import with no prior history 752s 1d9c1ab example (1.0-1) unstable; urgency=low 752s key git-debrebase commits: 752s anchor is not well-defined 752s breakwater is not well-defined 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s branch and ref status, in git-debrebase terms: 752s stitched? (no record of git-debrebase work) 752s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 752s ' 752s + t-expect-fail 'E:bare dgit dsc import' t-git-debrebase 752s + local 'mpat=E:bare dgit dsc import' 752s + shift 752s + set +o pipefail 752s + LC_MESSAGES=C 752s + LANGUAGE=C 752s + t-git-debrebase 752s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local gdr=git-debrebase 752s + : ' 752s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 752s + git-debrebase --dgit=dgit -D 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s git-debrebase ffq check_specs * 752s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 752s OK, you are ahead of refs/remotes/dgit/dgit/sid 752s git-debrebase *** WALK 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 0 - 752s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 752s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 752s git-debrebase = Upstream {"CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Type" => "Upstream","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}],"Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 752s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 752s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 752s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2,"Ix" => 0}],"Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168"} 752s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 752s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 752s git-debrebase = Upstream {"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Parents" => [{"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 752s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 752s git-debrebase = DgitImportUnpatched {"Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Parents" => [{"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","Differs" => 54,"IsDgitImport" => "orig","Ix" => 0,"IsOrigin" => 1},{"Ix" => 1,"IsOrigin" => 1,"Differs" => 54,"IsDgitImport" => "orig","CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda"},{"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","Differs" => 54,"IsDgitImport" => "tarball","Ix" => 2,"IsOrigin" => 1}],"Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n","Type" => "DgitImportUnpatched","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","OrigParents" => [$VAR1->{"Parents"}[0],$VAR1->{"Parents"}[1]],"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"} 752s git-debrebase *** WALK BOMB bare dgit import 752s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s 752s git-debrebase: error: found unprocessable commit, cannot cope; bare dgit dsc import: (commit 1d9c1ab6696b5b0b297493e1cce63577b4834b04) (d.0x36 0x36 0x36) 752s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 752s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 752s + local 'ps=255 0' 752s + set -o pipefail 752s + case $ps in 752s + t-grep-mpat 'E:bare dgit dsc import' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local 'mpat=E:bare dgit dsc import' 752s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local grepper=fgrep 752s + case "$mpat" in 752s + case "$mpat" in 752s + grepper=egrep 752s + mpat='bare dgit dsc import' 752s + egrep -e 'bare dgit dsc import' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s git-debrebase: error: found unprocessable commit, cannot cope; bare dgit dsc import: (commit 1d9c1ab6696b5b0b297493e1cce63577b4834b04) (d.0x36 0x36 0x36) 752s + LC_MESSAGES=C 752s + t-git-debrebase status 752s + tee ../bare-output 752s + local gdr=git-debrebase 752s + : ' 752s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 752s + git-debrebase --dgit=dgit -D status 752s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 752s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 752s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Differs" => 2}],"CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942"} 752s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 752s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 752s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Differs" => 2,"Ix" => 0}],"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168"} 752s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 752s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 752s git-debrebase = Upstream {"Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Parents" => [{"Ix" => 0,"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Differs" => 2}],"Type" => "Upstream"} 752s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 752s git-debrebase = DgitImportUnpatched {"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Parents" => [{"Ix" => 0,"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","IsDgitImport" => "orig","IsOrigin" => 1,"Differs" => 54},{"Ix" => 1,"IsOrigin" => 1,"IsDgitImport" => "orig","CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","Differs" => 54},{"Ix" => 2,"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","IsOrigin" => 1,"IsDgitImport" => "tarball","Differs" => 54}],"Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","OrigParents" => [$VAR1->{"Parents"}[0],$VAR1->{"Parents"}[1]],"Type" => "DgitImportUnpatched","NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n"} 752s current branch contents, in git-debrebase terms: 752s branch not in git-debrebase form 752s found bare dgit dsc import with no prior history 752s 1d9c1ab example (1.0-1) unstable; urgency=low 752s key git-debrebase commits: 752s anchor is not well-defined 752s breakwater is not well-defined 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s branch and ref status, in git-debrebase terms: 752s stitched? (no record of git-debrebase work) 752s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 752s ' 752s + grep 'bare dgit dsc import with no prior history' ../bare-output 752s found bare dgit dsc import with no prior history 752s + git branch before 752s + t-expect-fail 'E:Could not find or construct a suitable upstream commit' t-git-debrebase convert-from-dgit-view --no-origs 752s + local 'mpat=E:Could not find or construct a suitable upstream commit' 752s + shift 752s + set +o pipefail 752s + LC_MESSAGES=C 752s + LANGUAGE=C 752s + t-git-debrebase convert-from-dgit-view --no-origs 752s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local gdr=git-debrebase 752s + : ' 752s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 752s + git-debrebase --dgit=dgit -D convert-from-dgit-view --no-origs 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 752s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 752s git-debrebase = Upstream {"Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Type" => "Upstream","Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","Parents" => [{"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Ix" => 0,"Differs" => 2}],"CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6"} 752s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 752s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 752s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3"}]} 752s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 752s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 752s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04"}],"Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656"} 752s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 752s git-debrebase = DgitImportUnpatched {"Type" => "DgitImportUnpatched","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n","Parents" => [{"IsOrigin" => 1,"Differs" => 54,"Ix" => 0,"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","IsDgitImport" => "orig"},{"IsDgitImport" => "orig","CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda","Differs" => 54,"Ix" => 1,"IsOrigin" => 1},{"IsOrigin" => 1,"IsDgitImport" => "tarball","CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","Differs" => 54,"Ix" => 2}],"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","OrigParents" => [$VAR1->{"Parents"}[0],$VAR1->{"Parents"}[1]]} 752s git-debrebase troubles=1 752s Considering possible commits corresponding to upstream: 752s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 752s Evaluating possible commits corresponding to upstream: 752s 752s git-debrebase: error: Could not find or construct a suitable upstream commit. 752s git-debrebase: Rerun adding --diagnose after convert-from-dgit-view, or pass a 752s git-debrebase: upstream commmit explicitly or provide suitable origs. 752s + local 'ps=255 0' 752s + set -o pipefail 752s + case $ps in 752s + t-grep-mpat 'E:Could not find or construct a suitable upstream commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local 'mpat=E:Could not find or construct a suitable upstream commit' 752s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s + local grepper=fgrep 752s + case "$mpat" in 752s + case "$mpat" in 752s + grepper=egrep 752s + mpat='Could not find or construct a suitable upstream commit' 752s + egrep -e 'Could not find or construct a suitable upstream commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 752s git-debrebase: error: Could not find or construct a suitable upstream commit. 752s + t-git-debrebase convert-from-dgit-view 752s + local gdr=git-debrebase 752s + : ' 752s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 752s + git-debrebase --dgit=dgit -D convert-from-dgit-view 752s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 752s git-debrebase get_differs d961783a7941d93057e1f45f793ecf9506db7604 11828cc23fd68a215b9c13cebc16724e51ea1942 = 0x2 752s git-debrebase classify 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 $t=11828cc23fd68a215b9c13cebc16724e51ea1942 @p d961783a7941d93057e1f45f793ecf9506db7604/0x2 752s git-debrebase = Upstream {"Hdr" => "tree 11828cc23fd68a215b9c13cebc16724e51ea1942\nparent d961783a7941d93057e1f45f793ecf9506db7604\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "11828cc23fd68a215b9c13cebc16724e51ea1942","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604"}],"Type" => "Upstream","CommitId" => "9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore"} 752s git-debrebase get_differs ed6bc7897ac272261988a7c5843a45732583b8c3 d0edc8316a360beb4536ba9ee0f9e7686d942168 = 0x2 752s git-debrebase classify d961783a7941d93057e1f45f793ecf9506db7604 $t=d0edc8316a360beb4536ba9ee0f9e7686d942168 @p ed6bc7897ac272261988a7c5843a45732583b8c3/0x2 752s git-debrebase = Upstream {"CommitId" => "d961783a7941d93057e1f45f793ecf9506db7604","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "d0edc8316a360beb4536ba9ee0f9e7686d942168","Hdr" => "tree d0edc8316a360beb4536ba9ee0f9e7686d942168\nparent ed6bc7897ac272261988a7c5843a45732583b8c3\nauthor Ian Jackson 1449445839 +0000\ncommitter Ian Jackson 1431548802 +0000\n"} 752s git-debrebase get_differs 1d9c1ab6696b5b0b297493e1cce63577b4834b04 4d14e6df29441875898d6e92be6a3ecbe9ca4656 = 0x2 752s git-debrebase classify ed6bc7897ac272261988a7c5843a45732583b8c3 $t=4d14e6df29441875898d6e92be6a3ecbe9ca4656 @p 1d9c1ab6696b5b0b297493e1cce63577b4834b04/0x2 752s git-debrebase = Upstream {"Hdr" => "tree 4d14e6df29441875898d6e92be6a3ecbe9ca4656\nparent 1d9c1ab6696b5b0b297493e1cce63577b4834b04\nauthor Ian Jackson 1449445808 +0000\ncommitter Ian Jackson 1431548802 +0000\n","Tree" => "4d14e6df29441875898d6e92be6a3ecbe9ca4656","Type" => "Upstream","Parents" => [{"CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","Differs" => 2,"Ix" => 0}],"CommitId" => "ed6bc7897ac272261988a7c5843a45732583b8c3","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 752s git-debrebase get_differs 94c010931d011cbd6c1861bb9d453aa12d826298 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs a5bb1f49c872a76a5d703570fd5352e424719bda faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase get_differs c4cc1785ce51e34becb04fc42ff2e2931bdb3b74 faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 = 0x36 752s git-debrebase classify 1d9c1ab6696b5b0b297493e1cce63577b4834b04 $t=faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4 @p 94c010931d011cbd6c1861bb9d453aa12d826298/0x36 a5bb1f49c872a76a5d703570fd5352e424719bda/0x36 c4cc1785ce51e34becb04fc42ff2e2931bdb3b74/0x36 752s git-debrebase = DgitImportUnpatched {"Hdr" => "tree faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4\nparent 94c010931d011cbd6c1861bb9d453aa12d826298\nparent a5bb1f49c872a76a5d703570fd5352e424719bda\nparent c4cc1785ce51e34becb04fc42ff2e2931bdb3b74\nauthor Ian Jackson 1431548802 +0000\ncommitter Ian Jackson 1431548802 +0000\n","OrigParents" => [{"CommitId" => "94c010931d011cbd6c1861bb9d453aa12d826298","IsOrigin" => 1,"IsDgitImport" => "orig","Differs" => 54,"Ix" => 0},{"Differs" => 54,"Ix" => 1,"IsDgitImport" => "orig","IsOrigin" => 1,"CommitId" => "a5bb1f49c872a76a5d703570fd5352e424719bda"}],"Type" => "DgitImportUnpatched","Parents" => [$VAR1->{"OrigParents"}[0],$VAR1->{"OrigParents"}[1],{"CommitId" => "c4cc1785ce51e34becb04fc42ff2e2931bdb3b74","IsOrigin" => 1,"IsDgitImport" => "tarball","Differs" => 54,"Ix" => 2}],"Tree" => "faf2ef62b7c8a1a9d4fcd9cecdbeb78332b054e4","Msg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[dgit import unpatched example 1.0-1]\n","CommitId" => "1d9c1ab6696b5b0b297493e1cce63577b4834b04","NewMsg" => "example (1.0-1) unstable; urgency=low\n\n * Test package.\n\n[was: dgit import unpatched example 1.0-1]\n"} 752s git-debrebase troubles=1 752s Considering possible commits corresponding to upstream: 752s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 752s orig: found what looks like a .orig, ../example_1.0.orig.tar.gz 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 753s Evaluating possible commits corresponding to upstream: 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 753s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 753s Yes, will base new branch on orig(s) imported via dgit 753s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 753s git-debrebase ffq check_specs * 753s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 753s OK, you are ahead of refs/remotes/dgit/dgit/sid 753s git-debrebase >= update refs/debrebase-last/heads/dgit/sid 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 0000000000000000000000000000000000000000 753s git-debrebase >= update HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 9af62d30bb8ce0ca2f7fddac55962ff1fb1693d6 753s git-debrebase >$ 753s HEAD is now at 5f4fc22 Update .gitignore from Debian packaging branch 753s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 753s ' 753s + t-gdr-good laundered 753s + local state=laundered 753s + local beforetag= 753s + case $state in 753s + git diff --quiet -- :. ':!debian/patches' 753s + LC_MESSAGES=C 753s + t-git-debrebase status 753s + local gdr=git-debrebase 753s + : ' 753s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 753s + git-debrebase --dgit=dgit -D status 753s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 753s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 753s git-debrebase = Upstream {"Parents" => [{"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893"} 753s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 753s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 753s git-debrebase = Upstream {"Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Parents" => [{"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Differs" => 2,"Ix" => 0}]} 753s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 753s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 753s git-debrebase = Upstream {"Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Parents" => [{"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Differs" => 2,"Ix" => 0}],"Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 753s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 753s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 753s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 753s git-debrebase = Anchor {"Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Parents" => [{"Ix" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Differs" => 0},{"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4"} 753s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 753s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 753s ' 753s + case $state in 753s + egrep '^ *branch is laundered' ../status.check 753s branch is laundered 753s + t-gdr-good-analyse HEAD laundered 753s + local head=HEAD 753s + local state=laundered 753s + local wsfx= 753s + local etypes bwtip 753s + case $state in 753s + etypes=Upstream 753s ++ t-git-debrebase breakwater 753s ++ local gdr=git-debrebase 753s ++ : ' 753s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 753s ++ git-debrebase --dgit=dgit -D breakwater 754s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 754s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 754s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Parents" => [{"Ix" => 0,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Differs" => 2}],"Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 754s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 754s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 754s git-debrebase = Upstream {"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Ix" => 0,"Differs" => 2}],"Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b"} 754s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 754s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 754s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Ix" => 0}]} 754s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 754s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 754s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 754s git-debrebase = Anchor {"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","OrigParents" => [$VAR1->{"Parents"}[1]]} 754s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 754s ' 754s + bwtip=Y:c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + anal=../anal 754s + t-git-debrebase analyse HEAD 754s + local gdr=git-debrebase 754s + : ' 754s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 754s + git-debrebase --dgit=dgit -D analyse HEAD 754s git-debrebase *** WALK 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 1 *main::STDOUT 754s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 754s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 754s git-debrebase = Upstream {"Parents" => [{"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c"} 754s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 754s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 754s git-debrebase = Upstream {"Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5"}],"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 754s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 754s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 754s git-debrebase = Upstream {"Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Differs" => 2}],"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 754s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 754s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 754s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 754s git-debrebase = Anchor {"Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235"}],"Parents" => [{"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619"} 754s git-debrebase *** WALK prep done cur=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 brw -1 upp 2 proc 3 pm -1 754s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 754s ' 754s ++ git rev-parse HEAD 754s + expect=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + exec 754s + local cid ctype info nparents 754s + read cid ctype info 754s + : ===== 5f4fc22e40465aefaa231960eddbd3e37ff96d8c Upstream ===== 754s + test 5f4fc22e40465aefaa231960eddbd3e37ff96d8c = 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + local cetype=Upstream 754s + '[' xUpstream = xUpstream ']' 754s + cetype=SAME 754s ++ git log -n1 --pretty=format:%P 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + local parents=7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s + expect=7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s + enparents=1 754s + : Upstream/SAME 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s + case "$ctype/$cetype" in 754s + case "$ctype/$etypes" in 754s + case "$cetype" in 754s + case "$ctype" in 754s ++ printf %s 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s ++ wc -w 754s + local cnparents=1 754s + test 1 = 1 754s ++ for f in $parents 754s ++ echo 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s ++ wc -w 754s ++ t-sort -u 754s ++ LC_COLLATE=C 754s ++ sort -u 754s + local cndparents=1 754s + test 1 = 1 754s + case "$parents" in 754s + case "$ctype" in 754s + read cid ctype info 754s + : ===== 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b Upstream ===== 754s + test 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b = 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s + local cetype=Upstream 754s + '[' xUpstream = xUpstream ']' 754s + cetype=SAME 754s ++ git log -n1 --pretty=format:%P 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b 754s + local parents=9649a7170321f0642a52e2f5ba557fdc57923dc5 754s + expect=9649a7170321f0642a52e2f5ba557fdc57923dc5 754s + enparents=1 754s + : Upstream/SAME 9649a7170321f0642a52e2f5ba557fdc57923dc5 754s + case "$ctype/$cetype" in 754s + case "$ctype/$etypes" in 754s + case "$cetype" in 754s + case "$ctype" in 754s ++ printf %s 9649a7170321f0642a52e2f5ba557fdc57923dc5 754s ++ wc -w 754s + local cnparents=1 754s + test 1 = 1 754s ++ for f in $parents 754s ++ echo 9649a7170321f0642a52e2f5ba557fdc57923dc5 754s ++ wc -w 754s ++ t-sort -u 754s ++ LC_COLLATE=C 754s ++ sort -u 754s + local cndparents=1 754s + test 1 = 1 754s + case "$parents" in 754s + case "$ctype" in 754s + read cid ctype info 754s + : ===== 9649a7170321f0642a52e2f5ba557fdc57923dc5 Upstream ===== 754s + test 9649a7170321f0642a52e2f5ba557fdc57923dc5 = 9649a7170321f0642a52e2f5ba557fdc57923dc5 754s + local cetype=Upstream 754s + '[' xUpstream = xUpstream ']' 754s + cetype=SAME 754s ++ git log -n1 --pretty=format:%P 9649a7170321f0642a52e2f5ba557fdc57923dc5 754s + local parents=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + expect=c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + enparents=1 754s + : Upstream/SAME c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + case "$ctype/$cetype" in 754s + case "$ctype/$etypes" in 754s + case "$cetype" in 754s + case "$ctype" in 754s ++ printf %s c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s ++ wc -w 754s + local cnparents=1 754s + test 1 = 1 754s ++ for f in $parents 754s ++ echo c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s ++ wc -w 754s ++ t-sort -u 754s ++ LC_COLLATE=C 754s ++ sort -u 754s + local cndparents=1 754s + test 1 = 1 754s + case "$parents" in 754s + case "$ctype" in 754s + read cid ctype info 754s + : ===== c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 Anchor ===== 754s + test c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 = c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + local cetype=Upstream 754s + '[' xAnchor = xUpstream ']' 754s ++ git log -n1 --pretty=format:%P c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 754s + local 'parents=bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 754s + expect='bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 754s + enparents=1 754s + : Anchor/Upstream 'bd26902a24e988020d5219e39d2413096d29d883 3c905ddc77266a886108a516cf92a1a8f195e235' 754s + case "$ctype/$cetype" in 754s + case "$ctype/$etypes" in 754s + case "$cetype" in 754s + case "$ctype" in 754s + break 754s + t-expect-fail 'E:already seems to be in git-debrebase format' t-git-debrebase convert-from-dgit-view 754s + local 'mpat=E:already seems to be in git-debrebase format' 754s + shift 754s + set +o pipefail 754s + LC_MESSAGES=C 754s + LANGUAGE=C 754s + t-git-debrebase convert-from-dgit-view 754s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 754s + local gdr=git-debrebase 754s + : ' 754s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 754s + git-debrebase --dgit=dgit -D convert-from-dgit-view 754s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 754s git-debrebase: snag detected (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 754s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 754s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 754s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Ix" => 0}],"Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893"} 754s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 754s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 754s git-debrebase = Upstream {"Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Ix" => 0}],"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 754s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 754s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 754s git-debrebase = Upstream {"Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26","Type" => "Upstream","CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Ix" => 0}]} 754s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 754s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 754s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 754s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Differs" => 0},{"Ix" => 1,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Differs" => 48}],"Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","OrigParents" => [$VAR1->{"Parents"}[1]]} 754s git-debrebase troubles=0 754s git-debrebase: Branch already seems to be in git-debrebase format! 754s git-debrebase: --always-convert-anyway would do the conversion operation anyway 754s git-debrebase: but is probably a bad idea. Probably, you wanted to do nothing. 754s 754s git-debrebase: error: Branch already in git-debrebase format. 754s + local 'ps=255 0' 754s + set -o pipefail 754s + case $ps in 754s + t-grep-mpat 'E:already seems to be in git-debrebase format' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 754s + local 'mpat=E:already seems to be in git-debrebase format' 754s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 754s + local grepper=fgrep 754s + case "$mpat" in 754s + case "$mpat" in 754s + grepper=egrep 754s + mpat='already seems to be in git-debrebase format' 754s + egrep -e 'already seems to be in git-debrebase format' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 754s git-debrebase: Branch already seems to be in git-debrebase format! 754s + t-refs-same-start 754s + unset t_ref_val 754s + t_ref_names=() 754s + t-ref-head 754s + local val 754s ++ git rev-parse HEAD 754s + val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + t-ref-same-val HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + local name=HEAD 754s + local val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + case "${t_ref_val-unset}" in 754s + t_ref_val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + t_ref_names+=("$name") 754s + t-git-debrebase --noop-ok convert-from-dgit-view 754s + local gdr=git-debrebase 754s + : ' 754s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 754s + git-debrebase --dgit=dgit -D --noop-ok convert-from-dgit-view 754s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 754s git-debrebase: snag detected (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 754s git-debrebase get_differs 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 = 0x2 754s git-debrebase classify 5f4fc22e40465aefaa231960eddbd3e37ff96d8c $t=e5dd0e087a1ed7cb0f120374cb6300ae51cbf893 @p 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b/0x2 754s git-debrebase = Upstream {"Msg" => "Update .gitignore from Debian packaging branch\n\nThe Debian packaging git branch contains these updates to the upstream\n.gitignore file(s). This patch is autogenerated, to provide these\nupdates to users of the official Debian archive view of the package.\n\n[dgit version UNRELEASED]\n\nGbp-Pq: Name auto-gitignore","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Ix" => 0}],"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Hdr" => "tree e5dd0e087a1ed7cb0f120374cb6300ae51cbf893\nparent 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b\nauthor Ian Jackson 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e5dd0e087a1ed7cb0f120374cb6300ae51cbf893"} 754s git-debrebase get_differs 9649a7170321f0642a52e2f5ba557fdc57923dc5 b062247c1b40e1417326d151508e24e26e03d88b = 0x2 754s git-debrebase classify 7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b $t=b062247c1b40e1417326d151508e24e26e03d88b @p 9649a7170321f0642a52e2f5ba557fdc57923dc5/0x2 754s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "b062247c1b40e1417326d151508e24e26e03d88b","CommitId" => "7ce0eee4ca863da8c0a9cc11deeadb6c6ab9547b","Hdr" => "tree b062247c1b40e1417326d151508e24e26e03d88b\nparent 9649a7170321f0642a52e2f5ba557fdc57923dc5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5"}]} 754s git-debrebase get_differs c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 3682658481e8d1d1923af1ad45b101aff6a74a26 = 0x2 754s git-debrebase classify 9649a7170321f0642a52e2f5ba557fdc57923dc5 $t=3682658481e8d1d1923af1ad45b101aff6a74a26 @p c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4/0x2 754s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "9649a7170321f0642a52e2f5ba557fdc57923dc5","Hdr" => "tree 3682658481e8d1d1923af1ad45b101aff6a74a26\nparent c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","Differs" => 2}],"Tree" => "3682658481e8d1d1923af1ad45b101aff6a74a26"} 754s git-debrebase get_differs bd26902a24e988020d5219e39d2413096d29d883 3d455942a13d254c6b2f81505c8beca11ef09619 = 0 754s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 754s git-debrebase classify c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p bd26902a24e988020d5219e39d2413096d29d883/0 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 754s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "bd26902a24e988020d5219e39d2413096d29d883","Ix" => 0},{"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Ix" => 1}],"Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent bd26902a24e988020d5219e39d2413096d29d883\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "c99b9f8c93ef8a55d894ef5e90a9e4163d1daef4","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 754s git-debrebase troubles=0 754s git-debrebase: Branch already seems to be in git-debrebase format! 754s git-debrebase: --always-convert-anyway would do the conversion operation anyway 754s git-debrebase: but is probably a bad idea. Probably, you wanted to do nothing. 754s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 754s ' 754s + t-ref-head 754s + local val 754s ++ git rev-parse HEAD 754s + val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + t-ref-same-val HEAD 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + local name=HEAD 754s + local val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + case "${t_ref_val-unset}" in 754s + t_ref_val=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 754s + t_ref_names+=("$name") 754s + t-git-debrebase -falready-converted convert-from-dgit-view --always-convert-anyway 754s + local gdr=git-debrebase 754s + : ' 754s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 754s + git-debrebase --dgit=dgit -D -falready-converted convert-from-dgit-view --always-convert-anyway 754s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 754s git-debrebase: snag ignored (-falready-converted): ahead of debrebase-last, this is already managed by git-debrebase! 754s Considering possible commits corresponding to upstream: 754s git tag: no suitable tag found (tried 1.0 v1.0 upstream/1.0) 754s orig: found what looks like a .orig, ../example_1.0.orig.tar.gz 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s Evaluating possible commits corresponding to upstream: 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 755s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s Yes, will base new branch on orig(s) imported via dgit 755s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 755s git-debrebase ffq check_specs * 755s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch) 755s OK, you are ahead of refs/remotes/dgit/dgit/sid 755s git-debrebase: snags: 1 overriden by individual -f options 755s git-debrebase >= update refs/debrebase-last/heads/dgit/sid c1ef594fe0023d58f7bfa24a1d43155d230cef24 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 755s git-debrebase >= update HEAD c1ef594fe0023d58f7bfa24a1d43155d230cef24 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 755s git-debrebase >$ 755s HEAD is now at c1ef594 git-debrebase convert-from-dgit-view: declare upstream 755s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 755s ' 755s + t-expect-fail 'E:ref varies' t-ref-head 755s + local 'mpat=E:ref varies' 755s + shift 755s + set +o pipefail 755s + LC_MESSAGES=C 755s + LANGUAGE=C 755s + t-ref-head 755s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 755s + local val 755s ++ git rev-parse HEAD 755s + val=c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + t-ref-same-val HEAD c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + local name=HEAD 755s + local val=c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + case "${t_ref_val-unset}" in 755s + fail 'ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 755s + echo 'failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 755s failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD) 755s + exit 1 755s + local 'ps=1 0' 755s + set -o pipefail 755s + case $ps in 755s + t-grep-mpat 'E:ref varies' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 755s + local 'mpat=E:ref varies' 755s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 755s + local grepper=fgrep 755s + case "$mpat" in 755s + case "$mpat" in 755s + grepper=egrep 755s + mpat='ref varies' 755s + egrep -e 'ref varies' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 755s + fail 'ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 755s + echo 'failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD)' 755s failed: ref varies: (HEAD) c1ef594fe0023d58f7bfa24a1d43155d230cef24 != 5f4fc22e40465aefaa231960eddbd3e37ff96d8c (HEAD HEAD) 755s + t-gdr-good laundered 755s + local state=laundered 755s + local beforetag= 755s + case $state in 755s + git diff --quiet -- :. ':!debian/patches' 755s + LC_MESSAGES=C 755s + t-git-debrebase status 755s + local gdr=git-debrebase 755s + : ' 755s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 755s + git-debrebase --dgit=dgit -D status 755s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 755s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 755s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 755s git-debrebase = Anchor {"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent 5f4fc22e40465aefaa231960eddbd3e37ff96d8c\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "c1ef594fe0023d58f7bfa24a1d43155d230cef24","Parents" => [{"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619"} 755s git-debrebase ffq_prev_branchinfo branch current refs/heads/dgit/sid 755s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 755s ' 755s + case $state in 755s + egrep '^ *branch is laundered' ../status.check 755s branch is laundered 755s + t-gdr-good-analyse HEAD laundered 755s + local head=HEAD 755s + local state=laundered 755s + local wsfx= 755s + local etypes bwtip 755s + case $state in 755s + etypes=Upstream 755s ++ t-git-debrebase breakwater 755s ++ local gdr=git-debrebase 755s ++ : ' 755s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 755s ++ git-debrebase --dgit=dgit -D breakwater 755s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 755s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 755s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 755s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235"}],"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent 5f4fc22e40465aefaa231960eddbd3e37ff96d8c\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619","Parents" => [{"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"CommitId" => "c1ef594fe0023d58f7bfa24a1d43155d230cef24"} 755s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 755s ' 755s + bwtip=Y:c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + anal=../anal 755s + t-git-debrebase analyse HEAD 755s + local gdr=git-debrebase 755s + : ' 755s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 755s + git-debrebase --dgit=dgit -D analyse HEAD 755s git-debrebase *** WALK c1ef594fe0023d58f7bfa24a1d43155d230cef24 1 *main::STDOUT 755s git-debrebase get_differs 5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x2 755s git-debrebase get_differs 3c905ddc77266a886108a516cf92a1a8f195e235 3d455942a13d254c6b2f81505c8beca11ef09619 = 0x30 755s git-debrebase classify c1ef594fe0023d58f7bfa24a1d43155d230cef24 $t=3d455942a13d254c6b2f81505c8beca11ef09619 @p 5f4fc22e40465aefaa231960eddbd3e37ff96d8c/0x2 3c905ddc77266a886108a516cf92a1a8f195e235/0x30 755s git-debrebase = Anchor {"Hdr" => "tree 3d455942a13d254c6b2f81505c8beca11ef09619\nparent 5f4fc22e40465aefaa231960eddbd3e37ff96d8c\nparent 3c905ddc77266a886108a516cf92a1a8f195e235\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase convert-from-dgit-view: declare upstream\n\n(Re)constructed breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "3c905ddc77266a886108a516cf92a1a8f195e235"}],"Type" => "Anchor","CommitId" => "c1ef594fe0023d58f7bfa24a1d43155d230cef24","Parents" => [{"Ix" => 0,"CommitId" => "5f4fc22e40465aefaa231960eddbd3e37ff96d8c","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Tree" => "3d455942a13d254c6b2f81505c8beca11ef09619"} 755s git-debrebase *** WALK prep done cur=c1ef594fe0023d58f7bfa24a1d43155d230cef24 brw -1 upp -1 proc 0 pm -1 755s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 755s ' 755s ++ git rev-parse HEAD 755s + expect=c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + exec 755s + local cid ctype info nparents 755s + read cid ctype info 755s + : ===== c1ef594fe0023d58f7bfa24a1d43155d230cef24 Anchor ===== 755s + test c1ef594fe0023d58f7bfa24a1d43155d230cef24 = c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + local cetype=Upstream 755s + '[' xAnchor = xUpstream ']' 755s ++ git log -n1 --pretty=format:%P c1ef594fe0023d58f7bfa24a1d43155d230cef24 755s + local 'parents=5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 755s + expect='5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 755s + enparents=1 755s + : Anchor/Upstream '5f4fc22e40465aefaa231960eddbd3e37ff96d8c 3c905ddc77266a886108a516cf92a1a8f195e235' 755s + case "$ctype/$cetype" in 755s + case "$ctype/$etypes" in 755s + case "$cetype" in 755s + case "$ctype" in 755s + break 755s + t-ok 755s + : ======================================== 755s + t-check-only-bpd 755s + '[' .. = .. ']' 755s + return 755s + t-fscks 755s + shopt -s nullglob 755s + for d in $tmp/*/.git $tmp/git/*.git 755s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s + t-git-fsck 755s ++ git rev-parse --git-dir 755s + local fsckerrs=.git/dgit-test-fsck.errs 755s + set +e 755s + LC_MESSAGES=C 755s + git fsck --no-dangling --strict 755s + tee .git/dgit-test-fsck.errs 755s + ps='0 0' 755s + set -e 755s + local pats 755s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 755s + test '0 0' = '0 0' 755s + pats+=(-e 'notice: HEAD points to an unborn branch') 755s + pats+=(-e 'notice: No default references') 755s + set +e 755s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 755s + rc=1 755s + set -e 755s + case $rc in 755s + t-save-artifacts 755s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts 755s + '[' x/tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts = x ']' 755s + '[' xtmp = x ']' 755s + GZIP=-1v 755s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-import-dgitview-artifacts/gdr-import-dgitview.tar.gz '--exclude=*.tar' . 755s gzip: warning: GZIP environment variable is deprecated; use an alias or script 755s 78.6% 755s + echo ok. 755s ok. 755s + rc=0 755s + set +x 755s + set +e 755s + pwd 755s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 755s + '[' x '!=' x ']' 755s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 755s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 755s + set -e 755s + test 0 = 0 756s autopkgtest [12:30:50]: test gdr-import-dgitview: -----------------------] 756s gdr-import-dgitview PASS 756s autopkgtest [12:30:50]: test gdr-import-dgitview: - - - - - - - - - - results - - - - - - - - - - 756s autopkgtest [12:30:50]: test gdr-import-nostitch: preparing testbed 756s Reading package lists... 756s Building dependency tree... 756s Reading state information... 757s Starting pkgProblemResolver with broken count: 0 757s Starting 2 pkgProblemResolver with broken count: 0 757s Done 757s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 757s autopkgtest [12:30:51]: test gdr-import-nostitch: [----------------------- 757s ++ set -o pipefail 757s ++ . tests/lib-core 757s ++ . tests/lib-restricts 757s ++ trap ' 757s rc=$? 757s set +x 757s test $rc = 0 || echo " 757s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 757s 757s Most relevant logs are just before assignment rc=$rc 757s Will now do cleanup etc. 757s " 757s set -x 757s set +e 757s pwd 757s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 757s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 757s set -e 757s test $rc = 0 || t-report-failure 757s ' EXIT 757s ++ t-filter-out-git-hyphen-dir 757s ++ local pathent 757s +++ type -p git-rev-parse 757s +++ : 757s ++ pathent= 757s ++ case "$pathent" in 757s ++ return 757s ++ t-set-intree 757s ++ '[' x = x ']' 757s ++ return 757s ++ : -D 757s ++ export DGIT_TEST_DEBUG 757s ++ : x 757s ++ export DGIT_TEST_DEBPUSH_DEBUG 757s ++ : 757s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 757s ++ GIT_COMMITTER_DATE='1530000000 +0100' 757s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 757s ++ GIT_AUTHOR_DATE='1530000000 +0100' 757s ++ export LC_CTYPE=C.UTF-8 757s ++ LC_CTYPE=C.UTF-8 757s ++ unset CDPATH 757s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 757s ++ FILTER_BRANCH_SQUELCH_WARNING=1 757s +++ pwd 757s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 757s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 757s ++ testname=gdr-import-nostitch 757s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 757s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 757s ++ bpd=.. 757s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 757s ++ '[' x '!=' x ']' 757s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s +++ pwd 757s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ t-set-using-tmp 757s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 757s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 757s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 757s ++ export 'DEBFULLNAME=dgit test git user' 757s ++ DEBFULLNAME='dgit test git user' 757s ++ git config --global user.email dgit-test@debian.example.net 757s ++ git config --global user.name 'dgit test git user' 757s ++ git config --global protocol.ext.allow always 757s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 757s ++ env -0 757s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 757s ++ export DEBCHANGE_VENDOR=dpkg 757s ++ DEBCHANGE_VENDOR=dpkg 757s ++ unset VISUAL 757s ++ unset GIT_EDITOR 757s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 757s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 757s ++ cat 757s ++ schroot=build 757s ++ : aq 757s ++ : archive/test-dummy 757s ++ : sid:unstable 757s ++ t-git-config dgit.default.old-dsc-distro test-dummy 757s ++ git config --global dgit.default.old-dsc-distro test-dummy 757s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 757s ++ : -D 757s ++ export GDR_TEST_DEBUG 757s ++ t-tstunt debchange 757s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ local var=PATH 757s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ eval ' 757s case "$PATH" in 757s "$tstunt:"*) ;; 757s *":$tstunt:"*) ;; 757s "") PATH="$tstunt" ;; 757s *) PATH="$tstunt:$PATH" ;; 757s esac 757s export PATH 757s ' 757s +++ case "$PATH" in 757s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s +++ export PATH 757s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ local var=PERLLIB 757s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ eval ' 757s case "$PERLLIB" in 757s "$tstunt:"*) ;; 757s *":$tstunt:"*) ;; 757s "") PERLLIB="$tstunt" ;; 757s *) PERLLIB="$tstunt:$PERLLIB" ;; 757s esac 757s export PERLLIB 757s ' 757s +++ case "$PERLLIB" in 757s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s +++ export PERLLIB 757s ++ local f 757s ++ for f in "$@" 757s ++ t-tstunt--save-real debchange 757s ++ local f=debchange 757s ++ case "$f" in 757s ++ local rc 757s ++ local real 757s ++ set +e 757s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 757s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 757s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s +++ type -p debchange 757s ++ real=/usr/bin/debchange 757s ++ rc=0 757s ++ set -e 757s ++ case $rc in 757s ++ local varname=debchange 757s ++ varname=DGIT_TEST_REAL_DEBCHANGE 757s ++ eval ' 757s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 757s export DGIT_TEST_REAL_DEBCHANGE 757s ' 757s +++ : /usr/bin/debchange 757s +++ export DGIT_TEST_REAL_DEBCHANGE 757s ++ f=./debchange 757s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 757s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 757s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 757s + t-dependencies GDR 757s + : 'Hopefully installed: GDR' 757s + t-tstunt-parsechangelog 757s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 757s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s + local var=PATH 757s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s + eval ' 757s case "$PATH" in 757s "$tstunt:"*) ;; 757s *":$tstunt:"*) ;; 757s "") PATH="$tstunt" ;; 757s *) PATH="$tstunt:$PATH" ;; 757s esac 757s export PATH 757s ' 757s ++ case "$PATH" in 757s ++ export PATH 757s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s + local var=PERLLIB 757s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s + eval ' 757s case "$PERLLIB" in 757s "$tstunt:"*) ;; 757s *":$tstunt:"*) ;; 757s "") PERLLIB="$tstunt" ;; 757s *) PERLLIB="$tstunt:$PERLLIB" ;; 757s esac 757s export PERLLIB 757s ' 757s ++ case "$PERLLIB" in 757s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 757s ++ export PERLLIB 757s + local f 757s + for f in "$@" 757s + t-tstunt--save-real dpkg-parsechangelog 757s + local f=dpkg-parsechangelog 757s + case "$f" in 757s + local rc 757s + local real 757s + set +e 757s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 757s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 757s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 757s ++ type -p dpkg-parsechangelog 757s + real=/usr/bin/dpkg-parsechangelog 757s + rc=0 757s + set -e 757s + case $rc in 757s + local varname=dpkg_parsechangelog 757s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 757s + eval ' 757s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 757s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 757s ' 757s ++ : /usr/bin/dpkg-parsechangelog 757s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 757s + f=./dpkg-parsechangelog 757s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 757s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 757s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 757s + for f in "$@" 757s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 757s + local f=Dpkg/Changelog/Parse.pm 757s + case "$f" in 757s + return 757s + f=./Dpkg/Changelog/Parse.pm 757s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 757s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 757s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 757s + t-gdr-gbp-import-core-with-queue 757s + t-gdr-gbp-import-core 757s + p=example 757s + t-worktree 1.1 757s + rm -rf example 757s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 757s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 757s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 757s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 757s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 757s + cd example 757s + : 'fake up some kind of upstream' 757s + git checkout -b upstream quilt-tip 757s Switched to a new branch 'upstream' 757s + rm -rf debian 757s + mkdir debian 757s + echo junk 757s + git add debian 757s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-nostitch)' 757s [upstream 2da72b5] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-nostitch) 757s 6 files changed, 1 insertion(+), 36 deletions(-) 757s delete mode 100644 debian/changelog 757s delete mode 100644 debian/compat 757s delete mode 100644 debian/control 757s delete mode 100644 debian/example.install 757s mode change 100755 => 100644 debian/rules 757s delete mode 100644 debian/source/format 757s + git tag v1.0 757s + : 'fake up that our quilt-tip was descended from upstream' 757s + git checkout quilt-tip 757s Switched to branch 'quilt-tip' 757s + git merge --no-edit -s ours upstream 757s Merge made by the 'ours' strategy. 757s + : 'fake up that our quilt-tip had the patch queue in it' 757s + git checkout patch-queue/quilt-tip 757s Switched to branch 'patch-queue/quilt-tip' 757s + gbp pq export 757s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 757s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 757s + git add debian/patches 757s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-nostitch)' 757s [quilt-tip 9c5a356] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-import-nostitch) 757s 4 files changed, 50 insertions(+) 757s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 757s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 757s create mode 100644 debian/patches/series 757s create mode 100644 debian/patches/subdir/addnewups 757s + : 'make branch names more conventional' 757s + git branch -D master 757s Deleted branch master (was 17d67db). 757s + git branch -m quilt-tip master 757s + git checkout master 757s Already on 'master' 757s + git tag -m synthetic debian/1.0-1 757s + echo '# comment' 757s + git add debian/patches/series 757s + git commit -m 'add a comment' 757s [master c1cb921] add a comment 757s 1 file changed, 1 insertion(+) 757s + t-expect-fail F:-fseries-comments t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 757s + local mpat=F:-fseries-comments 757s + shift 757s + set +o pipefail 757s + LC_MESSAGES=C 757s + LANGUAGE=C 757s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 757s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 757s + local gdr=git-debrebase 757s + : ' 757s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 757s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 758s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 758s git-debrebase get_differs 2da72b5680323f5b42c90f7eb7916647becd3eea c1cb9215b91bf7a56b033ab1d96910749237dbb7 = 0x34 758s git-debrebase: snag ignored (-fupstream-has-debian): upstream (2da72b5680323f5b42c90f7eb7916647becd3eea) contains debian/ directory 758s git-debrebase: snag detected (-fseries-comments): debian/patches/series contains comments, which will be discarded 758s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 758s $VAR2 = bless( do{\(my $o = { 758s 'drop_empty' => 0, 758s 'allow_duplicate' => 0, 758s 'is_pgp_signed' => 0, 758s 'fields' => { 758s 'Source' => 'example', 758s 'Version' => '1.0-1', 758s 'Distribution' => 'unstable', 758s 'Urgency' => 'low', 758s 'Maintainer' => 'Ian Jackson ', 758s 'Timestamp' => '1431548802', 758s 'Date' => 'Wed, 13 May 2015 21:26:42 +0100', 758s 'Changes' => ' 758s example (1.0-1) unstable; urgency=low 758s 758s * Test package.' 758s }, 758s 'name' => 'debian/changelog, entry no.1', 758s 'out_order' => [], 758s 'allow_pgp' => 1, 758s 'keep_duplicate' => 0, 758s 'in_order' => [ 758s 'Source', 758s 'Version', 758s 'Distribution', 758s 'Urgency', 758s 'Maintainer', 758s 'Timestamp', 758s 'Date', 758s 'Changes' 758s ] 758s })}, 'Dpkg::Control::Hash' ); 758s last finished-looking changelog entry: (1.0-1) unstable 758s Cannot confirm dgit view: dgit view tag archive/debian/1.0-1 not found 758s Failed to stitch in dgit view (see messages above). 758s dgit --overwrite will be needed on the first dgit push after conversion. 758s git-debrebase: snags: 1 overriden by individual -f options 758s 758s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 758s + local 'ps=255 0' 758s + set -o pipefail 758s + case $ps in 758s + t-grep-mpat F:-fseries-comments /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 758s + local mpat=F:-fseries-comments 758s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 758s + local grepper=fgrep 758s + case "$mpat" in 758s + case "$mpat" in 758s + grepper=fgrep 758s + mpat=-fseries-comments 758s + fgrep -e -fseries-comments /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 758s git-debrebase: snag detected (-fseries-comments): debian/patches/series contains comments, which will be discarded 758s + t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments convert-from-gbp 758s + tee ../convert-msg 758s + local gdr=git-debrebase 758s + : ' 758s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 758s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches -fseries-comments convert-from-gbp 758s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 758s git-debrebase get_differs 2da72b5680323f5b42c90f7eb7916647becd3eea c1cb9215b91bf7a56b033ab1d96910749237dbb7 = 0x34 758s git-debrebase: snag ignored (-fupstream-has-debian): upstream (2da72b5680323f5b42c90f7eb7916647becd3eea) contains debian/ directory 758s git-debrebase: snag ignored (-fseries-comments): debian/patches/series contains comments, which will be discarded 758s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 758s $VAR2 = bless( do{\(my $o = { 758s 'drop_empty' => 0, 758s 'out_order' => [], 758s 'fields' => { 758s 'Source' => 'example', 758s 'Version' => '1.0-1', 758s 'Distribution' => 'unstable', 758s 'Urgency' => 'low', 758s 'Maintainer' => 'Ian Jackson ', 758s 'Timestamp' => '1431548802', 758s 'Date' => 'Wed, 13 May 2015 21:26:42 +0100', 758s 'Changes' => ' 758s example (1.0-1) unstable; urgency=low 758s 758s * Test package.' 758s }, 758s 'allow_pgp' => 1, 758s 'in_order' => [ 758s 'Source', 758s 'Version', 758s 'Distribution', 758s 'Urgency', 758s 'Maintainer', 758s 'Timestamp', 758s 'Date', 758s 'Changes' 758s ], 758s 'allow_duplicate' => 0, 758s 'keep_duplicate' => 0, 758s 'is_pgp_signed' => 0, 758s 'name' => 'debian/changelog, entry no.1' 758s })}, 'Dpkg::Control::Hash' ); 758s last finished-looking changelog entry: (1.0-1) unstable 758s Cannot confirm dgit view: dgit view tag archive/debian/1.0-1 not found 758s Failed to stitch in dgit view (see messages above). 758s dgit --overwrite will be needed on the first dgit push after conversion. 758s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 758s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 758s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 758s gbp:info: Trying to apply patches at 'c1cb9215b91bf7a56b033ab1d96910749237dbb7' 758s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 758s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 758s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 758s git-debrebase ffq check_specs * 758s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 758s git-debrebase: snags: 2 overriden by individual -f options 758s git-debrebase >= update refs/debrebase-last/heads/master 0deebba043220580f1e7ea3ff6645736b5cf8017 0000000000000000000000000000000000000000 758s git-debrebase >= update HEAD 0deebba043220580f1e7ea3ff6645736b5cf8017 c1cb9215b91bf7a56b033ab1d96910749237dbb7 758s git-debrebase >$ 758s HEAD is now at 0deebba Add another new upstream file 758s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 758s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 758s ' 758s + grep -e 'dgit --overwrite will be needed' ../convert-msg 758s + t-ok 758s + : ======================================== 758s + t-check-only-bpd 758s + '[' .. = .. ']' 758s + return 758s + t-fscks 758s + shopt -s nullglob 758s + for d in $tmp/*/.git $tmp/git/*.git 758s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 758s + t-git-fsck 758s ++ git rev-parse --git-dir 758s + local fsckerrs=.git/dgit-test-fsck.errs 758s + set +e 758s + LC_MESSAGES=C 758s + git fsck --no-dangling --strict 758s + tee .git/dgit-test-fsck.errs 758s + ps='0 0' 758s + set -e 758s + local pats 758s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 758s + test '0 0' = '0 0' 758s + pats+=(-e 'notice: HEAD points to an unborn branch') 758s + pats+=(-e 'notice: No default references') 758s + set +e 758s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 758s + rc=1 758s + set -e 758s + case $rc in 758s + t-save-artifacts 758s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-import-nostitch-artifacts 758s + '[' x/tmp/autopkgtest.ztMUxl/gdr-import-nostitch-artifacts = x ']' 758s + '[' xtmp = x ']' 758s + GZIP=-1v 758s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-import-nostitch-artifacts/gdr-import-nostitch.tar.gz '--exclude=*.tar' . 758s gzip: warning: GZIP environment variable is deprecated; use an alias or script 758s 79.7% 758s + echo ok. 758s ok. 758s + rc=0 758s + set +x 758s + set +e 758s + pwd 758s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 758s + '[' x '!=' x ']' 758s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 758s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 758s + set -e 758s + test 0 = 0 758s autopkgtest [12:30:52]: test gdr-import-nostitch: -----------------------] 759s autopkgtest [12:30:53]: test gdr-import-nostitch: - - - - - - - - - - results - - - - - - - - - - 759s gdr-import-nostitch PASS 759s autopkgtest [12:30:53]: test gdr-makepatches7: preparing testbed 759s Reading package lists... 759s Building dependency tree... 759s Reading state information... 759s Starting pkgProblemResolver with broken count: 0 759s Starting 2 pkgProblemResolver with broken count: 0 759s Done 760s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 760s autopkgtest [12:30:54]: test gdr-makepatches7: [----------------------- 760s ++ set -o pipefail 760s ++ . tests/lib-core 760s ++ . tests/lib-restricts 760s ++ trap ' 760s rc=$? 760s set +x 760s test $rc = 0 || echo " 760s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 760s 760s Most relevant logs are just before assignment rc=$rc 760s Will now do cleanup etc. 760s " 760s set -x 760s set +e 760s pwd 760s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 760s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 760s set -e 760s test $rc = 0 || t-report-failure 760s ' EXIT 760s ++ t-filter-out-git-hyphen-dir 760s ++ local pathent 760s +++ type -p git-rev-parse 760s +++ : 760s ++ pathent= 760s ++ case "$pathent" in 760s ++ return 760s ++ t-set-intree 760s ++ '[' x = x ']' 760s ++ return 760s ++ : -D 760s ++ export DGIT_TEST_DEBUG 760s ++ : x 760s ++ export DGIT_TEST_DEBPUSH_DEBUG 760s ++ : 760s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 760s ++ GIT_COMMITTER_DATE='1530000000 +0100' 760s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 760s ++ GIT_AUTHOR_DATE='1530000000 +0100' 760s ++ export LC_CTYPE=C.UTF-8 760s ++ LC_CTYPE=C.UTF-8 760s ++ unset CDPATH 760s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 760s ++ FILTER_BRANCH_SQUELCH_WARNING=1 760s +++ pwd 760s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 760s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ testname=gdr-makepatches7 760s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ bpd=.. 760s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 760s ++ '[' x '!=' x ']' 760s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s +++ pwd 760s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ t-set-using-tmp 760s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 760s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 760s ++ export 'DEBFULLNAME=dgit test git user' 760s ++ DEBFULLNAME='dgit test git user' 760s ++ git config --global user.email dgit-test@debian.example.net 760s ++ git config --global user.name 'dgit test git user' 760s ++ git config --global protocol.ext.allow always 760s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 760s ++ env -0 760s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 760s ++ export DEBCHANGE_VENDOR=dpkg 760s ++ DEBCHANGE_VENDOR=dpkg 760s ++ unset VISUAL 760s ++ unset GIT_EDITOR 760s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 760s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 760s ++ cat 760s ++ schroot=build 760s ++ : aq 760s ++ : archive/test-dummy 760s ++ : sid:unstable 760s ++ t-git-config dgit.default.old-dsc-distro test-dummy 760s ++ git config --global dgit.default.old-dsc-distro test-dummy 760s ++ for import in ${autoimport-gnupg} 760s ++ case "$0" in 760s ++ t-setup-import gnupg 760s ++ local setupname=gnupg 760s ++ local setupsrc 760s ++ local lock 760s ++ '[' x = x ']' 760s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 760s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 760s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 760s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 760s cd "$1"; shift 760s setupname="$1"; shift 760s simport="$1"; shift 760s if [ -e "$simport" ]; then exit 0; fi 760s env - "$@" \ 760s "tests/setup/$setupname" 760s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 760s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 760s + shift 760s + setupname=gnupg 760s + shift 760s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 760s + shift 760s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 760s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-makepatches7 -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-makepatches7' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 760s ++ set -o pipefail 760s ++ . tests/lib-core 760s ++ . tests/lib-restricts 760s ++ trap ' 760s rc=$? 760s set +x 760s test $rc = 0 || echo " 760s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 760s 760s Most relevant logs are just before assignment rc=$rc 760s Will now do cleanup etc. 760s " 760s set -x 760s set +e 760s pwd 760s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 760s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 760s set -e 760s test $rc = 0 || t-report-failure 760s ' EXIT 760s ++ t-filter-out-git-hyphen-dir 760s ++ local pathent 760s +++ type -p git-rev-parse 760s +++ : 760s ++ pathent= 760s ++ case "$pathent" in 760s ++ return 760s ++ t-set-intree 760s ++ '[' x = x ']' 760s ++ return 760s ++ : -D 760s ++ export DGIT_TEST_DEBUG 760s ++ : x 760s ++ export DGIT_TEST_DEBPUSH_DEBUG 760s ++ : 760s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 760s ++ GIT_COMMITTER_DATE='1530000000 +0100' 760s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 760s ++ GIT_AUTHOR_DATE='1530000000 +0100' 760s ++ export LC_CTYPE=C.UTF-8 760s ++ LC_CTYPE=C.UTF-8 760s ++ unset CDPATH 760s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 760s ++ FILTER_BRANCH_SQUELCH_WARNING=1 760s +++ pwd 760s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 760s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ testname=gnupg 760s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 760s ++ bpd=.. 760s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 760s ++ '[' x '!=' x ']' 760s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s +++ pwd 760s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ t-set-using-tmp 760s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 760s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 760s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 760s ++ export 'DEBFULLNAME=dgit test git user' 760s ++ DEBFULLNAME='dgit test git user' 760s ++ git config --global user.email dgit-test@debian.example.net 760s ++ git config --global user.name 'dgit test git user' 760s ++ git config --global protocol.ext.allow always 760s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 760s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 760s ++ export DEBCHANGE_VENDOR=dpkg 760s ++ DEBCHANGE_VENDOR=dpkg 760s ++ unset VISUAL 760s ++ unset GIT_EDITOR 760s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 760s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 760s ++ cat 760s ++ schroot=build 760s ++ : aq 760s ++ : archive/test-dummy 760s ++ : sid:unstable 760s ++ t-git-config dgit.default.old-dsc-distro test-dummy 760s ++ git config --global dgit.default.old-dsc-distro test-dummy 760s ++ for import in ${autoimport-gnupg} 760s ++ case "$0" in 760s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 760s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 760s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 760s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 760s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 760s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 760s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 760s + setup=' 760s export GNUPGHOME=$tmp/gnupg 760s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 760s 760s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 760s ssb rsa2048 2013-11-17 [E] 760s 760s sec rsa2048 2014-01-26 [SC] 760s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 760s uid [ultimate] Populus Romanus (test key) 760s ssb rsa2048 2014-01-26 [E] 760s 760s sec rsa2048 2014-01-26 [SC] 760s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 760s uid [ unknown] Hannibal (test key) 760s ssb rsa2048 2014-01-26 [E] 760s 760s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 760s export GNUPGHOME=$tmp/gnupg 760s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 760s 760s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 760s delete mode 100644 debian/source/format 760s + git tag v1.0 760s + : 'fake up that our quilt-tip was descended from upstream' 760s + git checkout quilt-tip 760s Switched to branch 'quilt-tip' 760s + git merge --no-edit -s ours upstream 760s Merge made by the 'ours' strategy. 760s + : 'fake up that our quilt-tip had the patch queue in it' 760s + git checkout patch-queue/quilt-tip 760s Switched to branch 'patch-queue/quilt-tip' 760s + gbp pq export 760s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 760s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 760s + git add debian/patches 760s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 760s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 760s 4 files changed, 50 insertions(+) 760s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 760s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 760s create mode 100644 debian/patches/series 760s create mode 100644 debian/patches/subdir/addnewups 760s + : 'make branch names more conventional' 760s + git branch -D master 760s Deleted branch master (was 17d67db). 760s + git branch -m quilt-tip master 760s + not-gdr-processable origin 760s + git branch gdr-unprocessable/origin 760s + t-git-debrebase analyse 760s + local gdr=git-debrebase 760s + : ' 760s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 760s + git-debrebase --dgit=dgit -D analyse 760s + grep 'Unknown Unprocessable' 761s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 761s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 761s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 761s git-debrebase = AddPatches {"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 761s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 761s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 761s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 761s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Contributor" => $VAR1->{"Parents"}[0]} 761s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 761s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 761s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 761s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 761s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 761s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n"} 761s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 761s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 761s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n"} 761s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 761s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 761s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Msg" => "WIP\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 761s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 761s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 761s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"Msg" => "WIP\n","Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 761s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 761s git-debrebase ** Unknown 761s git-debrebase *** WALK BOMB unrecognised 761s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 761s ' 761s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 761s + : 'fake up an upstream 2.0' 761s + git branch make-upstream upstream 761s + t-make-new-upstream-tarball 2.0 761s + local uv=2.0 761s + git checkout make-upstream 761s Switched to branch 'make-upstream' 761s + echo 'upstream 2.0' 761s + git commit -a -m 'upstream 2.0 tarball' 761s [make-upstream 4db56a8] upstream 2.0 tarball 761s 1 file changed, 1 insertion(+) 761s + t-make-orig example 2.0 make-upstream 761s + local p=example 761s + local v=2.0 761s + local tag=make-upstream 761s + ust=example_2.0.orig.tar.gz 761s + GZIP=-1 761s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 761s gzip: warning: GZIP environment variable is deprecated; use an alias or script 761s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 761s + git branch -D quilt-tip-2 761s Deleted branch quilt-tip-2 (was 99fcab4). 761s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 761s + git branch -D gitish-only 761s Deleted branch gitish-only (was 2b2ddc8). 761s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 761s + git branch -D quilt-tip-1.1 761s Deleted branch quilt-tip-1.1 (was 7fc34be). 761s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 761s + git branch -D patch-queue/quilt-tip 761s Deleted branch patch-queue/quilt-tip (was d843a68). 761s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 761s + git branch -D indep-arch 761s Deleted branch indep-arch (was e215729). 761s + : 'see what gbp import-orig does' 761s + git checkout master 761s Switched to branch 'master' 761s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 761s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 761s gbp:info: Source package is example 761s gbp:info: Upstream version is 2.0 761s gbp:info: Replacing upstream source on 'master' 761s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 761s + not-gdr-processable merge 761s + git branch gdr-unprocessable/merge 761s + t-git-debrebase analyse 761s + local gdr=git-debrebase 761s + : ' 761s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 761s + git-debrebase --dgit=dgit -D analyse 761s + grep 'Unknown Unprocessable' 761s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 761s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 761s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 761s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 761s git-debrebase ** Unknown 761s git-debrebase *** WALK BOMB unrecognised 761s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 761s ' 761s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 761s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 761s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 761s + DEBEMAIL=dgit-tests@example.org 761s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 761s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 761s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 761s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 761s 1 file changed, 6 insertions(+) 761s + t-dch-commit-r 761s + t-dch-r-rune t-dch-commit 761s + local cmd=t-dch-commit 761s + shift 761s + local suite=unstable 761s + t-dch-commit -r -D unstable '' 761s + t-debchange -r -D unstable '' 761s + DEBEMAIL=dgit-tests@example.org 761s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 761s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 761s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 761s libdistro-info-perl is not installed, Debian release names are not known. 761s libdistro-info-perl is not installed, Ubuntu release names are not known. 761s + git commit -m 'dch -r -D unstable ' debian/changelog 761s [master f31021f] dch -r -D unstable 761s 1 file changed, 3 insertions(+), 2 deletions(-) 761s + echo garbage 761s + git add debian/patches/garbage 761s + git commit -m 'add garbage' debian/patches/garbage 761s [master eb10718] add garbage 761s 1 file changed, 1 insertion(+) 761s create mode 100644 debian/patches/garbage 761s + t-archive-none example 761s + t-select-package example 761s + p=example 761s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 761s + t-archive-none-aq 761s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 761s + : 761s + local 'jsondelim=[' 761s + local suitespec 761s + for suitespec in $suitespecs 761s + local suite=sid 761s + local sname=unstable 761s + t-aq-archive-updated sid example 761s + local suite=sid 761s + local p=example 761s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 761s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 761s + perl -wne ' 761s use JSON; 761s use strict; 761s our @v; 761s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 761s push @v, { 761s "version" => "$1", 761s "sha256sum" => "$2", 761s "component" => "$3", 761s "filename" => "$4", 761s }; 761s END { 761s my $json = JSON->new->canonical(); 761s print $json->encode(\@v) or die $!; 761s } 761s ' 761s + t-aq-archive-updated new example 761s + local suite=new 761s + local p=example 761s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 761s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 761s + perl -wne ' 761s use JSON; 761s use strict; 761s our @v; 761s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 761s push @v, { 761s "version" => "$1", 761s "sha256sum" => "$2", 761s "component" => "$3", 761s "filename" => "$4", 761s }; 761s END { 761s my $json = JSON->new->canonical(); 761s print $json->encode(\@v) or die $!; 761s } 761s ' 761s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 761s + cat 761s + jsondelim=' },' 761s + cat 761s + t-git-none 761s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 761s + set -e 761s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 761s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 761s + t-dgit -wgf --gbp push-source --new 761s + local dgit=dgit 761s + pwd 761s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 761s + : ' 761s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 761s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 761s | git rev-parse --show-toplevel 761s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 761s | git config -z --get-regexp --local '.*' 761s | git config -z --get-regexp --local '.*' 761s | git config -z --get-regexp --global '.*' 761s | git config -z --get-regexp --system '.*' 761s format 3.0 (quilt), quilt mode gbp 761s Format `3.0 (quilt)', need to check/update patch stack 761s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 761s => `' 761s + git diff --quiet HEAD 761s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 761s canonical suite name for unstable is sid 761s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 761s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 761s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 761s | git rev-parse 'HEAD~0' 761s => `eb10718ab213ccfa83613ebbddefbffda941a548' 761s | git symbolic-ref -q HEAD 761s => `refs/heads/master' 761s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 761s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 761s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 761s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 761s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 761s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 643892985a97de2109fb4a80373edb1b30d14cb247bff742a1cacfbb921c2b65 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 761s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 761s >(no reflog) 761s splitbrain cache miss 761s CD work 761s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 761s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 761s + git checkout -q -b dgit-view 761s examining quilt state (multiple patches, gbp mode) 761s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 761s CD fake 761s | find -name .git -prune -print0 761s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 761s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 761s + git add -Af . 761s | git write-tree 761s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 761s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 761s CD .. 761s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 761s CD ../fake 761s + git add -Af . 761s | git write-tree 761s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 761s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 761s CD ../work 761s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 761s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 761s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 761s => `' 761s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 761s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 761s => `lib.c\x00new-upstream-file\x00src.c\x00' 761s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 761s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 761s => `lib.c\x00new-upstream-file\x00src.c\x00' 761s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 761s differences @dl == ## ## == == ==. 761s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 761s dgit: quilt differences: src: == orig ## gitignores: == orig == 761s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 761s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 761s => `1530000000 +0000' 761s dgit view: creating patches-applied version using gbp pq 761s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 762s + git update-ref refs/heads/dgit-view HEAD 762s + git checkout -q dgit-view 762s | git rev-parse 'HEAD~0' 762s => `45ea71a69fa522ce760afdab8a420200443753e9' 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 762s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 762s => `' 762s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 643892985a97de2109fb4a80373edb1b30d14cb247bff742a1cacfbb921c2b65 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 762s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 762s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 762s | git rev-parse 'HEAD~0' 762s => `eb10718ab213ccfa83613ebbddefbffda941a548' 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 762s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 762s dpkg-source: info: using source format '3.0 (quilt)' 762s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 762s dpkg-source: info: using patch list from debian/patches/series 762s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 762s dpkg-source: info: building example in example_2.0-1.dsc 762s CD work 762s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 762s package seems new, not specifying -v 762s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 762s dpkg-genchanges: info: not including original source code in upload 762s CD .. 762s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 762s renaming (Files) example_2.0.orig.tar.gz 762s renaming (Files) example_2.0-1.debian.tar.xz 762s renaming (dsc) example_2.0-1.dsc 762s renaming (changes) example_2.0-1_source.changes 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 762s actually entering push 762s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 762s => `0' 762s + git config remote.dgit.skipdefaultupdate true 762s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 762s get_archive_dsc: nothing in archive, returning undef 762s no version available from the archive 762s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 762s => `' 762s previous reference hash= 762s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 762s => `' 762s fetch_from_archive: lastfetch= 762s nothing found! 762s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 762s + git check-ref-format archive/test-dummy/2.0-1 762s | git symbolic-ref -q HEAD 762s => `refs/heads/master' 762s | git rev-parse 'HEAD~0' 762s => `eb10718ab213ccfa83613ebbddefbffda941a548' 762s ffq_prev_branchinfo branch current refs/heads/master 762s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 762s => `' 762s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 762s => `' 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 762s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 762s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 762s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 762s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 762s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 643892985a97de2109fb4a80373edb1b30d14cb247bff742a1cacfbb921c2b65 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 762s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 762s CD work 762s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 762s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 762s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 762s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 762s splitbrain_pseudomerge... 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 762s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 762s => `' 762s + git diff --quiet HEAD 762s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 762s => `' 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 762s checking that example_2.0-1.dsc corresponds to HEAD 762s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 762s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 762s dpkg-source: info: extracting example in example-2.0 762s dpkg-source: info: unpacking example_2.0.orig.tar.gz 762s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 762s dpkg-source: info: using patch list from debian/patches/series 762s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 762s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 762s dpkg-source: info: applying subdir/addnewups 762s CD example-2.0 762s | find -name .git -prune -print0 762s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 762s + git add -Af . 762s | git write-tree 762s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 762s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 762s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 762s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 762s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 762s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 762s files_compare_inputs example_2.0-1.dsc 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 762s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 762s files_compare_inputs example_2.0-1.dsc Files 762s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 762s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 762s files_compare_inputs example_2.0-1_source.changes 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 762s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 762s files_compare_inputs example_2.0-1_source.changes Files 762s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 762s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 762s checking origs needed (2.0)... 762s checking origs needed placement 'devel extra'... 762s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 762s origs example_2.0.orig.tar.gz is_orig 762s -| sh -ec 'cd "$1"; shift 762s 762s find -name "$1" -print0 | 762s xargs -0r sha256sum 762s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 762s origs example_2.0.orig.tar.gz $#$have=-1 762s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 762s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 762s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 762s push_tagwants: $VAR1 = [ 762s '2.0-1', 762s '45ea71a69fa522ce760afdab8a420200443753e9', 762s 'eb10718ab213ccfa83613ebbddefbffda941a548', 762s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 762s ]; 762s $VAR2 = [ 762s { 762s 'Tag' => 'archive/test-dummy/2.0-1', 762s 'Tfn' => sub { "DUMMY" }, 762s 'View' => 'dgit', 762s 'TagFn' => sub { "DUMMY" }, 762s 'TfSuffix' => '', 762s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9' 762s }, 762s { 762s 'Tag' => 'test-dummy/2.0-1', 762s 'Tfn' => sub { "DUMMY" }, 762s 'View' => 'maint', 762s 'TagFn' => sub { "DUMMY" }, 762s 'TfSuffix' => '-maintview', 762s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548' 762s } 762s ]; 762s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 762s => `1530000000 +0000' 762s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 762s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 762s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 762s => `79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d' 762s + git verify-tag 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s gpg: Signature made Mon Mar 31 12:30:56 2025 UTC 762s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 762s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 762s gpg: WARNING: This key is not certified with a trusted signature! 762s gpg: There is no indication that the signature belongs to the owner. 762s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 762s + git update-ref refs/tags/archive/test-dummy/2.0-1 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d 762s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 762s => `ea525eb22f97efaa98b68f14377710467d006fe0' 762s + git verify-tag ea525eb22f97efaa98b68f14377710467d006fe0 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s gpg: Signature made Mon Mar 31 12:30:56 2025 UTC 762s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 762s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 762s gpg: WARNING: This key is not certified with a trusted signature! 762s gpg: There is no indication that the signature belongs to the owner. 762s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 762s + git update-ref refs/tags/test-dummy/2.0-1 ea525eb22f97efaa98b68f14377710467d006fe0 762s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 762s => `0' 762s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 762s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 762s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 762s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 762s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 762s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 762s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 762s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 762s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s 762s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 762s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 762s 762s Successfully signed dsc, changes files 762s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 763s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 763s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 763s D: Setting host argument. 763s Checking signature on .changes 763s Checking signature on .dsc 763s Uploading to test-dummy (via local to localhost): 763s Successfully uploaded packages. 763s dgit ok: pushed and uploaded 2.0-1 763s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 763s del_lrfetchrefs... 763s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 763s ' 763s + t-salsa-add-remote 763s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 763s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 763s + set -e 763s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 763s + git init --bare 763s hint: Using 'master' as the name for the initial branch. This default branch name 763s hint: is subject to change. To configure the initial branch name to use in all 763s hint: of your new repositories, which will suppress this warning, call: 763s hint: 763s hint: git config --global init.defaultBranch 763s hint: 763s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 763s hint: 'development'. The just-created branch can be renamed via this command: 763s hint: 763s hint: git branch -m 763s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 763s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 763s + git push --set-upstream origin master 763s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 763s * [new branch] master -> master 763s Branch 'master' set up to track remote branch 'master' from 'origin'. 763s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 763s + local 'mpat=E:identical in upstream files' 763s + shift 763s + set +o pipefail 763s + LC_MESSAGES=C 763s + LANGUAGE=C 763s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 763s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local gdr=git-debrebase 763s + : ' 763s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 763s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 763s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 763s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 763s docs/README | 1 + 763s 1 file changed, 1 insertion(+) 763s 763s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 763s git-debrebase: identical in upstream files. See diffstat above, or run 763s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 763s + local 'ps=255 0' 763s + set -o pipefail 763s + case $ps in 763s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local 'mpat=E:identical in upstream files' 763s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local grepper=fgrep 763s + case "$mpat" in 763s + case "$mpat" in 763s + grepper=egrep 763s + mpat='identical in upstream files' 763s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s git-debrebase: identical in upstream files. See diffstat above, or run 763s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 763s + local 'mpat=E:Unused patch file garbage will be discarded' 763s + shift 763s + set +o pipefail 763s + LC_MESSAGES=C 763s + LANGUAGE=C 763s + t-git-debrebase -fupstream-has-debian convert-from-gbp 763s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local gdr=git-debrebase 763s + : ' 763s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 763s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 763s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 763s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 763s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 763s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 763s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 763s $VAR2 = bless( do{\(my $o = { 763s 'keep_duplicate' => 0, 763s 'in_order' => [ 763s 'Source', 763s 'Version', 763s 'Distribution', 763s 'Urgency', 763s 'Maintainer', 763s 'Timestamp', 763s 'Date', 763s 'Changes' 763s ], 763s 'fields' => { 763s 'Source' => 'example', 763s 'Version' => '2.0-1', 763s 'Distribution' => 'unstable', 763s 'Urgency' => 'medium', 763s 'Maintainer' => 'dgit test git user ', 763s 'Timestamp' => '1530000000', 763s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 763s 'Changes' => ' 763s example (2.0-1) unstable; urgency=medium 763s 763s [ Ian Jackson ] 763s * new upstream (did gbp import-orig)' 763s }, 763s 'allow_duplicate' => 0, 763s 'drop_empty' => 0, 763s 'name' => 'debian/changelog, entry no.1', 763s 'is_pgp_signed' => 0, 763s 'out_order' => [], 763s 'allow_pgp' => 1 763s })}, 'Dpkg::Control::Hash' ); 763s last finished-looking changelog entry: (2.0-1) unstable 763s will stitch in dgit view, archive/test-dummy/2.0-1 763s git-debrebase: snags: 1 overriden by individual -f options 763s 763s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 763s + local 'ps=255 0' 763s + set -o pipefail 763s + case $ps in 763s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local 'mpat=E:Unused patch file garbage will be discarded' 763s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s + local grepper=fgrep 763s + case "$mpat" in 763s + case "$mpat" in 763s + grepper=egrep 763s + mpat='Unused patch file garbage will be discarded' 763s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 763s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 763s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 763s + local gdr=git-debrebase 763s + : ' 763s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 763s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 763s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 763s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 763s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 763s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 763s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 763s $VAR2 = bless( do{\(my $o = { 763s 'allow_pgp' => 1, 763s 'is_pgp_signed' => 0, 763s 'in_order' => [ 763s 'Source', 763s 'Version', 763s 'Distribution', 763s 'Urgency', 763s 'Maintainer', 763s 'Timestamp', 763s 'Date', 763s 'Changes' 763s ], 763s 'keep_duplicate' => 0, 763s 'allow_duplicate' => 0, 763s 'drop_empty' => 0, 763s 'name' => 'debian/changelog, entry no.1', 763s 'fields' => { 763s 'Source' => 'example', 763s 'Version' => '2.0-1', 763s 'Distribution' => 'unstable', 763s 'Urgency' => 'medium', 763s 'Maintainer' => 'dgit test git user ', 763s 'Timestamp' => '1530000000', 763s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 763s 'Changes' => ' 763s example (2.0-1) unstable; urgency=medium 763s 763s [ Ian Jackson ] 763s * new upstream (did gbp import-orig)' 763s }, 763s 'out_order' => [] 763s })}, 'Dpkg::Control::Hash' ); 763s last finished-looking changelog entry: (2.0-1) unstable 763s will stitch in dgit view, archive/test-dummy/2.0-1 763s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 763s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 763s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 763s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 763s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 763s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 763s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 763s git-debrebase ffq check_specs * 763s git-debrebase ffq merge master 763s git-debrebase ffq check_remote origin remote fetch/merge branch 763s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 763s OK, you are ahead of refs/remotes/origin/master 763s git-debrebase ffq check_remote undef remote push branch 763s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 763s OK, you are ahead of refs/remotes/dgit/dgit/sid 763s git-debrebase: snags: 2 overriden by individual -f options 763s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 763s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 763s git-debrebase >$ 763s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 763s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 763s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 763s ' 763s + git branch converted-from-gbp 763s + v=2.0-2 763s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 763s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 763s + DEBEMAIL=dgit-tests@example.org 763s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 763s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 763s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 763s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 763s 1 file changed, 6 insertions(+) 763s + t-dch-commit-r 763s + t-dch-r-rune t-dch-commit 763s + local cmd=t-dch-commit 763s + shift 763s + local suite=unstable 763s + t-dch-commit -r -D unstable '' 763s + t-debchange -r -D unstable '' 763s + DEBEMAIL=dgit-tests@example.org 763s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 763s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 763s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 763s libdistro-info-perl is not installed, Debian release names are not known. 763s libdistro-info-perl is not installed, Ubuntu release names are not known. 763s + git commit -m 'dch -r -D unstable ' debian/changelog 763s [master 4af0243] dch -r -D unstable 763s 1 file changed, 1 insertion(+), 1 deletion(-) 763s + t-dgit -wgf push-source --new 763s + local dgit=dgit 763s + pwd 763s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 763s + : ' 763s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 763s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 764s | git rev-parse --show-toplevel 764s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 764s | git config -z --get-regexp --local '.*' 764s | git config -z --get-regexp --local '.*' 764s | git config -z --get-regexp --global '.*' 764s | git config -z --get-regexp --system '.*' 764s format 3.0 (quilt), quilt mode linear 764s Format `3.0 (quilt)', need to check/update patch stack 764s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 764s => `' 764s + git diff --quiet HEAD 764s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 764s canonical suite name for unstable is sid 764s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 764s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 764s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 764s | git rev-parse 'HEAD~0' 764s => `4af0243f9227b0d695fbff38df345aca23969e2e' 764s | git symbolic-ref -q HEAD 764s => `refs/heads/master' 764s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 764s CD work 764s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 764s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 764s examining quilt state (multiple patches, linear mode) 764s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 764s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 764s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 764s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 764s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 764s | git rev-parse 'HEAD~0' 764s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 764s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 764s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 764s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 764s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 764s CD fake 764s | find -name .git -prune -print0 764s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 764s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 764s + git add -Af . 764s | git write-tree 764s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 764s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 764s CD .. 764s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s CD ../fake 764s + git add -Af . 764s | git write-tree 764s => `607612c46d7ea5b66697b830f1a50f069061d460' 764s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 764s CD ../work 764s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 764s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 764s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 764s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 764s => `' 764s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 764s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 764s => `lib.c\x00new-upstream-file\x00src.c\x00' 764s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 764s differences @dl ## ## == == == ==. 764s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 764s dgit: quilt differences: src: ## orig ## gitignores: == orig == 764s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 764s starting quiltify (multiple patches, linear mode) 764s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 764s => `debian/control'... 764s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 764s => `' 764s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 764s search finished hooray! 764s quiltify linearisation planning successful, executing... 764s + git checkout -q master 764s | git status --ignored --porcelain 764s => `?? .pc/' 764s nothing quilty to commit, ok. 764s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 764s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 764s | git rev-parse 'HEAD~0' 764s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 764s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 764s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 764s CD work 764s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 764s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s CD .. 764s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 764s dpkg-source: info: using source format '3.0 (quilt)' 764s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 764s dpkg-source: info: using patch list from debian/patches/series 764s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 764s dpkg-source: info: building example in example_2.0-2.dsc 764s CD work 764s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 764s package seems new, not specifying -v 764s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 764s dpkg-genchanges: info: not including original source code in upload 764s CD .. 764s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 764s renaming (Files) example_2.0.orig.tar.gz 764s renaming (Files) example_2.0-2.debian.tar.xz 764s renaming (dsc) example_2.0-2.dsc 764s renaming (changes) example_2.0-2_source.changes 764s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 764s actually entering push 764s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 764s => `1' 764s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 764s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 764s git_lrfetch_sane iteration 0 764s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 764s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 764s => 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d refs/tags/archive/test-dummy/2.0-1 764s => ea525eb22f97efaa98b68f14377710467d006fe0 refs/tags/test-dummy/2.0-1 764s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 764s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 764s | git for-each-ref refs/dgit-fetch/test-dummy 764s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 764s |> 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 764s |> ea525eb22f97efaa98b68f14377710467d006fe0 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 764s git_lrfetch_sane: tidying any old suite lrfetchrefs 764s | git for-each-ref refs/dgit-fetch/sid 764s git_lrfetch_sane: git fetch --no-insane emulation complete 764s $VAR1 = { 764s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d', 764s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 764s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'ea525eb22f97efaa98b68f14377710467d006fe0' 764s }; 764s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 764s |> 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d tag refs/tags/archive/test-dummy/2.0-1 764s currently refs/tags/archive/test-dummy/2.0-1=79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d 764s |> ea525eb22f97efaa98b68f14377710467d006fe0 tag refs/tags/test-dummy/2.0-1 764s currently refs/tags/test-dummy/2.0-1=ea525eb22f97efaa98b68f14377710467d006fe0 764s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 764s |> 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 764s offered refs/tags/archive/test-dummy/2.0-1=79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d 764s |> ea525eb22f97efaa98b68f14377710467d006fe0 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 764s offered refs/tags/test-dummy/2.0-1=ea525eb22f97efaa98b68f14377710467d006fe0 764s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 764s get_archive_dsc: nothing in archive, returning undef 764s no version available from the archive 764s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 764s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 764s 764s Package not found in the archive, but has allegedly been pushed using dgit. 764s Perhaps the upload is stuck in incoming. Using the version from git. 764s 764s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s fetch mergeinfos: 764s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 764s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 764s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 764s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 764s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 764s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 764s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 764s + git check-ref-format archive/test-dummy/2.0-2 764s | git symbolic-ref -q HEAD 764s => `refs/heads/master' 764s | git rev-parse 'HEAD~0' 764s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 764s ffq_prev_branchinfo branch current refs/heads/master 764s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 764s => `' 764s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 764s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 764s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 764s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 764s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 764s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 764s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 764s | git status --ignored --porcelain 764s => `' 764s nothing quilty to commit, ok. 764s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 764s => `' 764s + git diff --quiet HEAD 764s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 764s => `45ea71a69fa522ce760afdab8a420200443753e9' 764s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 764s => `' 764s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 764s checking that example_2.0-2.dsc corresponds to HEAD 764s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 765s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 765s dpkg-source: info: extracting example in example-2.0 765s dpkg-source: info: unpacking example_2.0.orig.tar.gz 765s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 765s dpkg-source: info: using patch list from debian/patches/series 765s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 765s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 765s dpkg-source: info: applying subdir/addnewups 765s CD example-2.0 765s | find -name .git -prune -print0 765s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 765s + git add -Af . 765s | git write-tree 765s => `607612c46d7ea5b66697b830f1a50f069061d460' 765s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 765s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 765s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 765s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 765s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 765s files_compare_inputs example_2.0-2.dsc 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 765s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 765s files_compare_inputs example_2.0-2.dsc Files 765s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 765s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 765s files_compare_inputs example_2.0-2_source.changes 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 765s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 765s files_compare_inputs example_2.0-2_source.changes Files 765s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 765s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 765s checking origs needed (2.0)... 765s checking origs needed placement 'devel extra'... 765s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 765s origs example_2.0.orig.tar.gz is_orig 765s -| sh -ec 'cd "$1"; shift 765s 765s find -name "$1" -print0 | 765s xargs -0r sha256sum 765s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 765s origs example_2.0.orig.tar.gz $#$have=-1 765s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 765s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 765s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 765s push_tagwants: $VAR1 = [ 765s '2.0-2', 765s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 765s undef, 765s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 765s ]; 765s $VAR2 = [ 765s { 765s 'View' => 'dgit', 765s 'TagFn' => sub { "DUMMY" }, 765s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 765s 'Tag' => 'archive/test-dummy/2.0-2', 765s 'TfSuffix' => '', 765s 'Tfn' => sub { "DUMMY" } 765s }, 765s { 765s 'Tag' => 'test-dummy/2.0-2', 765s 'Tfn' => sub { "DUMMY" }, 765s 'TfSuffix' => '-dgit', 765s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 765s 'TagFn' => sub { "DUMMY" }, 765s 'View' => 'dgit' 765s } 765s ]; 765s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 765s => `1530000000 +0000' 765s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 765s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 765s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 765s => `eb2fc08792295cd662cd62079c76c99a514dc200' 765s + git verify-tag eb2fc08792295cd662cd62079c76c99a514dc200 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s gpg: Signature made Mon Mar 31 12:30:59 2025 UTC 765s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 765s gpg: WARNING: This key is not certified with a trusted signature! 765s gpg: There is no indication that the signature belongs to the owner. 765s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 765s + git update-ref refs/tags/archive/test-dummy/2.0-2 eb2fc08792295cd662cd62079c76c99a514dc200 765s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 765s => `21ce3451a25b41e8e575bae0f6ae1cc22ccf0e93' 765s + git verify-tag 21ce3451a25b41e8e575bae0f6ae1cc22ccf0e93 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s gpg: Signature made Mon Mar 31 12:30:59 2025 UTC 765s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 765s gpg: WARNING: This key is not certified with a trusted signature! 765s gpg: There is no indication that the signature belongs to the owner. 765s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 765s + git update-ref refs/tags/test-dummy/2.0-2 21ce3451a25b41e8e575bae0f6ae1cc22ccf0e93 765s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 765s => `1' 765s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 765s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 765s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 765s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 765s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 765s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 765s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 765s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s 765s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 765s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 765s 765s Successfully signed dsc, changes files 765s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 765s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 765s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 765s D: Setting host argument. 765s Checking signature on .changes 765s Checking signature on .dsc 765s Package includes an .orig.tar.gz file although the debian revision suggests 765s that it might not be required. Multiple uploads of the .orig.tar.gz may be 765s rejected by the upload queue management software. 765s Uploading to test-dummy (via local to localhost): 765s Successfully uploaded packages. 765s dgit ok: pushed and uploaded 2.0-2 765s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 765s del_lrfetchrefs... 765s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 765s del_lrfetchrefs: 79ac156f13e9f21efdf423ed8f9ae41aa8ebac3d refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 765s del_lrfetchrefs: ea525eb22f97efaa98b68f14377710467d006fe0 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 765s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 765s ' 765s + git push 765s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 765s eb10718..6b22dd5 master -> master 765s + cd .. 765s + t-archive-process-incoming sid 765s + local suite=sid 765s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 765s + t-archive-query sid 765s + local suite=sid 765s + local dscf=main/example_2.0-2.dsc 765s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 765s + local suite=sid 765s + local p=example 765s + local v=2.0-2 765s + local dscf=main/example_2.0-2.dsc 765s + local sha 765s ++ sha256sum 765s + sha='65f623d2f78db2ee67ba52550300d7fa61c81572d0152128be9a3ffb3290aa87 -' 765s + echo '2.0-2 65f623d2f78db2ee67ba52550300d7fa61c81572d0152128be9a3ffb3290aa87 main/example_2.0-2.dsc' 765s + t-aq-archive-updated sid example 765s + local suite=sid 765s + local p=example 765s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 765s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 765s + perl -wne ' 765s use JSON; 765s use strict; 765s our @v; 765s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 765s push @v, { 765s "version" => "$1", 765s "sha256sum" => "$2", 765s "component" => "$3", 765s "filename" => "$4", 765s }; 765s END { 765s my $json = JSON->new->canonical(); 765s print $json->encode(\@v) or die $!; 765s } 765s ' 765s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 765s ++ echo git mirror aq 765s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 765s . $troot/lib-gdr 765s t-tstunt-parsechangelog 765s p=example 765s t-git-next-date 765s ' 765s + local savevars= 765s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 765s + local 'importeval= 765s . $troot/lib-gdr 765s t-tstunt-parsechangelog 765s p=example 765s t-git-next-date 765s ' 765s + local import=IMPORT.gdr-convert-gbp 765s + exec 765s + local vn 765s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 765s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 765s print STDERR "saving-exporting $vn\n"; 765s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 765s or die $!; 765s } 765s ' 765s saving-exporting DGIT_TEST_REAL_DEBCHANGE 765s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 765s saving-exporting DGIT_TEST_REAL_GPG 765s saving-exporting DGIT_TEST_REAL_GPG_AGENT 765s + set -e 765s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 765s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 765s + printf '\n%s\n' ' 765s . $troot/lib-gdr 765s t-tstunt-parsechangelog 765s p=example 765s t-git-next-date 765s ' 765s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 765s + rc=0 765s + set +x 765s + set +e 765s + pwd 765s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 765s + '[' x '!=' x ']' 765s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 765s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 765s + set -e 765s + test 0 = 0 765s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 765s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 765s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 765s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 765s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 765s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 765s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 765s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 765s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 765s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 765s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 765s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 765s +++ : -D 765s +++ export GDR_TEST_DEBUG 765s +++ t-tstunt debchange 765s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s +++ local var=PATH 765s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s +++ eval ' 765s case "$PATH" in 765s "$tstunt:"*) ;; 765s *":$tstunt:"*) ;; 765s "") PATH="$tstunt" ;; 765s *) PATH="$tstunt:$PATH" ;; 765s esac 765s export PATH 765s ' 765s ++++ case "$PATH" in 765s ++++ export PATH 765s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s +++ local var=PERLLIB 765s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s +++ eval ' 765s case "$PERLLIB" in 765s "$tstunt:"*) ;; 765s *":$tstunt:"*) ;; 765s "") PERLLIB="$tstunt" ;; 765s *) PERLLIB="$tstunt:$PERLLIB" ;; 765s esac 765s export PERLLIB 765s ' 765s ++++ case "$PERLLIB" in 765s ++++ export PERLLIB 765s +++ local f 765s +++ for f in "$@" 765s +++ t-tstunt--save-real debchange 765s +++ local f=debchange 765s +++ case "$f" in 765s +++ local rc 765s +++ local real 765s +++ set +e 765s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 765s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 765s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s ++++ type -p debchange 765s +++ real=/usr/bin/debchange 765s +++ rc=0 765s +++ set -e 765s +++ case $rc in 765s +++ local varname=debchange 765s +++ varname=DGIT_TEST_REAL_DEBCHANGE 765s +++ eval ' 765s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 765s export DGIT_TEST_REAL_DEBCHANGE 765s ' 765s ++++ : /usr/bin/debchange 765s ++++ export DGIT_TEST_REAL_DEBCHANGE 765s +++ f=./debchange 765s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 765s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 765s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 765s ++ t-tstunt-parsechangelog 765s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 765s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s ++ local var=PATH 765s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s ++ eval ' 765s case "$PATH" in 765s "$tstunt:"*) ;; 765s *":$tstunt:"*) ;; 765s "") PATH="$tstunt" ;; 765s *) PATH="$tstunt:$PATH" ;; 765s esac 765s export PATH 765s ' 765s +++ case "$PATH" in 765s +++ export PATH 765s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s ++ local var=PERLLIB 765s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 765s ++ eval ' 765s case "$PERLLIB" in 765s "$tstunt:"*) ;; 765s *":$tstunt:"*) ;; 765s "") PERLLIB="$tstunt" ;; 765s *) PERLLIB="$tstunt:$PERLLIB" ;; 765s esac 765s export PERLLIB 765s ' 765s +++ case "$PERLLIB" in 765s +++ export PERLLIB 765s ++ local f 765s ++ for f in "$@" 765s ++ t-tstunt--save-real dpkg-parsechangelog 765s ++ local f=dpkg-parsechangelog 765s ++ case "$f" in 765s ++ local rc 765s ++ local real 765s ++ set +e 765s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 765s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 765s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 765s +++ type -p dpkg-parsechangelog 765s ++ real=/usr/bin/dpkg-parsechangelog 765s ++ rc=0 765s ++ set -e 765s ++ case $rc in 765s ++ local varname=dpkg_parsechangelog 765s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 765s ++ eval ' 765s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 765s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 765s ' 765s +++ : /usr/bin/dpkg-parsechangelog 765s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 765s ++ f=./dpkg-parsechangelog 765s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 765s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 765s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 765s ++ for f in "$@" 765s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 765s ++ local f=Dpkg/Changelog/Parse.pm 765s ++ case "$f" in 765s ++ return 765s ++ f=./Dpkg/Changelog/Parse.pm 765s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 765s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 765s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 765s ++ p=example 765s ++ t-git-next-date 765s ++ GIT_COMMITTER_DATE='1530000001 +0100' 765s ++ GIT_AUTHOR_DATE='1530000001 +0100' 765s + cd example 765s + git checkout upstream/2.0 765s Note: switching to 'upstream/2.0'. 765s 765s You are in 'detached HEAD' state. You can look around, make experimental 765s changes and commit them, and you can discard any commits you make in this 765s state without impacting any branches by switching back to a branch. 765s 765s If you want to create a new branch to retain commits you create, you may 765s do so (now or later) by using -c with the switch command. Example: 765s 765s git switch -c 765s 765s Or undo this operation with: 765s 765s git switch - 765s 765s Turn off this advice by setting config variable advice.detachedHead to false 765s 765s HEAD is now at 923df13 New upstream version 2.0 765s + echo '*patch*' 765s + git commit -m nasty .gitignore 765s [detached HEAD 66a3bee] nasty 765s 1 file changed, 1 insertion(+) 765s + git tag v2.1 765s + t-make-orig example 2.1 765s + local p=example 765s + local v=2.1 765s + local tag=v2.1 765s + ust=example_2.1.orig.tar.gz 765s + GZIP=-1 765s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ v2.1 765s gzip: warning: GZIP environment variable is deprecated; use an alias or script 765s + git checkout master 765s Previous HEAD position was 66a3bee nasty 765s Switched to branch 'master' 765s Your branch is up to date with 'origin/master'. 765s + t-git-debrebase new-upstream 2.1-1 765s + local gdr=git-debrebase 765s + : ' 765s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 765s + git-debrebase --dgit=dgit -D new-upstream 2.1-1 766s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 766s git-debrebase ffq check_specs * 766s git-debrebase ffq merge master 766s git-debrebase ffq check_remote origin remote fetch/merge branch 766s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 766s OK, you are ahead of refs/remotes/origin/master 766s git-debrebase ffq check_remote undef remote push branch 766s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 766s OK, you are ahead of refs/remotes/dgit/dgit/sid 766s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 766s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 766s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 766s git-debrebase = AddPatches {"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460"} 766s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 766s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 766s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 766s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 766s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 766s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 766s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 766s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 766s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 766s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Pseudomerge","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1,"Differs" => 8}],"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 766s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 766s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 766s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 766s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 766s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 766s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 766s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 766s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 766s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 766s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 766s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 766s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 766s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 766s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 766s git-debrebase WALK REWRITING NOW cl=HASH(0x558adeb6c320) procd=HASH(0x558adec2f1a0) 766s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 766s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 766s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 766s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 766s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 766s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 766s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase get_differs c981f94d196831d3684474d19d4715e74ea3e193 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 766s git-debrebase *** WALK RETURN c981f94d196831d3684474d19d4715e74ea3e193 736955cae59cd46c445b7036fa0b1b7295168fed 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 766s git-debrebase get_differs e7a23c64c8579783657d5620ec8edc2faf977627 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 766s git-debrebase classify 736955cae59cd46c445b7036fa0b1b7295168fed $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p e7a23c64c8579783657d5620ec8edc2faf977627/0x10 766s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent e7a23c64c8579783657d5620ec8edc2faf977627\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000001 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "e7a23c64c8579783657d5620ec8edc2faf977627","Differs" => 16,"Ix" => 0}],"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed"} 766s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 766s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 766s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 766s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 766s git-debrebase %pieces = {"" => {"New" => "66a3bee9268301791962706795caa60e43481066","NewIx" => 0,"Desc" => "upstream (main piece","Name" => "","Old" => "923df13cd47c1ac87a6a0646124ace159c3d8291","OldIx" => 0}} 766s git-debrebase @newpieces = [{"New" => "66a3bee9268301791962706795caa60e43481066","NewIx" => 0,"Desc" => "upstream (main piece","Name" => "","Old" => "923df13cd47c1ac87a6a0646124ace159c3d8291","OldIx" => 0}] 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s + exec env TZ=UTC faketime -f 2018-06-26 08:00:01 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 766s git-debrebase >= update refs/ffq-prev/heads/master 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 766s git-debrebase >= delete refs/debrebase-last/heads/master 766s git-debrebase >= update HEAD c981f94d196831d3684474d19d4715e74ea3e193 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 766s git-debrebase >$ 766s Recorded previous head for preservation 766s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated refs/heads/master. 766s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 766s ' 766s + t-some-changes for-rebase-fixup m 766s + local token=for-rebase-fixup 766s + local which=m 766s + local fsuffix= 766s + t-git-next-date 766s + GIT_COMMITTER_DATE='1530000002 +0100' 766s + GIT_AUTHOR_DATE='1530000002 +0100' 766s + case "$which" in 766s + case "$which" in 766s + case "$which" in 766s + for f in debian/zorkmid$fsuffix src$fsuffix.c 766s + echo '// both! for-rebase-fixup' 766s + git add debian/zorkmid 766s + for f in debian/zorkmid$fsuffix src$fsuffix.c 766s + echo '// both! for-rebase-fixup' 766s + git add src.c 766s + git commit -m 'MIXED add both() (for-rebase-fixup)' 766s [master 3c4fb30] MIXED add both() (for-rebase-fixup) 766s 2 files changed, 2 insertions(+) 766s create mode 100644 debian/zorkmid 766s + t-git-next-date 766s + GIT_COMMITTER_DATE='1530000003 +0100' 766s + GIT_AUTHOR_DATE='1530000003 +0100' 766s + t-git-debrebase 766s + local gdr=git-debrebase 766s + : ' 766s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 766s + git-debrebase --dgit=dgit -D 766s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 766s git-debrebase *** WALK 3c4fb308761081b48574025eb21080de6b315bff 0 - 766s git-debrebase get_differs 7026a179a64f8ae7cf301921336102fc8605a601 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x22 766s git-debrebase classify 3c4fb308761081b48574025eb21080de6b315bff $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p 7026a179a64f8ae7cf301921336102fc8605a601/0x22 766s git-debrebase = Mixed {"Type" => "Mixed","CommitId" => "3c4fb308761081b48574025eb21080de6b315bff","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent 7026a179a64f8ae7cf301921336102fc8605a601\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Parents" => [{"CommitId" => "7026a179a64f8ae7cf301921336102fc8605a601","Differs" => 34,"Ix" => 0}],"Msg" => "MIXED add both() (for-rebase-fixup)\n"} 766s git-debrebase get_differs d40d8adb917009b4f608a9c8f81d879536e8a2d5 2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8 = 0x2 766s git-debrebase classify 7026a179a64f8ae7cf301921336102fc8605a601 $t=2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8 @p d40d8adb917009b4f608a9c8f81d879536e8a2d5/0x2 766s git-debrebase = Upstream {"Tree" => "2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8","Parents" => [{"CommitId" => "d40d8adb917009b4f608a9c8f81d879536e8a2d5","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "7026a179a64f8ae7cf301921336102fc8605a601","Hdr" => "tree 2c6bfde4fa70fb70cf7d8c48e62bb87ec21644c8\nparent d40d8adb917009b4f608a9c8f81d879536e8a2d5\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 766s git-debrebase get_differs c998764c1f7bd541b7d37d3e0fd281b795346e6b ef515927ce165a7fa9c35da9dfce7abb49b196a2 = 0x2 766s git-debrebase classify d40d8adb917009b4f608a9c8f81d879536e8a2d5 $t=ef515927ce165a7fa9c35da9dfce7abb49b196a2 @p c998764c1f7bd541b7d37d3e0fd281b795346e6b/0x2 766s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "c998764c1f7bd541b7d37d3e0fd281b795346e6b","Differs" => 2}],"Tree" => "ef515927ce165a7fa9c35da9dfce7abb49b196a2","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "d40d8adb917009b4f608a9c8f81d879536e8a2d5","Hdr" => "tree ef515927ce165a7fa9c35da9dfce7abb49b196a2\nparent c998764c1f7bd541b7d37d3e0fd281b795346e6b\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000001 +0100\n"} 766s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 1df30fcfe5acff108db66d6a1d9d47227254112a = 0x2 766s git-debrebase classify c998764c1f7bd541b7d37d3e0fd281b795346e6b $t=1df30fcfe5acff108db66d6a1d9d47227254112a @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x2 766s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 1df30fcfe5acff108db66d6a1d9d47227254112a\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000001 +0100\n","CommitId" => "c998764c1f7bd541b7d37d3e0fd281b795346e6b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "1df30fcfe5acff108db66d6a1d9d47227254112a","Parents" => [{"Differs" => 2,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0}]} 766s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 766s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 766s git-debrebase = Changelog {"Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Parents" => [{"Differs" => 16,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Ix" => 0}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 766s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 766s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 766s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 766s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","OrigParents" => [{"Differs" => 48,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1}],"Parents" => [{"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 766s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 2 upp 3 proc 6 pm -1 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 7 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 766s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 766s git-debrebase WALK BUILD 3c4fb308761081b48574025eb21080de6b315bff Debian (rewriting=1) 766s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 766s git-debrebase WALK BUILD c998764c1f7bd541b7d37d3e0fd281b795346e6b Upstream (rewriting=1) 766s git-debrebase WALK BUILD d40d8adb917009b4f608a9c8f81d879536e8a2d5 Upstream (rewriting=1) 766s git-debrebase WALK BUILD 7026a179a64f8ae7cf301921336102fc8605a601 Upstream (rewriting=1) 766s git-debrebase WALK BUILD 3c4fb308761081b48574025eb21080de6b315bff Upstream (rewriting=1) 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 3c4fb308761081b48574025eb21080de6b315bff = 0 766s git-debrebase *** WALK RETURN 67cc2f6910203251700f5a04554015fe0808a21e fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 55b85aaf02da2acb5564598e075601e76e1f096a 766s git-debrebase: laundered (head was 3c4fb308761081b48574025eb21080de6b315bff) 766s git-debrebase >= update HEAD 67cc2f6910203251700f5a04554015fe0808a21e 3c4fb308761081b48574025eb21080de6b315bff 766s git-debrebase >$ 766s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 766s ' 766s + t-git-debrebase make-patches 766s + local gdr=git-debrebase 766s + : ' 766s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 766s + git-debrebase --dgit=dgit -D make-patches 766s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 766s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 766s git-debrebase = Upstream {"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"}],"CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Type" => "Upstream","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 766s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 766s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 766s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Type" => "Upstream","Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc","Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 766s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 766s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 766s git-debrebase = Upstream {"Tree" => "38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f","Hdr" => "tree 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f\nparent 6426d659953f1cf078320b9d3c181128b66a51bb\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb"}],"Type" => "Upstream"} 766s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 766s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 766s git-debrebase = Upstream {"Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","Type" => "Upstream","CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Parents" => [{"Differs" => 2,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 766s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 766s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 766s git-debrebase = Packaging {"Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0}],"Type" => "Packaging"} 766s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 766s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 766s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Ix" => 0,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Differs" => 16}],"Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7"} 766s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 766s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 766s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 766s git-debrebase = Anchor {"Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2},{"Ix" => 1,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Differs" => 48}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"} 766s git-debrebase *** WALK 67cc2f6910203251700f5a04554015fe0808a21e 0 - 766s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 766s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 766s git-debrebase = Upstream {"CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Ix" => 0}],"Type" => "Upstream","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 766s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 766s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 766s git-debrebase = Upstream {"Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc","Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2}],"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d","Type" => "Upstream"} 766s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 766s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 766s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Differs" => 2}],"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Hdr" => "tree 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f\nparent 6426d659953f1cf078320b9d3c181128b66a51bb\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f"} 766s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 766s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 766s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Ix" => 0,"Differs" => 2}],"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Type" => "Upstream","Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 766s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 766s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 766s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Differs" => 32}],"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Type" => "Packaging","Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 766s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 766s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 766s git-debrebase = Changelog {"Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Type" => "Changelog","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"}]} 766s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 766s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 766s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 766s git-debrebase = Anchor {"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Differs" => 48}],"Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","Parents" => [{"Ix" => 0,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 766s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 1 upp 3 proc 6 pm -1 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 7 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 766s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 766s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 766s git-debrebase WALK BUILD 6426d659953f1cf078320b9d3c181128b66a51bb Upstream (rewriting=0) 766s git-debrebase WALK BUILD 33a23c45372305e980739fe289730e8d4f0d4b63 Upstream (rewriting=0) 766s git-debrebase WALK BUILD ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d Upstream (rewriting=0) 766s git-debrebase WALK BUILD 67cc2f6910203251700f5a04554015fe0808a21e Upstream (rewriting=0) 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 67cc2f6910203251700f5a04554015fe0808a21e = 0 766s git-debrebase *** WALK RETURN 67cc2f6910203251700f5a04554015fe0808a21e fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 55b85aaf02da2acb5564598e075601e76e1f096a 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase gbp_pq_export bw fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 67cc2f6910203251700f5a04554015fe0808a21e 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 766s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 766s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e 34bb7122396cdd1dbc3000174b14028b2758d938 = 0x4 766s git-debrebase >= update HEAD 34bb7122396cdd1dbc3000174b14028b2758d938 67cc2f6910203251700f5a04554015fe0808a21e 766s git-debrebase >$ 766s HEAD is now at 34bb712 Commit patch queue (exported by git-debrebase) 766s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 766s ' 766s + t-some-changes for-dgit-fixup m 766s + local token=for-dgit-fixup 766s + local which=m 766s + local fsuffix= 766s + t-git-next-date 766s + GIT_COMMITTER_DATE='1530000004 +0100' 766s + GIT_AUTHOR_DATE='1530000004 +0100' 766s + case "$which" in 766s + case "$which" in 766s + case "$which" in 766s + for f in debian/zorkmid$fsuffix src$fsuffix.c 766s + echo '// both! for-dgit-fixup' 766s + git add debian/zorkmid 766s + for f in debian/zorkmid$fsuffix src$fsuffix.c 766s + echo '// both! for-dgit-fixup' 766s + git add src.c 766s + git commit -m 'MIXED add both() (for-dgit-fixup)' 766s [master 03926ad] MIXED add both() (for-dgit-fixup) 766s 2 files changed, 2 insertions(+) 766s + t-git-next-date 766s + GIT_COMMITTER_DATE='1530000005 +0100' 766s + GIT_AUTHOR_DATE='1530000005 +0100' 766s + t-git-debrebase 766s + local gdr=git-debrebase 766s + : ' 766s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 766s + git-debrebase --dgit=dgit -D 767s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 767s git-debrebase *** WALK 03926ad98fcfff78133f5cf8dc9e723de1783664 0 - 767s git-debrebase get_differs 34bb7122396cdd1dbc3000174b14028b2758d938 2eb0f91a3f785139ca5fdd9488f3c1f44326793a = 0x22 767s git-debrebase classify 03926ad98fcfff78133f5cf8dc9e723de1783664 $t=2eb0f91a3f785139ca5fdd9488f3c1f44326793a @p 34bb7122396cdd1dbc3000174b14028b2758d938/0x22 767s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "34bb7122396cdd1dbc3000174b14028b2758d938"}],"Hdr" => "tree 2eb0f91a3f785139ca5fdd9488f3c1f44326793a\nparent 34bb7122396cdd1dbc3000174b14028b2758d938\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","CommitId" => "03926ad98fcfff78133f5cf8dc9e723de1783664","Msg" => "MIXED add both() (for-dgit-fixup)\n","Type" => "Mixed","Tree" => "2eb0f91a3f785139ca5fdd9488f3c1f44326793a"} 767s git-debrebase get_differs 67cc2f6910203251700f5a04554015fe0808a21e e68d180a6c85ad1a15f82dbdaa079ff37bc07534 = 0x4 767s git-debrebase classify 34bb7122396cdd1dbc3000174b14028b2758d938 $t=e68d180a6c85ad1a15f82dbdaa079ff37bc07534 @p 67cc2f6910203251700f5a04554015fe0808a21e/0x4 767s git-debrebase = AddPatches {"CommitId" => "34bb7122396cdd1dbc3000174b14028b2758d938","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Type" => "AddPatches","Tree" => "e68d180a6c85ad1a15f82dbdaa079ff37bc07534","Parents" => [{"Differs" => 4,"CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Ix" => 0}],"Hdr" => "tree e68d180a6c85ad1a15f82dbdaa079ff37bc07534\nparent 67cc2f6910203251700f5a04554015fe0808a21e\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 767s git-debrebase get_differs ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d 7cf3ee3de12fb7b094accb12c58d7bdaf460f032 = 0x2 767s git-debrebase classify 67cc2f6910203251700f5a04554015fe0808a21e $t=7cf3ee3de12fb7b094accb12c58d7bdaf460f032 @p ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d/0x2 767s git-debrebase = Upstream {"Hdr" => "tree 7cf3ee3de12fb7b094accb12c58d7bdaf460f032\nparent ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"}],"Type" => "Upstream","Tree" => "7cf3ee3de12fb7b094accb12c58d7bdaf460f032","CommitId" => "67cc2f6910203251700f5a04554015fe0808a21e","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 767s git-debrebase get_differs 33a23c45372305e980739fe289730e8d4f0d4b63 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc = 0x2 767s git-debrebase classify ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d $t=3d990f67695fb7b47ddbfa34dae4e83918bc5cfc @p 33a23c45372305e980739fe289730e8d4f0d4b63/0x2 767s git-debrebase = Upstream {"Hdr" => "tree 3d990f67695fb7b47ddbfa34dae4e83918bc5cfc\nparent 33a23c45372305e980739fe289730e8d4f0d4b63\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Differs" => 2,"Ix" => 0}],"Tree" => "3d990f67695fb7b47ddbfa34dae4e83918bc5cfc","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d"} 767s git-debrebase get_differs 6426d659953f1cf078320b9d3c181128b66a51bb 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f = 0x2 767s git-debrebase classify 33a23c45372305e980739fe289730e8d4f0d4b63 $t=38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f @p 6426d659953f1cf078320b9d3c181128b66a51bb/0x2 767s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f","CommitId" => "33a23c45372305e980739fe289730e8d4f0d4b63","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 38add5d30a2a57b1e9d74ffa5971ae40a38a9a8f\nparent 6426d659953f1cf078320b9d3c181128b66a51bb\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Ix" => 0}]} 767s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 6cbd7e7202b3320e517741fb4b0ff137bc1aa178 = 0x2 767s git-debrebase classify 6426d659953f1cf078320b9d3c181128b66a51bb $t=6cbd7e7202b3320e517741fb4b0ff137bc1aa178 @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x2 767s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6cbd7e7202b3320e517741fb4b0ff137bc1aa178","CommitId" => "6426d659953f1cf078320b9d3c181128b66a51bb","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 6cbd7e7202b3320e517741fb4b0ff137bc1aa178\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Differs" => 2,"Ix" => 0}]} 767s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 767s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 767s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0}],"Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2"} 767s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 767s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 767s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Ix" => 0}]} 767s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 767s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 767s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 767s git-debrebase = Anchor {"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","Type" => "Anchor","Parents" => [{"Ix" => 0,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Differs" => 2},{"Ix" => 1,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n"} 767s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 3 upp 5 proc 10 pm -1 767s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 767s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 767s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 11 767s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 767s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 767s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 767s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 767s git-debrebase WALK BUILD 03926ad98fcfff78133f5cf8dc9e723de1783664 Debian (rewriting=1) 767s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 767s git-debrebase WALK BUILD 6426d659953f1cf078320b9d3c181128b66a51bb Upstream (rewriting=1) 767s git-debrebase WALK BUILD 33a23c45372305e980739fe289730e8d4f0d4b63 Upstream (rewriting=1) 767s git-debrebase WALK BUILD ef5ee68c5a1ed19f0ad5ebf654a463e7898e7f5d Upstream (rewriting=1) 767s git-debrebase WALK BUILD 67cc2f6910203251700f5a04554015fe0808a21e Upstream (rewriting=1) 767s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 767s git-debrebase WALK BUILD 03926ad98fcfff78133f5cf8dc9e723de1783664 Upstream (rewriting=1) 767s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 767s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f 03926ad98fcfff78133f5cf8dc9e723de1783664 = 0x4 767s git-debrebase *** WALK RETURN 4d81e614bbd890e3b1a5980111084fc69e55267f 3e8e1c982b31f3cec79728c564089c589983abca 55b85aaf02da2acb5564598e075601e76e1f096a 767s git-debrebase: laundered (head was 03926ad98fcfff78133f5cf8dc9e723de1783664) 767s git-debrebase >= update HEAD 4d81e614bbd890e3b1a5980111084fc69e55267f 03926ad98fcfff78133f5cf8dc9e723de1783664 767s git-debrebase >$ 767s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 767s ' 767s + t-expect-fail 'dgit: failed command: false' t-dgit -wgf --git-debrebase=false quilt-fixup 767s + local 'mpat=dgit: failed command: false' 767s + shift 767s + set +o pipefail 767s + LC_MESSAGES=C 767s + LANGUAGE=C 767s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 767s + t-dgit -wgf --git-debrebase=false quilt-fixup 767s + local dgit=dgit 767s + pwd 767s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 767s + : ' 767s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 767s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --git-debrebase=false quilt-fixup 767s | git rev-parse --show-toplevel 767s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 767s | git config -z --get-regexp --local '.*' 767s | git config -z --get-regexp --local '.*' 767s | git config -z --get-regexp --global '.*' 767s | git config -z --get-regexp --system '.*' 767s format 3.0 (quilt), quilt mode linear 767s Format `3.0 (quilt)', need to check/update patch stack 767s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 767s => `' 767s + git diff --quiet HEAD 767s + git clean -xdff 767s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 767s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 767s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 767s | git rev-parse 'HEAD~0' 767s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 767s | git symbolic-ref -q HEAD 767s => `refs/heads/master' 767s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 767s CD work 767s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 767s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 767s examining quilt state (multiple patches, linear mode) 767s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 767s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 767s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 767s + false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 767s dgit: failed command: false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 767s 767s dgit: error: subprocess failed with error exit status 1 767s + local 'ps=255 0' 767s + set -o pipefail 767s + case $ps in 767s + t-grep-mpat 'dgit: failed command: false' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 767s + local 'mpat=dgit: failed command: false' 767s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 767s + local grepper=fgrep 767s + case "$mpat" in 767s + fgrep -e 'dgit: failed command: false' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 767s dgit: failed command: false --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 767s + git branch before-gdr-true 767s + t-dgit -wgf --git-debrebase=true quilt-fixup 767s + local dgit=dgit 767s + pwd 767s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 767s + : ' 767s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 767s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --git-debrebase=true quilt-fixup 767s | git rev-parse --show-toplevel 767s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 767s | git config -z --get-regexp --local '.*' 767s | git config -z --get-regexp --local '.*' 767s | git config -z --get-regexp --global '.*' 767s | git config -z --get-regexp --system '.*' 767s format 3.0 (quilt), quilt mode linear 767s Format `3.0 (quilt)', need to check/update patch stack 767s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 767s => `' 767s + git diff --quiet HEAD 767s + git clean -xdff 767s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 767s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 767s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 767s | git rev-parse 'HEAD~0' 767s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 767s | git symbolic-ref -q HEAD 767s => `refs/heads/master' 767s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 767s CD work 767s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 767s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 767s examining quilt state (multiple patches, linear mode) 767s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 767s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 767s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 767s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 767s | git rev-parse 'HEAD~0' 767s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 767s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 767s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 767s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 767s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 767s CD fake 767s | find -name .git -prune -print0 767s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 767s + git checkout -f 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian 767s + git add -Af . 767s | git write-tree 767s => `806249de73c443c056dbc6bfd7603063e6e3742f' 767s fake orig tree object 806249de73c443c056dbc6bfd7603063e6e3742f 767s CD .. 767s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 767s CD ../fake 767s + git add -Af . 767s | git write-tree 767s => `806249de73c443c056dbc6bfd7603063e6e3742f' 767s fake o+d/p tree object 806249de73c443c056dbc6bfd7603063e6e3742f 767s CD ../work 767s | git ls-tree --name-only -z 4d81e614bbd890e3b1a5980111084fc69e55267f 767s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 767s | git diff-tree -z --no-renames -r 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f 767s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 17d76a67ffca013d4bde2dac97139bf740637026 M\x00src.c\x00' 767s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 767s | git diff-tree -z --no-renames --name-only -r 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `lib.c\x00new-upstream-file\x00src.c\x00' 767s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git diff-tree -z --no-renames --name-only -r 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `' 767s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f => 0 767s differences @dl ## == ## == == ==. 767s dgit: base trees orig=806249de73c443c056db o+d/p=806249de73c443c056db 767s dgit: quilt differences: src: ## orig == gitignores: == orig == 767s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 767s starting quiltify (multiple patches, linear mode) 767s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 767s => `debian/control'... 767s quiltify investigate 4d81e614bbd890e3b1a5980111084fc69e55267f 767s | git diff-tree -z --no-renames --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `lib.c\x00new-upstream-file\x00src.c\x00' 767s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 767s => `debian/control'... 767s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 767s => `tree ec947983291f86b8f616e416943e998079851ca2'... 767s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f 767s => `src.c\x00' 767s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 767s considering C=4d81e614bbd890e3b1a5980111084fc69e55267f P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 767s | git diff-tree -r --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/patches .pc debian/source/format 767s => `' 767s search queue P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 NT 767s quiltify investigate 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 767s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `lib.c\x00new-upstream-file\x00src.c\x00' 767s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git ls-tree --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/rules debian/control 767s => `debian/control'... 767s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 767s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 767s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 767s => `src.c\x00' 767s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 => 1 767s considering C=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 P=97043ef068d57a7c42b6c059654a76088d551621 767s | git diff-tree -r --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/patches .pc debian/source/format 767s => `' 767s search queue P=97043ef068d57a7c42b6c059654a76088d551621 NT 767s quiltify investigate 97043ef068d57a7c42b6c059654a76088d551621 767s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `lib.c\x00new-upstream-file\x00src.c\x00' 767s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git ls-tree --name-only 97043ef068d57a7c42b6c059654a76088d551621 -- debian/rules debian/control 767s => `debian/control'... 767s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 767s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 767s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 767s => `lib.c\x00' 767s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 => 1 767s considering C=97043ef068d57a7c42b6c059654a76088d551621 P=66a8793ffe06ab8d25c6655e49e36725002677dd 767s | git diff-tree -r --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 -- debian/patches .pc debian/source/format 767s => `' 767s search queue P=66a8793ffe06ab8d25c6655e49e36725002677dd NT 767s quiltify investigate 66a8793ffe06ab8d25c6655e49e36725002677dd 767s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `new-upstream-file\x00src.c\x00' 767s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git ls-tree --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/rules debian/control 767s => `debian/control'... 767s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 767s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 767s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd 767s => `src.c\x00' 767s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd => 1 767s considering C=66a8793ffe06ab8d25c6655e49e36725002677dd P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s | git diff-tree -r --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/patches .pc debian/source/format 767s => `' 767s search queue P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 NT 767s quiltify investigate 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `new-upstream-file\x00' 767s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f => 1 767s | git ls-tree --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/rules debian/control 767s => `debian/control'... 767s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 767s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s => `new-upstream-file\x00' 767s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 => 1 767s considering C=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 P=3e8e1c982b31f3cec79728c564089c589983abca 767s | git diff-tree -r --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/patches .pc debian/source/format 767s => `' 767s search queue P=3e8e1c982b31f3cec79728c564089c589983abca NT 767s quiltify investigate 3e8e1c982b31f3cec79728c564089c589983abca 767s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f 767s => `' 767s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f => 0 767s search finished hooray! 767s quiltify linearisation planning successful, executing... 767s quiltify traverse 3e8e1c982b31f3cec79728c564089c589983abca..51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 767s | git log -n1 '--pretty=format:%aD' 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s => `Sun, 6 Dec 2015 23:50:08 +0000' 767s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 767s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 767s | realpath -- /usr/bin/dgit 767s => `/usr/bin/dgit' 767s | realpath -- .git/dgit/quilt-description.tmp 767s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 767s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 767s dpkg-source: info: local changes detected, the modified files are: 767s work/new-upstream-file 768s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 768s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 debian/changelog 768s quiltify traverse 51be2304ce8579a3bbc67e06b4c7b8daf95d5008..66a8793ffe06ab8d25c6655e49e36725002677dd 768s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 768s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 768s | git log -n1 '--pretty=format:%aD' 66a8793ffe06ab8d25c6655e49e36725002677dd 768s => `Sun, 6 Dec 2015 23:50:39 +0000' 768s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd 768s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 768s | realpath -- /usr/bin/dgit 768s => `/usr/bin/dgit' 768s | realpath -- .git/dgit/quilt-description.tmp 768s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 768s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 768s dpkg-source: info: using patch list from debian/patches/series 768s dpkg-source: info: local changes detected, the modified files are: 768s work/src.c 768s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 768s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd debian/changelog 768s quiltify traverse 66a8793ffe06ab8d25c6655e49e36725002677dd..97043ef068d57a7c42b6c059654a76088d551621 768s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 768s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 768s | git log -n1 '--pretty=format:%aD' 97043ef068d57a7c42b6c059654a76088d551621 768s => `Sat, 4 Jun 2016 22:09:32 +0100' 768s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 768s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 768s | realpath -- /usr/bin/dgit 768s => `/usr/bin/dgit' 768s | realpath -- .git/dgit/quilt-description.tmp 768s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 768s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 768s dpkg-source: info: using patch list from debian/patches/series 768s dpkg-source: info: local changes detected, the modified files are: 768s work/lib.c 768s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 768s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 debian/changelog 768s quiltify traverse 97043ef068d57a7c42b6c059654a76088d551621..8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 768s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 768s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 768s | git log -n1 '--pretty=format:%aD' 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 768s => `Tue, 26 Jun 2018 09:00:02 +0100' 768s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 768s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 768s | realpath -- /usr/bin/dgit 768s => `/usr/bin/dgit' 768s | realpath -- .git/dgit/quilt-description.tmp 768s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 768s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-rebase-fixup.patch 768s dpkg-source: info: using patch list from debian/patches/series 768s dpkg-source: info: local changes detected, the modified files are: 768s work/src.c 768s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-rebase-fixup.patch 768s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 debian/changelog 768s quiltify traverse 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6..4d81e614bbd890e3b1a5980111084fc69e55267f 768s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 768s => `tree ec947983291f86b8f616e416943e998079851ca2'... 768s | git log -n1 '--pretty=format:%aD' 4d81e614bbd890e3b1a5980111084fc69e55267f 768s => `Tue, 26 Jun 2018 09:00:04 +0100' 768s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f 768s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 768s | realpath -- /usr/bin/dgit 768s => `/usr/bin/dgit' 768s | realpath -- .git/dgit/quilt-description.tmp 768s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 768s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-dgit-fixup.patch 769s dpkg-source: info: using patch list from debian/patches/series 769s dpkg-source: info: local changes detected, the modified files are: 769s work/src.c 769s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-dgit-fixup.patch 769s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 769s + git checkout -q master 769s | git status --ignored --porcelain 769s => `?? .pc/'... 769s + git add -f debian/patches 769s Commit Debian 3.0 (quilt) metadata 769s 769s [dgit (9.15) quilt-fixup] 769s 769s + git commit -m 'Commit Debian 3.0 (quilt) metadata 769s 769s [dgit (9.15) quilt-fixup] 769s ' 769s [master 94e3b9c] Commit Debian 3.0 (quilt) metadata 769s 6 files changed, 71 insertions(+) 769s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 769s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 769s create mode 100644 debian/patches/mixed-add-both-for-dgit-fixup.patch 769s create mode 100644 debian/patches/mixed-add-both-for-rebase-fixup.patch 769s create mode 100644 debian/patches/series 769s create mode 100644 debian/patches/subdir/addnewups 769s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 769s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 769s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 769s ' 769s + git reset --hard before-gdr-true 769s HEAD is now at 4d81e61 MIXED add both() (for-dgit-fixup) 769s + t-dgit -wgf --git-debrebase=no-such-command-exists quilt-fixup 769s + local dgit=dgit 769s + pwd 769s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 769s + : ' 769s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 769s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --git-debrebase=no-such-command-exists quilt-fixup 769s | git rev-parse --show-toplevel 769s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 769s | git config -z --get-regexp --local '.*' 769s | git config -z --get-regexp --local '.*' 769s | git config -z --get-regexp --global '.*' 769s | git config -z --get-regexp --system '.*' 769s format 3.0 (quilt), quilt mode linear 769s Format `3.0 (quilt)', need to check/update patch stack 769s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 769s => `' 769s + git diff --quiet HEAD 769s + git clean -xdff 769s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 769s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 769s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 769s | git rev-parse 'HEAD~0' 769s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 769s | git symbolic-ref -q HEAD 769s => `refs/heads/master' 769s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 769s CD work 769s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 769s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 769s examining quilt state (multiple patches, linear mode) 769s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f... 769s branch_is_gdr 941a4216b7ef2f3fdf421e01923431465e26009c gdr changelog YES 769s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 769s + no-such-command-exists --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 769s | git rev-parse 'HEAD~0' 769s => `4d81e614bbd890e3b1a5980111084fc69e55267f' 769s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 769s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 769s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 769s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 769s CD fake 769s | find -name .git -prune -print0 769s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 769s + git checkout -f 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian 769s + git add -Af . 769s | git write-tree 769s => `806249de73c443c056dbc6bfd7603063e6e3742f' 769s fake orig tree object 806249de73c443c056dbc6bfd7603063e6e3742f 769s CD .. 769s + git reset -q --hard 4d81e614bbd890e3b1a5980111084fc69e55267f 769s CD ../fake 769s + git add -Af . 769s | git write-tree 769s => `806249de73c443c056dbc6bfd7603063e6e3742f' 769s fake o+d/p tree object 806249de73c443c056dbc6bfd7603063e6e3742f 769s CD ../work 769s | git ls-tree --name-only -z 4d81e614bbd890e3b1a5980111084fc69e55267f 769s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 769s | git diff-tree -z --no-renames -r 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f 769s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 17d76a67ffca013d4bde2dac97139bf740637026 M\x00src.c\x00' 769s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 769s | git diff-tree -z --no-renames --name-only -r 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `lib.c\x00new-upstream-file\x00src.c\x00' 769s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git diff-tree -z --no-renames --name-only -r 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `' 769s quiltify_trees_differ 806249de73c443c056dbc6bfd7603063e6e3742f 806249de73c443c056dbc6bfd7603063e6e3742f => 0 769s differences @dl ## == ## == == ==. 769s dgit: base trees orig=806249de73c443c056db o+d/p=806249de73c443c056db 769s dgit: quilt differences: src: ## orig == gitignores: == orig == 769s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 769s starting quiltify (multiple patches, linear mode) 769s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 769s => `debian/control'... 769s quiltify investigate 4d81e614bbd890e3b1a5980111084fc69e55267f 769s | git diff-tree -z --no-renames --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `lib.c\x00new-upstream-file\x00src.c\x00' 769s quiltify_trees_differ 4d81e614bbd890e3b1a5980111084fc69e55267f 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git ls-tree --name-only 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/rules debian/control 769s => `debian/control'... 769s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 769s => `tree ec947983291f86b8f616e416943e998079851ca2'... 769s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f 769s => `src.c\x00' 769s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f => 1 769s considering C=4d81e614bbd890e3b1a5980111084fc69e55267f P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 769s | git diff-tree -r --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 4d81e614bbd890e3b1a5980111084fc69e55267f -- debian/patches .pc debian/source/format 769s => `' 769s search queue P=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 NT 769s quiltify investigate 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 769s | git diff-tree -z --no-renames --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `lib.c\x00new-upstream-file\x00src.c\x00' 769s quiltify_trees_differ 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git ls-tree --name-only 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/rules debian/control 769s => `debian/control'... 769s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 769s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 769s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 769s => `src.c\x00' 769s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 => 1 769s considering C=8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 P=97043ef068d57a7c42b6c059654a76088d551621 769s | git diff-tree -r --name-only 97043ef068d57a7c42b6c059654a76088d551621 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 -- debian/patches .pc debian/source/format 769s => `' 769s search queue P=97043ef068d57a7c42b6c059654a76088d551621 NT 769s quiltify investigate 97043ef068d57a7c42b6c059654a76088d551621 769s | git diff-tree -z --no-renames --name-only 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `lib.c\x00new-upstream-file\x00src.c\x00' 769s quiltify_trees_differ 97043ef068d57a7c42b6c059654a76088d551621 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git ls-tree --name-only 97043ef068d57a7c42b6c059654a76088d551621 -- debian/rules debian/control 769s => `debian/control'... 769s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 769s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 769s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 769s => `lib.c\x00' 769s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 => 1 769s considering C=97043ef068d57a7c42b6c059654a76088d551621 P=66a8793ffe06ab8d25c6655e49e36725002677dd 769s | git diff-tree -r --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 97043ef068d57a7c42b6c059654a76088d551621 -- debian/patches .pc debian/source/format 769s => `' 769s search queue P=66a8793ffe06ab8d25c6655e49e36725002677dd NT 769s quiltify investigate 66a8793ffe06ab8d25c6655e49e36725002677dd 769s | git diff-tree -z --no-renames --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `new-upstream-file\x00src.c\x00' 769s quiltify_trees_differ 66a8793ffe06ab8d25c6655e49e36725002677dd 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git ls-tree --name-only 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/rules debian/control 769s => `debian/control'... 769s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 769s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 769s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd 769s => `src.c\x00' 769s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd => 1 769s considering C=66a8793ffe06ab8d25c6655e49e36725002677dd P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s | git diff-tree -r --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 66a8793ffe06ab8d25c6655e49e36725002677dd -- debian/patches .pc debian/source/format 769s => `' 769s search queue P=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 NT 769s quiltify investigate 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s | git diff-tree -z --no-renames --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `new-upstream-file\x00' 769s quiltify_trees_differ 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 806249de73c443c056dbc6bfd7603063e6e3742f => 1 769s | git ls-tree --name-only 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/rules debian/control 769s => `debian/control'... 769s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 769s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s => `new-upstream-file\x00' 769s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 => 1 769s considering C=51be2304ce8579a3bbc67e06b4c7b8daf95d5008 P=3e8e1c982b31f3cec79728c564089c589983abca 769s | git diff-tree -r --name-only 3e8e1c982b31f3cec79728c564089c589983abca 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 -- debian/patches .pc debian/source/format 769s => `' 769s search queue P=3e8e1c982b31f3cec79728c564089c589983abca NT 769s quiltify investigate 3e8e1c982b31f3cec79728c564089c589983abca 769s | git diff-tree -z --no-renames --name-only 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f 769s => `' 769s quiltify_trees_differ 3e8e1c982b31f3cec79728c564089c589983abca 806249de73c443c056dbc6bfd7603063e6e3742f => 0 769s search finished hooray! 769s quiltify linearisation planning successful, executing... 769s quiltify traverse 3e8e1c982b31f3cec79728c564089c589983abca..51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s | git cat-file commit 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s => `tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7'... 769s | git log -n1 '--pretty=format:%aD' 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s => `Sun, 6 Dec 2015 23:50:08 +0000' 769s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 769s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 769s | realpath -- /usr/bin/dgit 769s => `/usr/bin/dgit' 769s | realpath -- .git/dgit/quilt-description.tmp 769s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 769s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 769s dpkg-source: info: local changes detected, the modified files are: 769s work/new-upstream-file 769s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 769s + git checkout -q 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 debian/changelog 769s quiltify traverse 51be2304ce8579a3bbc67e06b4c7b8daf95d5008..66a8793ffe06ab8d25c6655e49e36725002677dd 769s | git cat-file commit 66a8793ffe06ab8d25c6655e49e36725002677dd 769s => `tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1'... 769s | git log -n1 '--pretty=format:%aD' 66a8793ffe06ab8d25c6655e49e36725002677dd 769s => `Sun, 6 Dec 2015 23:50:39 +0000' 769s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd 769s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 769s | realpath -- /usr/bin/dgit 769s => `/usr/bin/dgit' 769s | realpath -- .git/dgit/quilt-description.tmp 769s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 769s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 770s dpkg-source: info: using patch list from debian/patches/series 770s dpkg-source: info: local changes detected, the modified files are: 770s work/src.c 770s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 770s + git checkout -q 66a8793ffe06ab8d25c6655e49e36725002677dd debian/changelog 770s quiltify traverse 66a8793ffe06ab8d25c6655e49e36725002677dd..97043ef068d57a7c42b6c059654a76088d551621 770s | git cat-file commit 97043ef068d57a7c42b6c059654a76088d551621 770s => `tree 3a2cc385adda38871a475f84fd58599a02a2452b'... 770s | git log -n1 '--pretty=format:%aD' 97043ef068d57a7c42b6c059654a76088d551621 770s => `Sat, 4 Jun 2016 22:09:32 +0100' 770s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 770s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 770s | realpath -- /usr/bin/dgit 770s => `/usr/bin/dgit' 770s | realpath -- .git/dgit/quilt-description.tmp 770s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 770s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 770s dpkg-source: info: using patch list from debian/patches/series 770s dpkg-source: info: local changes detected, the modified files are: 770s work/lib.c 770s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 770s + git checkout -q 97043ef068d57a7c42b6c059654a76088d551621 debian/changelog 770s quiltify traverse 97043ef068d57a7c42b6c059654a76088d551621..8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 770s | git cat-file commit 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 770s => `tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529'... 770s | git log -n1 '--pretty=format:%aD' 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 770s => `Tue, 26 Jun 2018 09:00:02 +0100' 770s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 770s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 770s | realpath -- /usr/bin/dgit 770s => `/usr/bin/dgit' 770s | realpath -- .git/dgit/quilt-description.tmp 770s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 770s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-rebase-fixup.patch 770s dpkg-source: info: using patch list from debian/patches/series 770s dpkg-source: info: local changes detected, the modified files are: 770s work/src.c 770s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-rebase-fixup.patch 770s + git checkout -q 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 debian/changelog 770s quiltify traverse 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6..4d81e614bbd890e3b1a5980111084fc69e55267f 770s | git cat-file commit 4d81e614bbd890e3b1a5980111084fc69e55267f 770s => `tree ec947983291f86b8f616e416943e998079851ca2'... 770s | git log -n1 '--pretty=format:%aD' 4d81e614bbd890e3b1a5980111084fc69e55267f 770s => `Tue, 26 Jun 2018 09:00:04 +0100' 770s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f 770s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 770s | realpath -- /usr/bin/dgit 770s => `/usr/bin/dgit' 770s | realpath -- .git/dgit/quilt-description.tmp 770s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 770s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-dgit-fixup.patch 770s dpkg-source: info: using patch list from debian/patches/series 770s dpkg-source: info: local changes detected, the modified files are: 770s work/src.c 771s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-dgit-fixup.patch 771s + git checkout -q 4d81e614bbd890e3b1a5980111084fc69e55267f debian/changelog 771s + git checkout -q master 771s | git status --ignored --porcelain 771s => `?? .pc/'... 771s + git add -f debian/patches 771s Commit Debian 3.0 (quilt) metadata 771s 771s [dgit (9.15) quilt-fixup] 771s 771s + git commit -m 'Commit Debian 3.0 (quilt) metadata 771s 771s [dgit (9.15) quilt-fixup] 771s ' 771s [master 94e3b9c] Commit Debian 3.0 (quilt) metadata 771s 6 files changed, 71 insertions(+) 771s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 771s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 771s create mode 100644 debian/patches/mixed-add-both-for-dgit-fixup.patch 771s create mode 100644 debian/patches/mixed-add-both-for-rebase-fixup.patch 771s create mode 100644 debian/patches/series 771s create mode 100644 debian/patches/subdir/addnewups 771s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 771s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 771s ' 771s + t-some-changes for-make-patches-fails-then-dgit-fixup m 771s + local token=for-make-patches-fails-then-dgit-fixup 771s + local which=m 771s + local fsuffix= 771s + t-git-next-date 771s + GIT_COMMITTER_DATE='1530000006 +0100' 771s + GIT_AUTHOR_DATE='1530000006 +0100' 771s + case "$which" in 771s + case "$which" in 771s + case "$which" in 771s + for f in debian/zorkmid$fsuffix src$fsuffix.c 771s + echo '// both! for-make-patches-fails-then-dgit-fixup' 771s + git add debian/zorkmid 771s + for f in debian/zorkmid$fsuffix src$fsuffix.c 771s + echo '// both! for-make-patches-fails-then-dgit-fixup' 771s + git add src.c 771s + git commit -m 'MIXED add both() (for-make-patches-fails-then-dgit-fixup)' 771s [master 362e4af] MIXED add both() (for-make-patches-fails-then-dgit-fixup) 771s 2 files changed, 2 insertions(+) 771s + t-git-next-date 771s + GIT_COMMITTER_DATE='1530000007 +0100' 771s + GIT_AUTHOR_DATE='1530000007 +0100' 771s + t-expect-fail 'Patch export produced patch amendments' t-git-debrebase make-patches 771s + local 'mpat=Patch export produced patch amendments' 771s + shift 771s + set +o pipefail 771s + LC_MESSAGES=C 771s + LANGUAGE=C 771s + t-git-debrebase make-patches 771s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 771s + local gdr=git-debrebase 771s + : ' 771s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 771s + git-debrebase --dgit=dgit -D make-patches 771s git-debrebase get_differs 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 = 0x22 771s git-debrebase classify 362e4afd7b5152332b224def77991b73e6da5b99 $t=90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 @p 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064/0x22 771s git-debrebase = Mixed {"Type" => "Mixed","Msg" => "MIXED add both() (for-make-patches-fails-then-dgit-fixup)\n","Hdr" => "tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466\nparent 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Parents" => [{"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Ix" => 0,"Differs" => 34}],"Tree" => "90cd60fc1d7ec5a759e9f9f43090af4e62f6b466","CommitId" => "362e4afd7b5152332b224def77991b73e6da5b99"} 771s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (362e4afd7b5152332b224def77991b73e6da5b99) 771s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f ebfc7081612876d8e714696f2ab8fbd3e9b7c267 = 0x4 771s git-debrebase classify 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 $t=ebfc7081612876d8e714696f2ab8fbd3e9b7c267 @p 4d81e614bbd890e3b1a5980111084fc69e55267f/0x4 771s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Hdr" => "tree ebfc7081612876d8e714696f2ab8fbd3e9b7c267\nparent 4d81e614bbd890e3b1a5980111084fc69e55267f\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ebfc7081612876d8e714696f2ab8fbd3e9b7c267","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f"}],"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064"} 771s git-debrebase get_differs 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 ec947983291f86b8f616e416943e998079851ca2 = 0x2 771s git-debrebase classify 4d81e614bbd890e3b1a5980111084fc69e55267f $t=ec947983291f86b8f616e416943e998079851ca2 @p 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6/0x2 771s git-debrebase = Upstream {"Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree ec947983291f86b8f616e416943e998079851ca2\nparent 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "ec947983291f86b8f616e416943e998079851ca2","Parents" => [{"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Ix" => 0,"Differs" => 2}],"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f"} 771s git-debrebase get_differs 97043ef068d57a7c42b6c059654a76088d551621 f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 = 0x2 771s git-debrebase classify 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 $t=f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 @p 97043ef068d57a7c42b6c059654a76088d551621/0x2 771s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "97043ef068d57a7c42b6c059654a76088d551621"}],"Tree" => "f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529","CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Type" => "Upstream","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529\nparent 97043ef068d57a7c42b6c059654a76088d551621\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 771s git-debrebase get_differs 66a8793ffe06ab8d25c6655e49e36725002677dd 3a2cc385adda38871a475f84fd58599a02a2452b = 0x2 771s git-debrebase classify 97043ef068d57a7c42b6c059654a76088d551621 $t=3a2cc385adda38871a475f84fd58599a02a2452b @p 66a8793ffe06ab8d25c6655e49e36725002677dd/0x2 771s git-debrebase = Upstream {"Hdr" => "tree 3a2cc385adda38871a475f84fd58599a02a2452b\nparent 66a8793ffe06ab8d25c6655e49e36725002677dd\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "97043ef068d57a7c42b6c059654a76088d551621","Tree" => "3a2cc385adda38871a475f84fd58599a02a2452b","Parents" => [{"Differs" => 2,"CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Ix" => 0}]} 771s git-debrebase get_differs 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 = 0x2 771s git-debrebase classify 66a8793ffe06ab8d25c6655e49e36725002677dd $t=ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 @p 51be2304ce8579a3bbc67e06b4c7b8daf95d5008/0x2 771s git-debrebase = Upstream {"Hdr" => "tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1\nparent 51be2304ce8579a3bbc67e06b4c7b8daf95d5008\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008"}],"Tree" => "ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1"} 771s git-debrebase get_differs 3e8e1c982b31f3cec79728c564089c589983abca 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 = 0x2 771s git-debrebase classify 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 $t=4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 @p 3e8e1c982b31f3cec79728c564089c589983abca/0x2 771s git-debrebase = Upstream {"Hdr" => "tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7\nparent 3e8e1c982b31f3cec79728c564089c589983abca\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008","Tree" => "4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7","Parents" => [{"CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Ix" => 0,"Differs" => 2}]} 771s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 806249de73c443c056dbc6bfd7603063e6e3742f = 0x20 771s git-debrebase classify 3e8e1c982b31f3cec79728c564089c589983abca $t=806249de73c443c056dbc6bfd7603063e6e3742f @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x20 771s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 806249de73c443c056dbc6bfd7603063e6e3742f\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Differs" => 32}],"Tree" => "806249de73c443c056dbc6bfd7603063e6e3742f","CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca"} 771s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 771s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 771s git-debrebase = Packaging {"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Parents" => [{"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0,"Differs" => 32}],"Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n"} 771s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 771s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 771s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Parents" => [{"Differs" => 16,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a","Ix" => 0}],"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c"} 771s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 771s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 771s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 771s git-debrebase = Anchor {"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","OrigParents" => [{"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1,"Differs" => 48}],"Parents" => [{"Differs" => 2,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"} 771s git-debrebase *** WALK 362e4afd7b5152332b224def77991b73e6da5b99 0 - 771s git-debrebase get_differs 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 = 0x22 771s git-debrebase classify 362e4afd7b5152332b224def77991b73e6da5b99 $t=90cd60fc1d7ec5a759e9f9f43090af4e62f6b466 @p 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064/0x22 771s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Differs" => 34}],"Tree" => "90cd60fc1d7ec5a759e9f9f43090af4e62f6b466","CommitId" => "362e4afd7b5152332b224def77991b73e6da5b99","Type" => "Mixed","Msg" => "MIXED add both() (for-make-patches-fails-then-dgit-fixup)\n","Hdr" => "tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466\nparent 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 771s git-debrebase get_differs 4d81e614bbd890e3b1a5980111084fc69e55267f ebfc7081612876d8e714696f2ab8fbd3e9b7c267 = 0x4 771s git-debrebase classify 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 $t=ebfc7081612876d8e714696f2ab8fbd3e9b7c267 @p 4d81e614bbd890e3b1a5980111084fc69e55267f/0x4 771s git-debrebase = AddPatches {"Hdr" => "tree ebfc7081612876d8e714696f2ab8fbd3e9b7c267\nparent 4d81e614bbd890e3b1a5980111084fc69e55267f\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","CommitId" => "94e3b9cf4a090e53d7f707c46d1ba73ef47b5064","Tree" => "ebfc7081612876d8e714696f2ab8fbd3e9b7c267","Parents" => [{"Ix" => 0,"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Differs" => 4}]} 771s git-debrebase get_differs 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 ec947983291f86b8f616e416943e998079851ca2 = 0x2 771s git-debrebase classify 4d81e614bbd890e3b1a5980111084fc69e55267f $t=ec947983291f86b8f616e416943e998079851ca2 @p 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6/0x2 771s git-debrebase = Upstream {"CommitId" => "4d81e614bbd890e3b1a5980111084fc69e55267f","Tree" => "ec947983291f86b8f616e416943e998079851ca2","Parents" => [{"Differs" => 2,"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6","Ix" => 0}],"Hdr" => "tree ec947983291f86b8f616e416943e998079851ca2\nparent 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 771s git-debrebase get_differs 97043ef068d57a7c42b6c059654a76088d551621 f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 = 0x2 771s git-debrebase classify 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 $t=f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529 @p 97043ef068d57a7c42b6c059654a76088d551621/0x2 771s git-debrebase = Upstream {"Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529\nparent 97043ef068d57a7c42b6c059654a76088d551621\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "f9c78b3410a87fcf2ef8bce5d0560c3ddc4eb529","Parents" => [{"CommitId" => "97043ef068d57a7c42b6c059654a76088d551621","Ix" => 0,"Differs" => 2}],"CommitId" => "8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6"} 771s git-debrebase get_differs 66a8793ffe06ab8d25c6655e49e36725002677dd 3a2cc385adda38871a475f84fd58599a02a2452b = 0x2 771s git-debrebase classify 97043ef068d57a7c42b6c059654a76088d551621 $t=3a2cc385adda38871a475f84fd58599a02a2452b @p 66a8793ffe06ab8d25c6655e49e36725002677dd/0x2 771s git-debrebase = Upstream {"CommitId" => "97043ef068d57a7c42b6c059654a76088d551621","Tree" => "3a2cc385adda38871a475f84fd58599a02a2452b","Parents" => [{"CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 3a2cc385adda38871a475f84fd58599a02a2452b\nparent 66a8793ffe06ab8d25c6655e49e36725002677dd\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 771s git-debrebase get_differs 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 = 0x2 771s git-debrebase classify 66a8793ffe06ab8d25c6655e49e36725002677dd $t=ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1 @p 51be2304ce8579a3bbc67e06b4c7b8daf95d5008/0x2 771s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008","Ix" => 0}],"Tree" => "ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1","CommitId" => "66a8793ffe06ab8d25c6655e49e36725002677dd","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree ee7ff4cd5fc77c03443e0bfa54399f9eb96df7d1\nparent 51be2304ce8579a3bbc67e06b4c7b8daf95d5008\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 771s git-debrebase get_differs 3e8e1c982b31f3cec79728c564089c589983abca 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 = 0x2 771s git-debrebase classify 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 $t=4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7 @p 3e8e1c982b31f3cec79728c564089c589983abca/0x2 771s git-debrebase = Upstream {"CommitId" => "51be2304ce8579a3bbc67e06b4c7b8daf95d5008","Parents" => [{"Ix" => 0,"CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Differs" => 2}],"Tree" => "4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7","Hdr" => "tree 4d1e944c5cb2f00ab5dff803498a0fcdb5d54df7\nparent 3e8e1c982b31f3cec79728c564089c589983abca\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 771s git-debrebase get_differs fb6ba5e8cbc40f160cdf3331059a51ce85cba55d 806249de73c443c056dbc6bfd7603063e6e3742f = 0x20 771s git-debrebase classify 3e8e1c982b31f3cec79728c564089c589983abca $t=806249de73c443c056dbc6bfd7603063e6e3742f @p fb6ba5e8cbc40f160cdf3331059a51ce85cba55d/0x20 771s git-debrebase = Packaging {"CommitId" => "3e8e1c982b31f3cec79728c564089c589983abca","Tree" => "806249de73c443c056dbc6bfd7603063e6e3742f","Parents" => [{"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 806249de73c443c056dbc6bfd7603063e6e3742f\nparent fb6ba5e8cbc40f160cdf3331059a51ce85cba55d\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (for-dgit-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 771s git-debrebase get_differs 941a4216b7ef2f3fdf421e01923431465e26009c 0d3063e142452ee85420b80b221505fd3f476fc2 = 0x20 771s git-debrebase classify fb6ba5e8cbc40f160cdf3331059a51ce85cba55d $t=0d3063e142452ee85420b80b221505fd3f476fc2 @p 941a4216b7ef2f3fdf421e01923431465e26009c/0x20 771s git-debrebase = Packaging {"CommitId" => "fb6ba5e8cbc40f160cdf3331059a51ce85cba55d","Parents" => [{"CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Ix" => 0,"Differs" => 32}],"Tree" => "0d3063e142452ee85420b80b221505fd3f476fc2","Hdr" => "tree 0d3063e142452ee85420b80b221505fd3f476fc2\nparent 941a4216b7ef2f3fdf421e01923431465e26009c\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (for-rebase-fixup)\n\n[git-debrebase split: mixed commit: debian part]\n"} 771s git-debrebase get_differs 55b85aaf02da2acb5564598e075601e76e1f096a 29f16cdb00ce8fb97cf547fe63743bdebdf525d7 = 0x10 771s git-debrebase classify 941a4216b7ef2f3fdf421e01923431465e26009c $t=29f16cdb00ce8fb97cf547fe63743bdebdf525d7 @p 55b85aaf02da2acb5564598e075601e76e1f096a/0x10 771s git-debrebase = Changelog {"Hdr" => "tree 29f16cdb00ce8fb97cf547fe63743bdebdf525d7\nparent 55b85aaf02da2acb5564598e075601e76e1f096a\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","CommitId" => "941a4216b7ef2f3fdf421e01923431465e26009c","Tree" => "29f16cdb00ce8fb97cf547fe63743bdebdf525d7","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"}]} 771s git-debrebase get_differs 736955cae59cd46c445b7036fa0b1b7295168fed e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x2 771s git-debrebase get_differs 66a3bee9268301791962706795caa60e43481066 e25a9ccaea8c77582bbc3db47556fb0300fbc48f = 0x30 771s git-debrebase classify 55b85aaf02da2acb5564598e075601e76e1f096a $t=e25a9ccaea8c77582bbc3db47556fb0300fbc48f @p 736955cae59cd46c445b7036fa0b1b7295168fed/0x2 66a3bee9268301791962706795caa60e43481066/0x30 771s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree e25a9ccaea8c77582bbc3db47556fb0300fbc48f\nparent 736955cae59cd46c445b7036fa0b1b7295168fed\nparent 66a3bee9268301791962706795caa60e43481066\nauthor dgit test git user 1530000001 +0100\ncommitter dgit test git user 1530000001 +0100\n","OrigParents" => [{"Differs" => 48,"CommitId" => "66a3bee9268301791962706795caa60e43481066","Ix" => 1}],"Parents" => [{"Differs" => 2,"CommitId" => "736955cae59cd46c445b7036fa0b1b7295168fed","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "e25a9ccaea8c77582bbc3db47556fb0300fbc48f","CommitId" => "55b85aaf02da2acb5564598e075601e76e1f096a"} 771s git-debrebase *** WALK prep done cur=55b85aaf02da2acb5564598e075601e76e1f096a brw 4 upp 6 proc 12 pm -1 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s git-debrebase WALK REBUILD 55b85aaf02da2acb5564598e075601e76e1f096a 13 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 771s git-debrebase WALK BUILD 941a4216b7ef2f3fdf421e01923431465e26009c Debian (rewriting=0) 771s git-debrebase WALK BUILD fb6ba5e8cbc40f160cdf3331059a51ce85cba55d Debian (rewriting=0) 771s git-debrebase WALK BUILD 3e8e1c982b31f3cec79728c564089c589983abca Debian (rewriting=0) 771s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 771s git-debrebase WALK BUILD 362e4afd7b5152332b224def77991b73e6da5b99 Debian (rewriting=1) 771s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 771s git-debrebase WALK BUILD 51be2304ce8579a3bbc67e06b4c7b8daf95d5008 Upstream (rewriting=1) 771s git-debrebase WALK BUILD 66a8793ffe06ab8d25c6655e49e36725002677dd Upstream (rewriting=1) 771s git-debrebase WALK BUILD 97043ef068d57a7c42b6c059654a76088d551621 Upstream (rewriting=1) 771s git-debrebase WALK BUILD 8b4ca3e8fe748263b2cfe4a0eb869b01996ffeb6 Upstream (rewriting=1) 771s git-debrebase WALK BUILD 4d81e614bbd890e3b1a5980111084fc69e55267f Upstream (rewriting=1) 771s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 771s git-debrebase WALK BUILD 362e4afd7b5152332b224def77991b73e6da5b99 Upstream (rewriting=1) 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s git-debrebase get_differs ac854cb0e6148212fa4babaf6034485ce5e97644 362e4afd7b5152332b224def77991b73e6da5b99 = 0x4 771s git-debrebase *** WALK RETURN ac854cb0e6148212fa4babaf6034485ce5e97644 a46c46e4241a0f571c9b29f91b4eea170c6cb5cf 55b85aaf02da2acb5564598e075601e76e1f096a 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 771s git-debrebase gbp_pq_export bw a46c46e4241a0f571c9b29f91b4eea170c6cb5cf ac854cb0e6148212fa4babaf6034485ce5e97644 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 771s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s git-debrebase get_differs 362e4afd7b5152332b224def77991b73e6da5b99 cd6873f904a1ce4635141d1c0181ef76fd2a35ef = 0xc 771s 771s git-debrebase: error: Patch export produced patch amendments (abandoned output commit cd6873f904a1ce4635141d1c0181ef76fd2a35ef). Try laundering first. 771s + local 'ps=7 0' 771s + set -o pipefail 771s + case $ps in 771s + t-grep-mpat 'Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 771s + local 'mpat=Patch export produced patch amendments' 771s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 771s + local grepper=fgrep 771s + case "$mpat" in 771s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 771s git-debrebase: error: Patch export produced patch amendments (abandoned output commit cd6873f904a1ce4635141d1c0181ef76fd2a35ef). Try laundering first. 771s + t-dgit -wgf quilt-fixup 771s + local dgit=dgit 771s + pwd 771s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 771s + : ' 771s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 771s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf quilt-fixup 771s | git rev-parse --show-toplevel 771s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 771s | git config -z --get-regexp --local '.*' 771s | git config -z --get-regexp --local '.*' 771s | git config -z --get-regexp --global '.*' 771s | git config -z --get-regexp --system '.*' 771s format 3.0 (quilt), quilt mode linear 771s Format `3.0 (quilt)', need to check/update patch stack 771s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 771s => `' 771s + git diff --quiet HEAD 771s + git clean -xdff 771s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 771s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 771s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 771s | git rev-parse 'HEAD~0' 771s => `362e4afd7b5152332b224def77991b73e6da5b99' 771s | git symbolic-ref -q HEAD 771s => `refs/heads/master' 771s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 771s CD work 771s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 771s + git reset -q --hard 362e4afd7b5152332b224def77991b73e6da5b99 771s examining quilt state (multiple patches, linear mode) 771s branch_is_gdr 362e4afd7b5152332b224def77991b73e6da5b99... 771s branch_is_gdr 4d81e614bbd890e3b1a5980111084fc69e55267f ?-patches NO 771s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 771s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 771s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 771s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 771s CD fake 771s | find -name .git -prune -print0 771s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 771s + git checkout -f 362e4afd7b5152332b224def77991b73e6da5b99 -- debian 771s + git add -Af . 771s | git write-tree 771s => `09965de93e9f4920b07fcb0c768d7cce2741bbfc' 771s fake orig tree object 09965de93e9f4920b07fcb0c768d7cce2741bbfc 772s CD .. 772s + git reset -q --hard 362e4afd7b5152332b224def77991b73e6da5b99 772s CD ../fake 772s + git add -Af . 772s | git write-tree 772s => `365dbf6ec5ca40479aa9a59654c77e2898003a8a' 772s fake o+d/p tree object 09965de93e9f4920b07fcb0c768d7cce2741bbfc 772s CD ../work 772s | git ls-tree --name-only -z 362e4afd7b5152332b224def77991b73e6da5b99 772s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 772s | git diff-tree -z --no-renames -r 09965de93e9f4920b07fcb0c768d7cce2741bbfc 362e4afd7b5152332b224def77991b73e6da5b99 772s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc dbc6969692b73d9b7fe5399a3fb93c6698bbc36a M\x00src.c\x00' 772s quiltify_trees_differ 09965de93e9f4920b07fcb0c768d7cce2741bbfc 362e4afd7b5152332b224def77991b73e6da5b99 => 1 772s | git diff-tree -z --no-renames --name-only -r 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a 772s => `src.c\x00' 772s quiltify_trees_differ 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 772s | git diff-tree -z --no-renames --name-only -r 09965de93e9f4920b07fcb0c768d7cce2741bbfc 365dbf6ec5ca40479aa9a59654c77e2898003a8a 772s => `lib.c\x00new-upstream-file\x00src.c\x00' 772s quiltify_trees_differ 09965de93e9f4920b07fcb0c768d7cce2741bbfc 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 772s differences @dl ## ## ## == == ==. 772s dgit: base trees orig=09965de93e9f4920b07f o+d/p=365dbf6ec5ca40479aa9 772s dgit: quilt differences: src: ## orig ## gitignores: == orig == 772s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 772s starting quiltify (multiple patches, linear mode) 772s | git ls-tree --name-only 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/rules debian/control 772s => `debian/control'... 772s quiltify investigate 362e4afd7b5152332b224def77991b73e6da5b99 772s | git diff-tree -z --no-renames --name-only 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a 772s => `src.c\x00' 772s quiltify_trees_differ 362e4afd7b5152332b224def77991b73e6da5b99 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 1 772s | git ls-tree --name-only 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/rules debian/control 772s => `debian/control'... 772s | git cat-file commit 362e4afd7b5152332b224def77991b73e6da5b99 772s => `tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466'... 772s | git diff-tree -z --no-renames --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 772s => `debian\x00src.c\x00' 772s quiltify_trees_differ 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 => 1 772s considering C=362e4afd7b5152332b224def77991b73e6da5b99 P=94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 772s | git diff-tree -r --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 362e4afd7b5152332b224def77991b73e6da5b99 -- debian/patches .pc debian/source/format 772s => `' 772s search queue P=94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 NT 772s quiltify investigate 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 772s | git diff-tree -z --no-renames --name-only 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 365dbf6ec5ca40479aa9a59654c77e2898003a8a 772s => `debian\x00' 772s quiltify_trees_differ 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064 365dbf6ec5ca40479aa9a59654c77e2898003a8a => 0 772s search finished hooray! 772s quiltify linearisation planning successful, executing... 772s quiltify traverse 94e3b9cf4a090e53d7f707c46d1ba73ef47b5064..362e4afd7b5152332b224def77991b73e6da5b99 772s | git cat-file commit 362e4afd7b5152332b224def77991b73e6da5b99 772s => `tree 90cd60fc1d7ec5a759e9f9f43090af4e62f6b466'... 772s | git log -n1 '--pretty=format:%aD' 362e4afd7b5152332b224def77991b73e6da5b99 772s => `Tue, 26 Jun 2018 09:00:06 +0100' 772s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 772s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 debian/changelog 772s | realpath -- /usr/bin/dgit 772s => `/usr/bin/dgit' 772s | realpath -- .git/dgit/quilt-description.tmp 772s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 772s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-for-make-patches-fails-th.patch 772s dpkg-source: info: using patch list from debian/patches/series 772s dpkg-source: info: local changes detected, the modified files are: 772s work/src.c 772s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-for-make-patches-fails-th.patch 772s + git checkout -q 362e4afd7b5152332b224def77991b73e6da5b99 debian/changelog 772s + git checkout -q master 772s | git status --ignored --porcelain 772s => ` M debian/patches/series'... 772s + git add -f debian/patches 772s Commit Debian 3.0 (quilt) metadata 772s 772s [dgit (9.15) quilt-fixup] 772s 772s + git commit -m 'Commit Debian 3.0 (quilt) metadata 772s 772s [dgit (9.15) quilt-fixup] 772s ' 772s [master c710a1b] Commit Debian 3.0 (quilt) metadata 772s 2 files changed, 16 insertions(+) 772s create mode 100644 debian/patches/mixed-add-both-for-make-patches-fails-th.patch 772s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 772s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 772s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 772s ' 772s + t-refs-same-start 772s + unset t_ref_val 772s + t_ref_names=() 772s + t-ref-head 772s + local val 772s ++ git rev-parse HEAD 772s + val=c710a1b80512661e30182c0525750ab05a5234c9 772s + t-ref-same-val HEAD c710a1b80512661e30182c0525750ab05a5234c9 772s + local name=HEAD 772s + local val=c710a1b80512661e30182c0525750ab05a5234c9 772s + case "${t_ref_val-unset}" in 772s + t_ref_val=c710a1b80512661e30182c0525750ab05a5234c9 772s + t_ref_names+=("$name") 772s + t-dgit -wg quilt-fixup 772s + local dgit=dgit 772s + pwd 772s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 772s + : ' 772s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 772s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wg quilt-fixup 772s | git rev-parse --show-toplevel 772s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 772s | git config -z --get-regexp --local '.*' 772s | git config -z --get-regexp --local '.*' 772s | git config -z --get-regexp --global '.*' 772s | git config -z --get-regexp --system '.*' 772s format 3.0 (quilt), quilt mode linear 772s Format `3.0 (quilt)', need to check/update patch stack 772s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 772s => `' 772s + git diff --quiet HEAD 772s + git clean -xdf 772s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 772s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 772s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 772s | git rev-parse 'HEAD~0' 772s => `c710a1b80512661e30182c0525750ab05a5234c9' 772s | git symbolic-ref -q HEAD 772s => `refs/heads/master' 772s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 772s CD work 772s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 772s + git reset -q --hard c710a1b80512661e30182c0525750ab05a5234c9 772s examining quilt state (multiple patches, linear mode) 772s branch_is_gdr c710a1b80512661e30182c0525750ab05a5234c9... 772s branch_is_gdr 362e4afd7b5152332b224def77991b73e6da5b99 ?-patches NO 772s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 772s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 772s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 772s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 772s CD fake 772s | find -name .git -prune -print0 772s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 772s + git checkout -f c710a1b80512661e30182c0525750ab05a5234c9 -- debian 772s + git add -Af . 772s | git write-tree 772s => `793670202969d2d7ebe00db1330b447839034a8a' 772s fake orig tree object 793670202969d2d7ebe00db1330b447839034a8a 772s CD .. 772s + git reset -q --hard c710a1b80512661e30182c0525750ab05a5234c9 772s CD ../fake 772s + git add -Af . 772s | git write-tree 772s => `fc073848f21adc07cc759d0efb13c667cac986a3' 772s fake o+d/p tree object 793670202969d2d7ebe00db1330b447839034a8a 772s CD ../work 772s | git ls-tree --name-only -z c710a1b80512661e30182c0525750ab05a5234c9 772s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 772s | git diff-tree -z --no-renames -r 793670202969d2d7ebe00db1330b447839034a8a c710a1b80512661e30182c0525750ab05a5234c9 772s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc dbc6969692b73d9b7fe5399a3fb93c6698bbc36a M\x00src.c\x00' 772s quiltify_trees_differ 793670202969d2d7ebe00db1330b447839034a8a c710a1b80512661e30182c0525750ab05a5234c9 => 1 772s | git diff-tree -z --no-renames --name-only -r c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 772s => `' 772s quiltify_trees_differ c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 => 0 772s | git diff-tree -z --no-renames --name-only -r 793670202969d2d7ebe00db1330b447839034a8a fc073848f21adc07cc759d0efb13c667cac986a3 772s => `lib.c\x00new-upstream-file\x00src.c\x00' 772s quiltify_trees_differ 793670202969d2d7ebe00db1330b447839034a8a fc073848f21adc07cc759d0efb13c667cac986a3 => 1 772s differences @dl ## ## == == == ==. 772s dgit: base trees orig=793670202969d2d7ebe0 o+d/p=fc073848f21adc07cc75 772s dgit: quilt differences: src: ## orig ## gitignores: == orig == 772s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 772s starting quiltify (multiple patches, linear mode) 772s | git ls-tree --name-only c710a1b80512661e30182c0525750ab05a5234c9 -- debian/rules debian/control 772s => `debian/control'... 772s quiltify investigate c710a1b80512661e30182c0525750ab05a5234c9 772s | git diff-tree -z --no-renames --name-only c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 772s => `' 772s quiltify_trees_differ c710a1b80512661e30182c0525750ab05a5234c9 fc073848f21adc07cc759d0efb13c667cac986a3 => 0 772s search finished hooray! 772s quiltify linearisation planning successful, executing... 772s + git checkout -q master 772s | git status --ignored --porcelain 772s => `?? .pc/'... 772s nothing quilty to commit, ok. 772s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 772s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 772s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 772s ' 772s + t-ref-head 772s + local val 772s ++ git rev-parse HEAD 772s + val=c710a1b80512661e30182c0525750ab05a5234c9 772s + t-ref-same-val HEAD c710a1b80512661e30182c0525750ab05a5234c9 772s + local name=HEAD 772s + local val=c710a1b80512661e30182c0525750ab05a5234c9 772s + case "${t_ref_val-unset}" in 772s + t_ref_val=c710a1b80512661e30182c0525750ab05a5234c9 772s + t_ref_names+=("$name") 772s + t-ok 772s + : ======================================== 772s + t-check-only-bpd 772s + '[' .. = .. ']' 772s + return 772s + t-fscks 772s + shopt -s nullglob 772s + for d in $tmp/*/.git $tmp/git/*.git 772s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 772s + t-git-fsck 772s ++ git rev-parse --git-dir 772s + local fsckerrs=.git/dgit-test-fsck.errs 772s + set +e 772s + LC_MESSAGES=C 772s + git fsck --no-dangling --strict 772s + tee .git/dgit-test-fsck.errs 772s + ps='0 0' 772s + set -e 772s + local pats 772s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 772s + test '0 0' = '0 0' 772s + pats+=(-e 'notice: HEAD points to an unborn branch') 772s + pats+=(-e 'notice: No default references') 772s + set +e 772s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 772s + rc=1 772s + set -e 772s + case $rc in 772s + for d in $tmp/*/.git $tmp/git/*.git 772s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 772s + t-git-fsck 772s ++ git rev-parse --git-dir 772s + local fsckerrs=./dgit-test-fsck.errs 772s + set +e 772s + LC_MESSAGES=C 772s + git fsck --no-dangling --strict 772s + tee ./dgit-test-fsck.errs 772s notice: HEAD points to an unborn branch (master) 772s + ps='0 0' 772s + set -e 772s + local pats 772s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 772s + test '0 0' = '0 0' 772s + pats+=(-e 'notice: HEAD points to an unborn branch') 772s + pats+=(-e 'notice: No default references') 772s + set +e 772s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 772s + rc=1 772s + set -e 772s + case $rc in 772s + t-save-artifacts 772s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts 772s + '[' x/tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts = x ']' 772s + '[' xtmp = x ']' 772s + GZIP=-1v 772s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-makepatches7-artifacts/gdr-makepatches7.tar.gz '--exclude=*.tar' . 772s gzip: warning: GZIP environment variable is deprecated; use an alias or script 772s 80.3% 772s + echo ok. 772s ok. 772s + rc=0 772s + set +x 772s + set +e 772s + pwd 772s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 772s + '[' x '!=' x ']' 772s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 772s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 772s + set -e 772s + test 0 = 0 773s autopkgtest [12:31:07]: test gdr-makepatches7: -----------------------] 773s gdr-makepatches7 PASS 773s autopkgtest [12:31:07]: test gdr-makepatches7: - - - - - - - - - - results - - - - - - - - - - 773s autopkgtest [12:31:07]: test gdr-merge: preparing testbed 773s Reading package lists... 773s Building dependency tree... 773s Reading state information... 774s Starting pkgProblemResolver with broken count: 0 774s Starting 2 pkgProblemResolver with broken count: 0 774s Done 774s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 774s autopkgtest [12:31:08]: test gdr-merge: [----------------------- 774s ++ set -o pipefail 774s ++ . tests/lib-core 774s ++ . tests/lib-restricts 774s ++ trap ' 774s rc=$? 774s set +x 774s test $rc = 0 || echo " 774s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 774s 774s Most relevant logs are just before assignment rc=$rc 774s Will now do cleanup etc. 774s " 774s set -x 774s set +e 774s pwd 774s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 774s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 774s set -e 774s test $rc = 0 || t-report-failure 774s ' EXIT 774s ++ t-filter-out-git-hyphen-dir 774s ++ local pathent 774s +++ type -p git-rev-parse 774s +++ : 774s ++ pathent= 774s ++ case "$pathent" in 774s ++ return 774s ++ t-set-intree 774s ++ '[' x = x ']' 774s ++ return 774s ++ : -D 774s ++ export DGIT_TEST_DEBUG 774s ++ : x 774s ++ export DGIT_TEST_DEBPUSH_DEBUG 774s ++ : 774s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 774s ++ GIT_COMMITTER_DATE='1530000000 +0100' 774s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 774s ++ GIT_AUTHOR_DATE='1530000000 +0100' 774s ++ export LC_CTYPE=C.UTF-8 774s ++ LC_CTYPE=C.UTF-8 774s ++ unset CDPATH 774s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 774s ++ FILTER_BRANCH_SQUELCH_WARNING=1 774s +++ pwd 774s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 774s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ testname=gdr-merge 774s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ bpd=.. 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 774s ++ '[' x '!=' x ']' 774s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s +++ pwd 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ t-set-using-tmp 774s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ export 'DEBFULLNAME=dgit test git user' 774s ++ DEBFULLNAME='dgit test git user' 774s ++ git config --global user.email dgit-test@debian.example.net 774s ++ git config --global user.name 'dgit test git user' 774s ++ git config --global protocol.ext.allow always 774s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 774s ++ env -0 774s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 774s ++ export DEBCHANGE_VENDOR=dpkg 774s ++ DEBCHANGE_VENDOR=dpkg 774s ++ unset VISUAL 774s ++ unset GIT_EDITOR 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 774s ++ cat 774s ++ schroot=build 774s ++ : aq 774s ++ : archive/test-dummy 774s ++ : sid:unstable 774s ++ t-git-config dgit.default.old-dsc-distro test-dummy 774s ++ git config --global dgit.default.old-dsc-distro test-dummy 774s + t-dependencies GDR 774s + : 'Hopefully installed: GDR' 774s + t-tstunt-parsechangelog 774s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + local var=PATH 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + eval ' 774s case "$PATH" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PATH="$tstunt" ;; 774s *) PATH="$tstunt:$PATH" ;; 774s esac 774s export PATH 774s ' 774s ++ case "$PATH" in 774s ++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ export PATH 774s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + local var=PERLLIB 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + eval ' 774s case "$PERLLIB" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PERLLIB="$tstunt" ;; 774s *) PERLLIB="$tstunt:$PERLLIB" ;; 774s esac 774s export PERLLIB 774s ' 774s ++ case "$PERLLIB" in 774s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ export PERLLIB 774s + local f 774s + for f in "$@" 774s + t-tstunt--save-real dpkg-parsechangelog 774s + local f=dpkg-parsechangelog 774s + case "$f" in 774s + local rc 774s + local real 774s + set +e 774s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ type -p dpkg-parsechangelog 774s + real=/usr/bin/dpkg-parsechangelog 774s + rc=0 774s + set -e 774s + case $rc in 774s + local varname=dpkg_parsechangelog 774s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s + eval ' 774s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 774s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s ' 774s ++ : /usr/bin/dpkg-parsechangelog 774s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s + f=./dpkg-parsechangelog 774s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 774s + for f in "$@" 774s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 774s + local f=Dpkg/Changelog/Parse.pm 774s + case "$f" in 774s + return 774s + f=./Dpkg/Changelog/Parse.pm 774s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 774s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 774s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 774s + t-setup-import gdr-convert-gbp-noarchive 774s + local setupname=gdr-convert-gbp-noarchive 774s + local setupsrc 774s + local lock 774s + '[' x = x ']' 774s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 774s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 774s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 774s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 774s cd "$1"; shift 774s setupname="$1"; shift 774s simport="$1"; shift 774s if [ -e "$simport" ]; then exit 0; fi 774s env - "$@" \ 774s "tests/setup/$setupname" 774s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gdr-convert-gbp-noarchive /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 774s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 774s + shift 774s + setupname=gdr-convert-gbp-noarchive 774s + shift 774s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 774s + shift 774s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 774s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-merge-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-merge-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-merge-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-merge -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-merge' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-merge-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-merge-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 774s ++ set -o pipefail 774s ++ . tests/lib-core 774s ++ . tests/lib-restricts 774s ++ trap ' 774s rc=$? 774s set +x 774s test $rc = 0 || echo " 774s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 774s 774s Most relevant logs are just before assignment rc=$rc 774s Will now do cleanup etc. 774s " 774s set -x 774s set +e 774s pwd 774s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 774s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 774s set -e 774s test $rc = 0 || t-report-failure 774s ' EXIT 774s ++ t-filter-out-git-hyphen-dir 774s ++ local pathent 774s +++ type -p git-rev-parse 774s +++ : 774s ++ pathent= 774s ++ case "$pathent" in 774s ++ return 774s ++ t-set-intree 774s ++ '[' x = x ']' 774s ++ return 774s ++ : -D 774s ++ export DGIT_TEST_DEBUG 774s ++ : x 774s ++ export DGIT_TEST_DEBPUSH_DEBUG 774s ++ : 774s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 774s ++ GIT_COMMITTER_DATE='1530000000 +0100' 774s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 774s ++ GIT_AUTHOR_DATE='1530000000 +0100' 774s ++ export LC_CTYPE=C.UTF-8 774s ++ LC_CTYPE=C.UTF-8 774s ++ unset CDPATH 774s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 774s ++ FILTER_BRANCH_SQUELCH_WARNING=1 774s +++ pwd 774s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 774s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ testname=gdr-convert-gbp-noarchive 774s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ bpd=.. 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 774s ++ '[' x '!=' x ']' 774s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s +++ pwd 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ t-set-using-tmp 774s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ export 'DEBFULLNAME=dgit test git user' 774s ++ DEBFULLNAME='dgit test git user' 774s ++ git config --global user.email dgit-test@debian.example.net 774s ++ git config --global user.name 'dgit test git user' 774s ++ git config --global protocol.ext.allow always 774s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 774s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 774s ++ export DEBCHANGE_VENDOR=dpkg 774s ++ DEBCHANGE_VENDOR=dpkg 774s ++ unset VISUAL 774s ++ unset GIT_EDITOR 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 774s ++ cat 774s ++ schroot=build 774s ++ : aq 774s ++ : archive/test-dummy 774s ++ : sid:unstable 774s ++ t-git-config dgit.default.old-dsc-distro test-dummy 774s ++ git config --global dgit.default.old-dsc-distro test-dummy 774s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 774s ++ : -D 774s ++ export GDR_TEST_DEBUG 774s ++ t-tstunt debchange 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ local var=PATH 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ eval ' 774s case "$PATH" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PATH="$tstunt" ;; 774s *) PATH="$tstunt:$PATH" ;; 774s esac 774s export PATH 774s ' 774s +++ case "$PATH" in 774s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ export PATH 774s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ local var=PERLLIB 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ eval ' 774s case "$PERLLIB" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PERLLIB="$tstunt" ;; 774s *) PERLLIB="$tstunt:$PERLLIB" ;; 774s esac 774s export PERLLIB 774s ' 774s +++ case "$PERLLIB" in 774s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s +++ export PERLLIB 774s ++ local f 774s ++ for f in "$@" 774s ++ t-tstunt--save-real debchange 774s ++ local f=debchange 774s ++ case "$f" in 774s ++ local rc 774s ++ local real 774s ++ set +e 774s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ type -p debchange 774s ++ real=/usr/bin/debchange 774s ++ rc=0 774s ++ set -e 774s ++ case $rc in 774s ++ local varname=debchange 774s ++ varname=DGIT_TEST_REAL_DEBCHANGE 774s ++ eval ' 774s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 774s export DGIT_TEST_REAL_DEBCHANGE 774s ' 774s +++ : /usr/bin/debchange 774s +++ export DGIT_TEST_REAL_DEBCHANGE 774s ++ f=./debchange 774s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 774s + t-dependencies GDR 774s + : 'Hopefully installed: GDR' 774s + export ifarchive=: 774s + ifarchive=: 774s + t-chain-test gdr-convert-gbp 774s + t-chain-test-somehow 774s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 774s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 774s + export DGIT_TEST_TMPBASE= 774s + DGIT_TEST_TMPBASE= 774s + export ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s + ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s + local ct=gdr-convert-gbp 774s + local d=tests/setup 774s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 774s + exec tests/setup/gdr-convert-gbp 774s ++ set -o pipefail 774s ++ . tests/lib-core 774s ++ . tests/lib-restricts 774s ++ trap ' 774s rc=$? 774s set +x 774s test $rc = 0 || echo " 774s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 774s 774s Most relevant logs are just before assignment rc=$rc 774s Will now do cleanup etc. 774s " 774s set -x 774s set +e 774s pwd 774s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 774s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 774s set -e 774s test $rc = 0 || t-report-failure 774s ' EXIT 774s ++ t-filter-out-git-hyphen-dir 774s ++ local pathent 774s +++ type -p git-rev-parse 774s +++ : 774s ++ pathent= 774s ++ case "$pathent" in 774s ++ return 774s ++ t-set-intree 774s ++ '[' x = x ']' 774s ++ return 774s ++ : -D 774s ++ export DGIT_TEST_DEBUG 774s ++ : x 774s ++ export DGIT_TEST_DEBPUSH_DEBUG 774s ++ : 774s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 774s ++ GIT_COMMITTER_DATE='1530000000 +0100' 774s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 774s ++ GIT_AUTHOR_DATE='1530000000 +0100' 774s ++ export LC_CTYPE=C.UTF-8 774s ++ LC_CTYPE=C.UTF-8 774s ++ unset CDPATH 774s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 774s ++ FILTER_BRANCH_SQUELCH_WARNING=1 774s +++ pwd 774s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 774s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ testname=gdr-convert-gbp-noarchive 774s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 774s ++ bpd=.. 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 774s ++ '[' x '!=' x ']' 774s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s +++ pwd 774s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ t-set-using-tmp 774s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 774s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 774s ++ export 'DEBFULLNAME=dgit test git user' 774s ++ DEBFULLNAME='dgit test git user' 774s ++ git config --global user.email dgit-test@debian.example.net 774s ++ git config --global user.name 'dgit test git user' 774s ++ git config --global protocol.ext.allow always 774s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 774s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 774s ++ export DEBCHANGE_VENDOR=dpkg 774s ++ DEBCHANGE_VENDOR=dpkg 774s ++ unset VISUAL 774s ++ unset GIT_EDITOR 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 774s ++ cat 774s ++ schroot=build 774s ++ : aq 774s ++ : archive/test-dummy 774s ++ : sid:unstable 774s ++ t-git-config dgit.default.old-dsc-distro test-dummy 774s ++ git config --global dgit.default.old-dsc-distro test-dummy 774s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 774s ++ : -D 774s ++ export GDR_TEST_DEBUG 774s ++ t-tstunt debchange 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ local var=PATH 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ eval ' 774s case "$PATH" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PATH="$tstunt" ;; 774s *) PATH="$tstunt:$PATH" ;; 774s esac 774s export PATH 774s ' 774s +++ case "$PATH" in 774s +++ export PATH 774s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ local var=PERLLIB 774s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s ++ eval ' 774s case "$PERLLIB" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PERLLIB="$tstunt" ;; 774s *) PERLLIB="$tstunt:$PERLLIB" ;; 774s esac 774s export PERLLIB 774s ' 774s +++ case "$PERLLIB" in 774s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s +++ export PERLLIB 774s ++ local f 774s ++ for f in "$@" 774s ++ t-tstunt--save-real debchange 774s ++ local f=debchange 774s ++ case "$f" in 774s ++ local rc 774s ++ local real 774s ++ set +e 774s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s +++ type -p debchange 774s ++ real=/usr/bin/debchange 774s ++ rc=0 774s ++ set -e 774s ++ case $rc in 774s ++ local varname=debchange 774s ++ varname=DGIT_TEST_REAL_DEBCHANGE 774s ++ eval ' 774s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 774s export DGIT_TEST_REAL_DEBCHANGE 774s ' 774s +++ : /usr/bin/debchange 774s +++ export DGIT_TEST_REAL_DEBCHANGE 774s ++ f=./debchange 774s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 774s + : t-setup-import gnupg 774s + t-dependencies GDR 774s + : 'Hopefully installed: GDR' 774s + t-tstunt-parsechangelog 774s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + local var=PATH 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + eval ' 774s case "$PATH" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PATH="$tstunt" ;; 774s *) PATH="$tstunt:$PATH" ;; 774s esac 774s export PATH 774s ' 774s ++ case "$PATH" in 774s ++ export PATH 774s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + local var=PERLLIB 774s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 774s + eval ' 774s case "$PERLLIB" in 774s "$tstunt:"*) ;; 774s *":$tstunt:"*) ;; 774s "") PERLLIB="$tstunt" ;; 774s *) PERLLIB="$tstunt:$PERLLIB" ;; 774s esac 774s export PERLLIB 774s ' 774s ++ case "$PERLLIB" in 774s ++ export PERLLIB 774s + local f 774s + for f in "$@" 774s + t-tstunt--save-real dpkg-parsechangelog 774s + local f=dpkg-parsechangelog 774s + case "$f" in 774s + local rc 774s + local real 774s + set +e 774s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 774s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 774s ++ type -p dpkg-parsechangelog 774s + real=/usr/bin/dpkg-parsechangelog 774s + rc=0 774s + set -e 774s + case $rc in 774s + local varname=dpkg_parsechangelog 774s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s + eval ' 774s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 774s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s ' 774s ++ : /usr/bin/dpkg-parsechangelog 774s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 774s + f=./dpkg-parsechangelog 774s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 774s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 774s + for f in "$@" 774s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 774s + local f=Dpkg/Changelog/Parse.pm 774s + case "$f" in 774s + return 774s + f=./Dpkg/Changelog/Parse.pm 774s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 774s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 774s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 774s + t-gdr-gbp-import-core-with-queue 774s + t-gdr-gbp-import-core 774s + p=example 774s + t-worktree 1.1 774s + rm -rf example 774s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 774s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 774s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 774s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 774s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 774s + cd example 774s + : 'fake up some kind of upstream' 774s + git checkout -b upstream quilt-tip 774s Switched to a new branch 'upstream' 774s + rm -rf debian 774s + mkdir debian 774s + echo junk 774s + git add debian 774s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 774s [upstream 98d1ef3] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 774s 6 files changed, 1 insertion(+), 36 deletions(-) 774s delete mode 100644 debian/changelog 774s delete mode 100644 debian/compat 774s delete mode 100644 debian/control 774s delete mode 100644 debian/example.install 774s mode change 100755 => 100644 debian/rules 774s delete mode 100644 debian/source/format 774s + git tag v1.0 774s + : 'fake up that our quilt-tip was descended from upstream' 774s + git checkout quilt-tip 774s Switched to branch 'quilt-tip' 774s + git merge --no-edit -s ours upstream 774s Merge made by the 'ours' strategy. 774s + : 'fake up that our quilt-tip had the patch queue in it' 774s + git checkout patch-queue/quilt-tip 774s Switched to branch 'patch-queue/quilt-tip' 774s + gbp pq export 774s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 774s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 774s + git add debian/patches 774s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 774s [quilt-tip 2d660f7] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 774s 4 files changed, 50 insertions(+) 774s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 774s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 774s create mode 100644 debian/patches/series 774s create mode 100644 debian/patches/subdir/addnewups 774s + : 'make branch names more conventional' 774s + git branch -D master 774s Deleted branch master (was 17d67db). 774s + git branch -m quilt-tip master 774s + not-gdr-processable origin 774s + git branch gdr-unprocessable/origin 774s + t-git-debrebase analyse 774s + local gdr=git-debrebase 774s + : ' 774s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 774s + git-debrebase --dgit=dgit -D analyse 774s + grep 'Unknown Unprocessable' 775s git-debrebase *** WALK 2d660f75d860eebc7c1d206b7b36383e1ee4add4 1 *main::STDOUT 775s git-debrebase get_differs 1bc46c9d4678351c17d3f6376286edb58ddee61b bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 775s git-debrebase classify 2d660f75d860eebc7c1d206b7b36383e1ee4add4 $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 1bc46c9d4678351c17d3f6376286edb58ddee61b/0x4 775s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b"}],"CommitId" => "2d660f75d860eebc7c1d206b7b36383e1ee4add4","Msg" => "patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 1bc46c9d4678351c17d3f6376286edb58ddee61b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches"} 775s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 775s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 775s git-debrebase classify 1bc46c9d4678351c17d3f6376286edb58ddee61b $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 98d1ef33f97b1baf0e88f735213286f40a2d2980/0x30 775s git-debrebase = Pseudomerge {"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 98d1ef33f97b1baf0e88f735213286f40a2d2980\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "98d1ef33f97b1baf0e88f735213286f40a2d2980"}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Type" => "Pseudomerge"} 775s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 775s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 775s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}]} 775s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 775s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 775s git-debrebase = Mixed {"Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 775s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 775s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 775s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}]} 775s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 775s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 775s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0,"Differs" => 32}],"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 775s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 775s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 775s git-debrebase = Packaging {"Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 775s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 775s git-debrebase ** Unknown 775s git-debrebase *** WALK BOMB unrecognised 775s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 775s ' 775s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 775s + : 'fake up an upstream 2.0' 775s + git branch make-upstream upstream 775s + t-make-new-upstream-tarball 2.0 775s + local uv=2.0 775s + git checkout make-upstream 775s Switched to branch 'make-upstream' 775s + echo 'upstream 2.0' 775s + git commit -a -m 'upstream 2.0 tarball' 775s [make-upstream 19f63cb] upstream 2.0 tarball 775s 1 file changed, 1 insertion(+) 775s + t-make-orig example 2.0 make-upstream 775s + local p=example 775s + local v=2.0 775s + local tag=make-upstream 775s + ust=example_2.0.orig.tar.gz 775s + GZIP=-1 775s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 775s gzip: warning: GZIP environment variable is deprecated; use an alias or script 775s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 775s + git branch -D quilt-tip-2 775s Deleted branch quilt-tip-2 (was 99fcab4). 775s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 775s + git branch -D gitish-only 775s Deleted branch gitish-only (was 2b2ddc8). 775s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 775s + git branch -D quilt-tip-1.1 775s Deleted branch quilt-tip-1.1 (was 7fc34be). 775s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 775s + git branch -D patch-queue/quilt-tip 775s Deleted branch patch-queue/quilt-tip (was d843a68). 775s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 775s + git branch -D indep-arch 775s Deleted branch indep-arch (was e215729). 775s + : 'see what gbp import-orig does' 775s + git checkout master 775s Switched to branch 'master' 775s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 775s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 775s gbp:info: Source package is example 775s gbp:info: Upstream version is 2.0 775s gbp:info: Replacing upstream source on 'master' 775s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 775s + not-gdr-processable merge 775s + git branch gdr-unprocessable/merge 775s + t-git-debrebase analyse 775s + local gdr=git-debrebase 775s + : ' 775s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 775s + git-debrebase --dgit=dgit -D analyse 775s + grep 'Unknown Unprocessable' 775s git-debrebase *** WALK 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 1 *main::STDOUT 775s git-debrebase get_differs 2d660f75d860eebc7c1d206b7b36383e1ee4add4 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 775s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 775s git-debrebase classify 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 2d660f75d860eebc7c1d206b7b36383e1ee4add4/0x2 dcacb606b0a29bcbc1331971222caf97f79a139c/0x34 775s git-debrebase ** Unknown 775s git-debrebase *** WALK BOMB unrecognised 775s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 775s ' 775s 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 Unknown Unprocessable (general two-parent merge) 775s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 775s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 775s + DEBEMAIL=dgit-tests@example.org 775s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 775s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 775s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 775s [master 39a9ae4] dch -v 2.0-1 -m new upstream (did gbp import-orig) 775s 1 file changed, 6 insertions(+) 775s + t-dch-commit-r 775s + t-dch-r-rune t-dch-commit 775s + local cmd=t-dch-commit 775s + shift 775s + local suite=unstable 775s + t-dch-commit -r -D unstable '' 775s + t-debchange -r -D unstable '' 775s + DEBEMAIL=dgit-tests@example.org 775s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 775s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 775s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 775s libdistro-info-perl is not installed, Debian release names are not known. 775s libdistro-info-perl is not installed, Ubuntu release names are not known. 775s + git commit -m 'dch -r -D unstable ' debian/changelog 775s [master c8629cf] dch -r -D unstable 775s 1 file changed, 3 insertions(+), 2 deletions(-) 775s + echo garbage 775s + git add debian/patches/garbage 775s + git commit -m 'add garbage' debian/patches/garbage 775s [master 07528ed] add garbage 775s 1 file changed, 1 insertion(+) 775s create mode 100644 debian/patches/garbage 775s + : t-archive-none example 775s + : t-git-none 775s + : t-dgit -wgf --gbp push-source --new 775s + t-salsa-add-remote 775s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 775s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 775s + set -e 775s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 775s + git init --bare 775s hint: Using 'master' as the name for the initial branch. This default branch name 775s hint: is subject to change. To configure the initial branch name to use in all 775s hint: of your new repositories, which will suppress this warning, call: 775s hint: 775s hint: git config --global init.defaultBranch 775s hint: 775s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 775s hint: 'development'. The just-created branch can be renamed via this command: 775s hint: 775s hint: git branch -m 775s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 775s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 775s + git push --set-upstream origin master 775s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 775s * [new branch] master -> master 775s Branch 'master' set up to track remote branch 'master' from 'origin'. 775s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 775s + local 'mpat=E:identical in upstream files' 775s + shift 775s + set +o pipefail 775s + LC_MESSAGES=C 775s + LANGUAGE=C 775s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 775s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local gdr=git-debrebase 775s + : ' 775s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 775s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 775s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 775s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x36 775s docs/README | 1 + 775s 1 file changed, 1 insertion(+) 775s 775s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 775s git-debrebase: identical in upstream files. See diffstat above, or run 775s git-debrebase: git diff 98d1ef33f97b1baf0e88f735213286f40a2d2980 HEAD -- :!/debian :/ 775s + local 'ps=255 0' 775s + set -o pipefail 775s + case $ps in 775s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local 'mpat=E:identical in upstream files' 775s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local grepper=fgrep 775s + case "$mpat" in 775s + case "$mpat" in 775s + grepper=egrep 775s + mpat='identical in upstream files' 775s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s git-debrebase: identical in upstream files. See diffstat above, or run 775s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 775s + local 'mpat=E:Unused patch file garbage will be discarded' 775s + shift 775s + set +o pipefail 775s + LC_MESSAGES=C 775s + LANGUAGE=C 775s + t-git-debrebase -fupstream-has-debian convert-from-gbp 775s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local gdr=git-debrebase 775s + : ' 775s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 775s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 775s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 775s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 775s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 775s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 775s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 775s $VAR2 = bless( do{\(my $o = { 775s 'in_order' => [ 775s 'Source', 775s 'Version', 775s 'Distribution', 775s 'Urgency', 775s 'Maintainer', 775s 'Timestamp', 775s 'Date', 775s 'Changes' 775s ], 775s 'allow_pgp' => 1, 775s 'out_order' => [], 775s 'is_pgp_signed' => 0, 775s 'name' => 'debian/changelog, entry no.1', 775s 'fields' => { 775s 'Source' => 'example', 775s 'Version' => '2.0-1', 775s 'Distribution' => 'unstable', 775s 'Urgency' => 'medium', 775s 'Maintainer' => 'dgit test git user ', 775s 'Timestamp' => '1530000000', 775s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 775s 'Changes' => ' 775s example (2.0-1) unstable; urgency=medium 775s 775s [ Ian Jackson ] 775s * new upstream (did gbp import-orig)' 775s }, 775s 'allow_duplicate' => 0, 775s 'keep_duplicate' => 0, 775s 'drop_empty' => 0 775s })}, 'Dpkg::Control::Hash' ); 775s last finished-looking changelog entry: (2.0-1) unstable 775s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 775s Failed to stitch in dgit view (see messages above). 775s dgit --overwrite will be needed on the first dgit push after conversion. 775s git-debrebase: snags: 1 overriden by individual -f options 775s 775s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 775s + local 'ps=255 0' 775s + set -o pipefail 775s + case $ps in 775s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local 'mpat=E:Unused patch file garbage will be discarded' 775s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s + local grepper=fgrep 775s + case "$mpat" in 775s + case "$mpat" in 775s + grepper=egrep 775s + mpat='Unused patch file garbage will be discarded' 775s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 775s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 775s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 775s + local gdr=git-debrebase 775s + : ' 775s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 775s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 775s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 775s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 775s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 775s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 775s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 775s $VAR2 = bless( do{\(my $o = { 775s 'out_order' => [], 775s 'name' => 'debian/changelog, entry no.1', 775s 'allow_pgp' => 1, 775s 'in_order' => [ 775s 'Source', 775s 'Version', 775s 'Distribution', 775s 'Urgency', 775s 'Maintainer', 775s 'Timestamp', 775s 'Date', 775s 'Changes' 775s ], 775s 'allow_duplicate' => 0, 775s 'fields' => { 775s 'Source' => 'example', 775s 'Version' => '2.0-1', 775s 'Distribution' => 'unstable', 775s 'Urgency' => 'medium', 775s 'Maintainer' => 'dgit test git user ', 775s 'Timestamp' => '1530000000', 775s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 775s 'Changes' => ' 775s example (2.0-1) unstable; urgency=medium 775s 775s [ Ian Jackson ] 775s * new upstream (did gbp import-orig)' 775s }, 775s 'drop_empty' => 0, 775s 'keep_duplicate' => 0, 775s 'is_pgp_signed' => 0 775s })}, 'Dpkg::Control::Hash' ); 775s last finished-looking changelog entry: (2.0-1) unstable 775s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 775s Failed to stitch in dgit view (see messages above). 775s dgit --overwrite will be needed on the first dgit push after conversion. 775s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 775s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 775s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 775s gbp:info: Trying to apply patches at '07528ed443e7bf250b829b6c1d391c42507ce2b1' 775s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 776s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 776s git-debrebase ffq check_specs * 776s git-debrebase ffq merge master 776s git-debrebase ffq check_remote origin remote fetch/merge branch 776s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 776s OK, you are ahead of refs/remotes/origin/master 776s git-debrebase ffq check_remote undef remote push branch 776s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 776s git-debrebase: snags: 2 overriden by individual -f options 776s git-debrebase >= update refs/debrebase-last/heads/master f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 0000000000000000000000000000000000000000 776s git-debrebase >= update HEAD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 07528ed443e7bf250b829b6c1d391c42507ce2b1 776s git-debrebase >$ 776s HEAD is now at f5ce088 Add another new upstream file 776s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 776s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 776s ' 776s + git branch converted-from-gbp 776s + v=2.0-2 776s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 776s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 776s + DEBEMAIL=dgit-tests@example.org 776s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 776s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 776s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 776s [master f4c946a] dch -v 2.0-2 -m switch to git-debrebase, no other changes 776s 1 file changed, 6 insertions(+) 776s + t-dch-commit-r 776s + t-dch-r-rune t-dch-commit 776s + local cmd=t-dch-commit 776s + shift 776s + local suite=unstable 776s + t-dch-commit -r -D unstable '' 776s + t-debchange -r -D unstable '' 776s + DEBEMAIL=dgit-tests@example.org 776s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 776s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 776s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 776s libdistro-info-perl is not installed, Debian release names are not known. 776s libdistro-info-perl is not installed, Ubuntu release names are not known. 776s + git commit -m 'dch -r -D unstable ' debian/changelog 776s [master 2306c75] dch -r -D unstable 776s 1 file changed, 1 insertion(+), 1 deletion(-) 776s + : t-dgit -wgf push-source --new 776s + git push 776s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 776s 07528ed..2306c75 master -> master 776s + cd .. 776s + : t-archive-process-incoming sid 776s ++ echo example example_2.0.orig.tar.gz 776s ++ : echo git mirror aq 776s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 776s . $troot/lib-gdr 776s t-tstunt-parsechangelog 776s p=example 776s t-git-next-date 776s ' 776s + local savevars= 776s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 776s + local 'importeval= 776s . $troot/lib-gdr 776s t-tstunt-parsechangelog 776s p=example 776s t-git-next-date 776s ' 776s + local import=IMPORT.gdr-convert-gbp-noarchive 776s + exec 776s + local vn 776s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 776s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 776s print STDERR "saving-exporting $vn\n"; 776s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 776s or die $!; 776s } 776s ' 776s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 776s saving-exporting DGIT_TEST_REAL_DEBCHANGE 776s + set -e 776s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 776s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 776s + printf '\n%s\n' ' 776s . $troot/lib-gdr 776s t-tstunt-parsechangelog 776s p=example 776s t-git-next-date 776s ' 776s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 776s + rc=0 776s + set +x 776s + set +e 776s + pwd 776s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 776s + '[' x '!=' x ']' 776s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 776s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 776s + set -e 776s + test 0 = 0 776s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 776s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 776s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 776s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 776s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 776s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 776s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 776s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 776s +++ : -D 776s +++ export GDR_TEST_DEBUG 776s +++ t-tstunt debchange 776s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s +++ local var=PATH 776s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s +++ eval ' 776s case "$PATH" in 776s "$tstunt:"*) ;; 776s *":$tstunt:"*) ;; 776s "") PATH="$tstunt" ;; 776s *) PATH="$tstunt:$PATH" ;; 776s esac 776s export PATH 776s ' 776s ++++ case "$PATH" in 776s ++++ export PATH 776s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s +++ local var=PERLLIB 776s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s +++ eval ' 776s case "$PERLLIB" in 776s "$tstunt:"*) ;; 776s *":$tstunt:"*) ;; 776s "") PERLLIB="$tstunt" ;; 776s *) PERLLIB="$tstunt:$PERLLIB" ;; 776s esac 776s export PERLLIB 776s ' 776s ++++ case "$PERLLIB" in 776s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++++ export PERLLIB 776s +++ local f 776s +++ for f in "$@" 776s +++ t-tstunt--save-real debchange 776s +++ local f=debchange 776s +++ case "$f" in 776s +++ local rc 776s +++ local real 776s +++ set +e 776s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 776s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 776s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s ++++ type -p debchange 776s +++ real=/usr/bin/debchange 776s +++ rc=0 776s +++ set -e 776s +++ case $rc in 776s +++ local varname=debchange 776s +++ varname=DGIT_TEST_REAL_DEBCHANGE 776s +++ eval ' 776s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 776s export DGIT_TEST_REAL_DEBCHANGE 776s ' 776s ++++ : /usr/bin/debchange 776s ++++ export DGIT_TEST_REAL_DEBCHANGE 776s +++ f=./debchange 776s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 776s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 776s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 776s ++ t-tstunt-parsechangelog 776s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 776s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++ local var=PATH 776s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++ eval ' 776s case "$PATH" in 776s "$tstunt:"*) ;; 776s *":$tstunt:"*) ;; 776s "") PATH="$tstunt" ;; 776s *) PATH="$tstunt:$PATH" ;; 776s esac 776s export PATH 776s ' 776s +++ case "$PATH" in 776s +++ export PATH 776s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++ local var=PERLLIB 776s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 776s ++ eval ' 776s case "$PERLLIB" in 776s "$tstunt:"*) ;; 776s *":$tstunt:"*) ;; 776s "") PERLLIB="$tstunt" ;; 776s *) PERLLIB="$tstunt:$PERLLIB" ;; 776s esac 776s export PERLLIB 776s ' 776s +++ case "$PERLLIB" in 776s +++ export PERLLIB 776s ++ local f 776s ++ for f in "$@" 776s ++ t-tstunt--save-real dpkg-parsechangelog 776s ++ local f=dpkg-parsechangelog 776s ++ case "$f" in 776s ++ local rc 776s ++ local real 776s ++ set +e 776s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 776s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 776s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 776s +++ type -p dpkg-parsechangelog 776s ++ real=/usr/bin/dpkg-parsechangelog 776s ++ rc=0 776s ++ set -e 776s ++ case $rc in 776s ++ local varname=dpkg_parsechangelog 776s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 776s ++ eval ' 776s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 776s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 776s ' 776s +++ : /usr/bin/dpkg-parsechangelog 776s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 776s ++ f=./dpkg-parsechangelog 776s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 776s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 776s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 776s ++ for f in "$@" 776s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 776s ++ local f=Dpkg/Changelog/Parse.pm 776s ++ case "$f" in 776s ++ return 776s ++ f=./Dpkg/Changelog/Parse.pm 776s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 776s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 776s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 776s ++ p=example 776s ++ t-git-next-date 776s ++ GIT_COMMITTER_DATE='1530000001 +0100' 776s ++ GIT_AUTHOR_DATE='1530000001 +0100' 776s + cd example 776s + t-gdr-prep-new-upstream 2.1 776s + uv=2.1 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000002 +0100' 776s + GIT_AUTHOR_DATE='1530000002 +0100' 776s + git checkout make-upstream 776s Switched to branch 'make-upstream' 776s + git reset --hard upstream 776s HEAD is now at dcacb60 New upstream version 2.0 776s + t-make-new-upstream-tarball 2.1 776s + local uv=2.1 776s + git checkout make-upstream 776s Already on 'make-upstream' 776s + echo 'upstream 2.1' 776s + git commit -a -m 'upstream 2.1 tarball' 776s [make-upstream 9638c21] upstream 2.1 tarball 776s 1 file changed, 1 insertion(+) 776s + t-make-orig example 2.1 make-upstream 776s + local p=example 776s + local v=2.1 776s + local tag=make-upstream 776s + ust=example_2.1.orig.tar.gz 776s + GZIP=-1 776s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 776s gzip: warning: GZIP environment variable is deprecated; use an alias or script 776s + git push . make-upstream:upstream 776s To . 776s dcacb60..9638c21 make-upstream -> upstream 776s + git checkout master 776s Switched to branch 'master' 776s Your branch is up to date with 'origin/master'. 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000003 +0100' 776s + GIT_AUTHOR_DATE='1530000003 +0100' 776s + git tag v2.1 upstream 776s + t-some-changes before 776s + local token=before 776s + local which=dum 776s + local fsuffix= 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000004 +0100' 776s + GIT_AUTHOR_DATE='1530000004 +0100' 776s + case "$which" in 776s + echo '// debian before' 776s + git add debian/zorkmid 776s + git commit -m 'DEBIAN add zorkmid (before)' 776s [master 0587219] DEBIAN add zorkmid (before) 776s 1 file changed, 1 insertion(+) 776s create mode 100644 debian/zorkmid 776s + case "$which" in 776s + echo '// upstream before' 776s + git add src.c 776s + git commit -m 'UPSTREAM edit src.c (before)' 776s [master 299a175] UPSTREAM edit src.c (before) 776s 1 file changed, 1 insertion(+) 776s + case "$which" in 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! before' 776s + git add debian/zorkmid 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! before' 776s + git add src.c 776s + git commit -m 'MIXED add both() (before)' 776s [master 6edd94b] MIXED add both() (before) 776s 2 files changed, 2 insertions(+) 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000005 +0100' 776s + GIT_AUTHOR_DATE='1530000005 +0100' 776s + t-git-debrebase quick 776s + local gdr=git-debrebase 776s + : ' 776s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 776s + git-debrebase --dgit=dgit -D quick 776s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 776s git-debrebase ffq check_specs * 776s git-debrebase ffq merge master 776s git-debrebase ffq check_remote origin remote fetch/merge branch 776s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 776s OK, you are ahead of refs/remotes/origin/master 776s git-debrebase ffq check_remote undef remote push branch 776s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 776s git-debrebase *** WALK 6edd94b52b631f4746ff2c69392544c34fb93858 0 - 776s git-debrebase get_differs 299a175a7921ccba31c38ead9121ac2175ffdd70 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x22 776s git-debrebase classify 6edd94b52b631f4746ff2c69392544c34fb93858 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 299a175a7921ccba31c38ead9121ac2175ffdd70/0x22 776s git-debrebase = Mixed {"Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "299a175a7921ccba31c38ead9121ac2175ffdd70"}],"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 299a175a7921ccba31c38ead9121ac2175ffdd70\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Type" => "Mixed","Msg" => "MIXED add both() (before)\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 776s git-debrebase get_differs 0587219583bd15627aa416fed7ba35b78462ba0e ccd4a7c462d0e0b559590a43d0b920471105a2a6 = 0x2 776s git-debrebase classify 299a175a7921ccba31c38ead9121ac2175ffdd70 $t=ccd4a7c462d0e0b559590a43d0b920471105a2a6 @p 0587219583bd15627aa416fed7ba35b78462ba0e/0x2 776s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "ccd4a7c462d0e0b559590a43d0b920471105a2a6","Parents" => [{"CommitId" => "0587219583bd15627aa416fed7ba35b78462ba0e","Differs" => 2,"Ix" => 0}],"CommitId" => "299a175a7921ccba31c38ead9121ac2175ffdd70","Hdr" => "tree ccd4a7c462d0e0b559590a43d0b920471105a2a6\nparent 0587219583bd15627aa416fed7ba35b78462ba0e\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n"} 776s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 86d647b7fb482f29d7d648111f8ab4f4953b3233 = 0x20 776s git-debrebase classify 0587219583bd15627aa416fed7ba35b78462ba0e $t=86d647b7fb482f29d7d648111f8ab4f4953b3233 @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x20 776s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","Tree" => "86d647b7fb482f29d7d648111f8ab4f4953b3233","Parents" => [{"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Differs" => 32,"Ix" => 0}],"CommitId" => "0587219583bd15627aa416fed7ba35b78462ba0e","Hdr" => "tree 86d647b7fb482f29d7d648111f8ab4f4953b3233\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n"} 776s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 776s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 776s git-debrebase = Changelog {"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Parents" => [{"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Ix" => 0,"Differs" => 16}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 776s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 776s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 776s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Parents" => [{"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Ix" => 0,"Differs" => 16}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 776s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 776s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 776s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"}],"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 776s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 776s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 776s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4"}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 776s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 776s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 776s git-debrebase = Upstream {"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 776s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 776s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 776s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 776s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 776s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 4 upp 4 proc 9 pm -1 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 776s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 10 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 776s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 776s git-debrebase WALK REWRITING NOW cl=HASH(0x55ea2e59ebb8) procd=HASH(0x55ea2dac7540) 776s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 776s git-debrebase WALK BUILD 0587219583bd15627aa416fed7ba35b78462ba0e Debian (rewriting=1) 776s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 776s git-debrebase WALK BUILD 6edd94b52b631f4746ff2c69392544c34fb93858 Debian (rewriting=1) 776s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 776s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 776s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 776s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 776s git-debrebase WALK BUILD 299a175a7921ccba31c38ead9121ac2175ffdd70 Upstream (rewriting=1) 776s git-debrebase WALK BUILD 6edd94b52b631f4746ff2c69392544c34fb93858 Upstream (rewriting=1) 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 776s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 6edd94b52b631f4746ff2c69392544c34fb93858 = 0 776s git-debrebase *** WALK RETURN 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 776s git-debrebase: laundered (head was 6edd94b52b631f4746ff2c69392544c34fb93858) 776s git-debrebase >= update refs/ffq-prev/heads/master 6edd94b52b631f4746ff2c69392544c34fb93858 0000000000000000000000000000000000000000 776s git-debrebase >= delete refs/debrebase-last/heads/master 776s git-debrebase >= update HEAD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 6edd94b52b631f4746ff2c69392544c34fb93858 776s git-debrebase >$ 776s Recorded previous head for preservation 776s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 776s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 776s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 776s git-debrebase = Upstream {"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Parents" => [{"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Ix" => 0,"Differs" => 2}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 776s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 776s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 776s git-debrebase = Upstream {"Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183"}],"Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream"} 776s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 776s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 776s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 776s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 776s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 776s git-debrebase = Upstream {"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Parents" => [{"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 776s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 776s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 776s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 776s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 776s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 776s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 776s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 776s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 776s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32,"Ix" => 0}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n"} 776s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 776s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 776s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 776s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 776s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 776s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16,"Ix" => 0}]} 776s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 776s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 776s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 776s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 776s git-debrebase >= delete refs/ffq-prev/heads/master 6edd94b52b631f4746ff2c69392544c34fb93858 776s git-debrebase >= update refs/debrebase-last/heads/master 25b5400e549fae4178ac03009ca007e4d5de00dc 0000000000000000000000000000000000000000 776s git-debrebase >= update HEAD 25b5400e549fae4178ac03009ca007e4d5de00dc 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 776s git-debrebase >$ 776s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 776s ' 776s + : ----- prepare LH branch ----- 776s + git checkout -b other 776s Switched to a new branch 'other' 776s + t-some-changes other '' -other 776s + local token=other 776s + local which=dum 776s + local fsuffix=-other 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000006 +0100' 776s + GIT_AUTHOR_DATE='1530000006 +0100' 776s + case "$which" in 776s + echo '// debian other' 776s + git add debian/zorkmid-other 776s + git commit -m 'DEBIAN add zorkmid-other (other)' 776s [other 16fdcfc] DEBIAN add zorkmid-other (other) 776s 1 file changed, 1 insertion(+) 776s create mode 100644 debian/zorkmid-other 776s + case "$which" in 776s + echo '// upstream other' 776s + git add src-other.c 776s + git commit -m 'UPSTREAM edit src-other.c (other)' 776s [other c441f3b] UPSTREAM edit src-other.c (other) 776s 1 file changed, 1 insertion(+) 776s create mode 100644 src-other.c 776s + case "$which" in 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! other' 776s + git add debian/zorkmid-other 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! other' 776s + git add src-other.c 776s + git commit -m 'MIXED add both(-other) (other)' 776s [other cef09e1] MIXED add both(-other) (other) 776s 2 files changed, 2 insertions(+) 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000007 +0100' 776s + GIT_AUTHOR_DATE='1530000007 +0100' 776s + echo other-conflict 776s + git commit -m other-conflict debian/zorkmid 776s [other 5c115b3] other-conflict 776s 1 file changed, 1 insertion(+) 776s + : ----- prepare RH branch ----- 776s + git checkout master 776s Switched to branch 'master' 776s Your branch is ahead of 'origin/master' by 13 commits. 776s (use "git push" to publish your local commits) 776s + t-some-changes us-1 '' -us 776s + local token=us-1 776s + local which=dum 776s + local fsuffix=-us 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000008 +0100' 776s + GIT_AUTHOR_DATE='1530000008 +0100' 776s + case "$which" in 776s + echo '// debian us-1' 776s + git add debian/zorkmid-us 776s + git commit -m 'DEBIAN add zorkmid-us (us-1)' 776s [master f477334] DEBIAN add zorkmid-us (us-1) 776s 1 file changed, 1 insertion(+) 776s create mode 100644 debian/zorkmid-us 776s + case "$which" in 776s + echo '// upstream us-1' 776s + git add src-us.c 776s + git commit -m 'UPSTREAM edit src-us.c (us-1)' 776s [master 09abdf0] UPSTREAM edit src-us.c (us-1) 776s 1 file changed, 1 insertion(+) 776s create mode 100644 src-us.c 776s + case "$which" in 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! us-1' 776s + git add debian/zorkmid-us 776s + for f in debian/zorkmid$fsuffix src$fsuffix.c 776s + echo '// both! us-1' 776s + git add src-us.c 776s + git commit -m 'MIXED add both(-us) (us-1)' 776s [master 328d240] MIXED add both(-us) (us-1) 776s 2 files changed, 2 insertions(+) 776s + t-git-next-date 776s + GIT_COMMITTER_DATE='1530000009 +0100' 776s + GIT_AUTHOR_DATE='1530000009 +0100' 776s + t-git-debrebase new-upstream 2.1 776s + local gdr=git-debrebase 776s + : ' 776s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 776s + git-debrebase --dgit=dgit -D new-upstream 2.1 776s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 776s git-debrebase ffq check_specs * 776s git-debrebase ffq merge master 776s git-debrebase ffq check_remote origin remote fetch/merge branch 776s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 776s OK, you are ahead of refs/remotes/origin/master 776s git-debrebase ffq check_remote undef remote push branch 776s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 776s git-debrebase *** WALK 328d24039a38cc4aee804e69e33ede6c84c0898b 0 - 776s git-debrebase get_differs 09abdf01758a36d147f229d53d63daa49322ab3c 319adb4c2478530b475190beede9d125f3710a27 = 0x22 776s git-debrebase classify 328d24039a38cc4aee804e69e33ede6c84c0898b $t=319adb4c2478530b475190beede9d125f3710a27 @p 09abdf01758a36d147f229d53d63daa49322ab3c/0x22 776s git-debrebase = Mixed {"Msg" => "MIXED add both(-us) (us-1)\n","Tree" => "319adb4c2478530b475190beede9d125f3710a27","Parents" => [{"Differs" => 34,"CommitId" => "09abdf01758a36d147f229d53d63daa49322ab3c","Ix" => 0}],"Type" => "Mixed","Hdr" => "tree 319adb4c2478530b475190beede9d125f3710a27\nparent 09abdf01758a36d147f229d53d63daa49322ab3c\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "328d24039a38cc4aee804e69e33ede6c84c0898b"} 776s git-debrebase get_differs f4773342a1bf9198aed7116331be0b283239d972 3ef50c5188f657defd2a1d3bc41d901fd2957252 = 0x2 776s git-debrebase classify 09abdf01758a36d147f229d53d63daa49322ab3c $t=3ef50c5188f657defd2a1d3bc41d901fd2957252 @p f4773342a1bf9198aed7116331be0b283239d972/0x2 776s git-debrebase = Upstream {"CommitId" => "09abdf01758a36d147f229d53d63daa49322ab3c","Tree" => "3ef50c5188f657defd2a1d3bc41d901fd2957252","Parents" => [{"Ix" => 0,"CommitId" => "f4773342a1bf9198aed7116331be0b283239d972","Differs" => 2}],"Msg" => "UPSTREAM edit src-us.c (us-1)\n","Type" => "Upstream","Hdr" => "tree 3ef50c5188f657defd2a1d3bc41d901fd2957252\nparent f4773342a1bf9198aed7116331be0b283239d972\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 776s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc b23b43bb55e90626a611f0de710a63a5c0af9778 = 0x20 776s git-debrebase classify f4773342a1bf9198aed7116331be0b283239d972 $t=b23b43bb55e90626a611f0de710a63a5c0af9778 @p 25b5400e549fae4178ac03009ca007e4d5de00dc/0x20 776s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid-us (us-1)\n","Parents" => [{"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Differs" => 32,"Ix" => 0}],"Tree" => "b23b43bb55e90626a611f0de710a63a5c0af9778","Type" => "Packaging","Hdr" => "tree b23b43bb55e90626a611f0de710a63a5c0af9778\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "f4773342a1bf9198aed7116331be0b283239d972"} 776s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 776s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 776s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 776s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Parents" => [{"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Differs" => 0,"Ix" => 0},{"Differs" => 0,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]],"SubType" => "Ambiguous","Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"} 776s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 776s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 776s git-debrebase = Upstream {"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Parents" => [{"Differs" => 2,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream"} 776s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 776s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 776s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Parents" => [{"Ix" => 0,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (before)\n","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3"} 776s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 776s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 776s git-debrebase = Upstream {"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Parents" => [{"Differs" => 2,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183"} 776s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 776s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 776s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0}],"Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"} 776s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 776s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 776s git-debrebase = Upstream {"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Type" => "Upstream","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}],"Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 776s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 776s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 776s git-debrebase = Packaging {"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0}],"Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 776s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 776s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 776s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Parents" => [{"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"} 776s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 776s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 776s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 776s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 776s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 776s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 776s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 776s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 776s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 776s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 776s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 6 upp 7 proc 15 pm 0 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 776s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 16 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 777s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 777s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 777s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 777s git-debrebase WALK BUILD f4773342a1bf9198aed7116331be0b283239d972 Debian (rewriting=0) 777s git-debrebase WALK REWRITING NOW cl=HASH(0x564c07f124b8) procd=HASH(0x564c07fa27e8) 777s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 777s git-debrebase WALK BUILD 328d24039a38cc4aee804e69e33ede6c84c0898b Debian (rewriting=1) 777s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 777s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=1) 777s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=1) 777s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=1) 777s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=1) 777s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=1) 777s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 777s git-debrebase WALK BUILD 09abdf01758a36d147f229d53d63daa49322ab3c Upstream (rewriting=1) 777s git-debrebase WALK BUILD 328d24039a38cc4aee804e69e33ede6c84c0898b Upstream (rewriting=1) 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase get_differs 7360c49c442f77595ab98fb9917cf412da49db3f 328d24039a38cc4aee804e69e33ede6c84c0898b = 0 777s git-debrebase *** WALK RETURN 7360c49c442f77595ab98fb9917cf412da49db3f d835bca600c6f88d12ac89e3300900cceb7eaf7a 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 777s git-debrebase get_differs ebe21018c3e7e35d711eae425055e38ace156108 00e96a7b98e009a756e519af6302d1eeaa848e52 = 0x20 777s git-debrebase classify d835bca600c6f88d12ac89e3300900cceb7eaf7a $t=00e96a7b98e009a756e519af6302d1eeaa848e52 @p ebe21018c3e7e35d711eae425055e38ace156108/0x20 777s git-debrebase = Packaging {"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "ebe21018c3e7e35d711eae425055e38ace156108","Differs" => 32}],"Tree" => "00e96a7b98e009a756e519af6302d1eeaa848e52","Hdr" => "tree 00e96a7b98e009a756e519af6302d1eeaa848e52\nparent ebe21018c3e7e35d711eae425055e38ace156108\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Packaging","CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a"} 777s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 777s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 777s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 777s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 777s git-debrebase %pieces = {"" => {"NewIx" => 0,"New" => "9638c2110033b719cc742997b9527505ffdc1a65","OldIx" => 0,"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Name" => "","Desc" => "upstream (main piece"}} 777s git-debrebase @newpieces = [{"NewIx" => 0,"New" => "9638c2110033b719cc742997b9527505ffdc1a65","OldIx" => 0,"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Name" => "","Desc" => "upstream (main piece"}] 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s + exec env TZ=UTC faketime -f 2018-06-26 08:00:09 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase: laundered (head was 328d24039a38cc4aee804e69e33ede6c84c0898b) 777s git-debrebase >= update refs/ffq-prev/heads/master 328d24039a38cc4aee804e69e33ede6c84c0898b 0000000000000000000000000000000000000000 777s git-debrebase >= delete refs/debrebase-last/heads/master 777s git-debrebase >= update HEAD 7360c49c442f77595ab98fb9917cf412da49db3f 328d24039a38cc4aee804e69e33ede6c84c0898b 777s git-debrebase >$ 777s Recorded previous head for preservation 777s Rebasing (1/7) Rebasing (2/7) Rebasing (3/7) Rebasing (4/7) Rebasing (5/7) Rebasing (6/7) Rebasing (7/7) Successfully rebased and updated refs/heads/master. 777s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 777s ' 777s + t-some-changes us-2 '' -us 777s + local token=us-2 777s + local which=dum 777s + local fsuffix=-us 777s + t-git-next-date 777s + GIT_COMMITTER_DATE='1530000010 +0100' 777s + GIT_AUTHOR_DATE='1530000010 +0100' 777s + case "$which" in 777s + echo '// debian us-2' 777s + git add debian/zorkmid-us 777s + git commit -m 'DEBIAN add zorkmid-us (us-2)' 777s [master a7ec4a4] DEBIAN add zorkmid-us (us-2) 777s 1 file changed, 1 insertion(+) 777s + case "$which" in 777s + echo '// upstream us-2' 777s + git add src-us.c 777s + git commit -m 'UPSTREAM edit src-us.c (us-2)' 777s [master fbfbf10] UPSTREAM edit src-us.c (us-2) 777s 1 file changed, 1 insertion(+) 777s + case "$which" in 777s + for f in debian/zorkmid$fsuffix src$fsuffix.c 777s + echo '// both! us-2' 777s + git add debian/zorkmid-us 777s + for f in debian/zorkmid$fsuffix src$fsuffix.c 777s + echo '// both! us-2' 777s + git add src-us.c 777s + git commit -m 'MIXED add both(-us) (us-2)' 777s [master d38b7f4] MIXED add both(-us) (us-2) 777s 2 files changed, 2 insertions(+) 777s + t-git-next-date 777s + GIT_COMMITTER_DATE='1530000011 +0100' 777s + GIT_AUTHOR_DATE='1530000011 +0100' 777s + echo us-conflict 777s + git commit -m us-conflict debian/zorkmid 777s [master fce5195] us-conflict 777s 1 file changed, 1 insertion(+) 777s + t-git-debrebase quick 777s + local gdr=git-debrebase 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + git-debrebase --dgit=dgit -D quick 777s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 777s git-debrebase *** WALK fce5195a517ca73ca1f05caaf79cdac906f6fa42 0 - 777s git-debrebase get_differs d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11 e38de421676caa1148e6e5d6e455bf955514342f = 0x20 777s git-debrebase classify fce5195a517ca73ca1f05caaf79cdac906f6fa42 $t=e38de421676caa1148e6e5d6e455bf955514342f @p d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11/0x20 777s git-debrebase = Packaging {"Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11"}],"Msg" => "us-conflict\n","CommitId" => "fce5195a517ca73ca1f05caaf79cdac906f6fa42","Type" => "Packaging","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f"} 777s git-debrebase get_differs fbfbf103a4f817669f924bbc7ee95357738af3ff baa9d1434e38fe40e0c5396228a31a19fe67d140 = 0x22 777s git-debrebase classify d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11 $t=baa9d1434e38fe40e0c5396228a31a19fe67d140 @p fbfbf103a4f817669f924bbc7ee95357738af3ff/0x22 777s git-debrebase = Mixed {"Hdr" => "tree baa9d1434e38fe40e0c5396228a31a19fe67d140\nparent fbfbf103a4f817669f924bbc7ee95357738af3ff\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n","Parents" => [{"CommitId" => "fbfbf103a4f817669f924bbc7ee95357738af3ff","Ix" => 0,"Differs" => 34}],"CommitId" => "d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11","Tree" => "baa9d1434e38fe40e0c5396228a31a19fe67d140","Type" => "Mixed"} 777s git-debrebase get_differs a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a 080e8d204c6d5f1d877d1f1ea033f9a3f689ab38 = 0x2 777s git-debrebase classify fbfbf103a4f817669f924bbc7ee95357738af3ff $t=080e8d204c6d5f1d877d1f1ea033f9a3f689ab38 @p a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a/0x2 777s git-debrebase = Upstream {"CommitId" => "fbfbf103a4f817669f924bbc7ee95357738af3ff","Type" => "Upstream","Tree" => "080e8d204c6d5f1d877d1f1ea033f9a3f689ab38","Hdr" => "tree 080e8d204c6d5f1d877d1f1ea033f9a3f689ab38\nparent a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-2)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a"}]} 777s git-debrebase get_differs 7fee82b343033f8387c267d47636024ad4fc46ab 9d94f28bccabdde881eece4ca59005a478b23e66 = 0x20 777s git-debrebase classify a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a $t=9d94f28bccabdde881eece4ca59005a478b23e66 @p 7fee82b343033f8387c267d47636024ad4fc46ab/0x20 777s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "9d94f28bccabdde881eece4ca59005a478b23e66","CommitId" => "a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Parents" => [{"CommitId" => "7fee82b343033f8387c267d47636024ad4fc46ab","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 9d94f28bccabdde881eece4ca59005a478b23e66\nparent 7fee82b343033f8387c267d47636024ad4fc46ab\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 777s git-debrebase get_differs 7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc 619429df0fa739873f84522577953fa910fdc293 = 0x2 777s git-debrebase classify 7fee82b343033f8387c267d47636024ad4fc46ab $t=619429df0fa739873f84522577953fa910fdc293 @p 7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc/0x2 777s git-debrebase = Upstream {"CommitId" => "7fee82b343033f8387c267d47636024ad4fc46ab","Type" => "Upstream","Tree" => "619429df0fa739873f84522577953fa910fdc293","Hdr" => "tree 619429df0fa739873f84522577953fa910fdc293\nparent 7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc","Differs" => 2,"Ix" => 0}]} 777s git-debrebase get_differs 12d829757028bbae15e1c97c08ebf6bd31a01b1d 01dac0365d50474b5282555dd542bfa89cedf668 = 0x2 777s git-debrebase classify 7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc $t=01dac0365d50474b5282555dd542bfa89cedf668 @p 12d829757028bbae15e1c97c08ebf6bd31a01b1d/0x2 777s git-debrebase = Upstream {"Hdr" => "tree 01dac0365d50474b5282555dd542bfa89cedf668\nparent 12d829757028bbae15e1c97c08ebf6bd31a01b1d\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Parents" => [{"CommitId" => "12d829757028bbae15e1c97c08ebf6bd31a01b1d","Differs" => 2,"Ix" => 0}],"CommitId" => "7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc","Type" => "Upstream","Tree" => "01dac0365d50474b5282555dd542bfa89cedf668"} 777s git-debrebase get_differs b69e902ea1e41e228ece7e41981854cdb2889796 e26ab200a6c6e86af43e42998cfbc10caca316bf = 0x2 777s git-debrebase classify 12d829757028bbae15e1c97c08ebf6bd31a01b1d $t=e26ab200a6c6e86af43e42998cfbc10caca316bf @p b69e902ea1e41e228ece7e41981854cdb2889796/0x2 777s git-debrebase = Upstream {"CommitId" => "12d829757028bbae15e1c97c08ebf6bd31a01b1d","Tree" => "e26ab200a6c6e86af43e42998cfbc10caca316bf","Type" => "Upstream","Hdr" => "tree e26ab200a6c6e86af43e42998cfbc10caca316bf\nparent b69e902ea1e41e228ece7e41981854cdb2889796\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "b69e902ea1e41e228ece7e41981854cdb2889796","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 777s git-debrebase get_differs 9f52a104fceba05b485cac9ed1cdf9a85ccd57ae 6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047 = 0x2 777s git-debrebase classify b69e902ea1e41e228ece7e41981854cdb2889796 $t=6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047 @p 9f52a104fceba05b485cac9ed1cdf9a85ccd57ae/0x2 777s git-debrebase = Upstream {"CommitId" => "b69e902ea1e41e228ece7e41981854cdb2889796","Type" => "Upstream","Tree" => "6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047","Hdr" => "tree 6ff2df1a1f33b4082a03d1b1ff0c1bcb7758d047\nparent 9f52a104fceba05b485cac9ed1cdf9a85ccd57ae\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "9f52a104fceba05b485cac9ed1cdf9a85ccd57ae"}]} 777s git-debrebase get_differs 88253b6b0524255f38f934b875d04d88937fa9be ea4e1694b6f490d2c02ce8461f745974dbc087b0 = 0x2 777s git-debrebase classify 9f52a104fceba05b485cac9ed1cdf9a85ccd57ae $t=ea4e1694b6f490d2c02ce8461f745974dbc087b0 @p 88253b6b0524255f38f934b875d04d88937fa9be/0x2 777s git-debrebase = Upstream {"Parents" => [{"CommitId" => "88253b6b0524255f38f934b875d04d88937fa9be","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree ea4e1694b6f490d2c02ce8461f745974dbc087b0\nparent 88253b6b0524255f38f934b875d04d88937fa9be\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Tree" => "ea4e1694b6f490d2c02ce8461f745974dbc087b0","CommitId" => "9f52a104fceba05b485cac9ed1cdf9a85ccd57ae"} 777s git-debrebase get_differs e89f93fe74a521e71ba510a066a385e24590dd76 599cbc546fb8b019ccfe44b13fa91d69602459aa = 0x2 777s git-debrebase classify 88253b6b0524255f38f934b875d04d88937fa9be $t=599cbc546fb8b019ccfe44b13fa91d69602459aa @p e89f93fe74a521e71ba510a066a385e24590dd76/0x2 777s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e89f93fe74a521e71ba510a066a385e24590dd76","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 599cbc546fb8b019ccfe44b13fa91d69602459aa\nparent e89f93fe74a521e71ba510a066a385e24590dd76\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "599cbc546fb8b019ccfe44b13fa91d69602459aa","Type" => "Upstream","CommitId" => "88253b6b0524255f38f934b875d04d88937fa9be"} 777s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 0d18055565ebd8a64d4dfbe83a9db11e41b7eee6 = 0x2 777s git-debrebase classify e89f93fe74a521e71ba510a066a385e24590dd76 $t=0d18055565ebd8a64d4dfbe83a9db11e41b7eee6 @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x2 777s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 0d18055565ebd8a64d4dfbe83a9db11e41b7eee6\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Upstream","Tree" => "0d18055565ebd8a64d4dfbe83a9db11e41b7eee6","CommitId" => "e89f93fe74a521e71ba510a066a385e24590dd76"} 777s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 777s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 777s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"}],"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Type" => "Changelog","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"} 777s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 777s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 777s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 777s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"} 777s git-debrebase *** WALK prep done cur=694fabd170763cd189561b2d5ded51b5f5b05d34 brw 4 upp 8 proc 13 pm -1 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase WALK REBUILD 694fabd170763cd189561b2d5ded51b5f5b05d34 14 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s git-debrebase WALK BUILD 6a136a23e1a27d5bab2b312af53e895b30e42594 Debian (rewriting=0) 777s git-debrebase WALK BUILD a7ec4a46eb33aacd0f1d7f0ed912859b76c9372a Debian (rewriting=0) 777s git-debrebase WALK REWRITING NOW cl=HASH(0x562dc53d3f08) procd=HASH(0x562dc5489178) 777s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 777s git-debrebase WALK BUILD d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11 Debian (rewriting=1) 777s git-debrebase WALK BUILD fce5195a517ca73ca1f05caaf79cdac906f6fa42 Debian (rewriting=1) 777s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 777s git-debrebase WALK BUILD e89f93fe74a521e71ba510a066a385e24590dd76 Upstream (rewriting=1) 777s git-debrebase WALK BUILD 88253b6b0524255f38f934b875d04d88937fa9be Upstream (rewriting=1) 777s git-debrebase WALK BUILD 9f52a104fceba05b485cac9ed1cdf9a85ccd57ae Upstream (rewriting=1) 777s git-debrebase WALK BUILD b69e902ea1e41e228ece7e41981854cdb2889796 Upstream (rewriting=1) 777s git-debrebase WALK BUILD 12d829757028bbae15e1c97c08ebf6bd31a01b1d Upstream (rewriting=1) 777s git-debrebase WALK BUILD 7f17890bc8beaf2a2331e35f9c8a90ef67b8c5dc Upstream (rewriting=1) 777s git-debrebase WALK BUILD 7fee82b343033f8387c267d47636024ad4fc46ab Upstream (rewriting=1) 777s git-debrebase WALK BUILD fbfbf103a4f817669f924bbc7ee95357738af3ff Upstream (rewriting=1) 777s git-debrebase WALK BUILD d38b7f4fa2aff5b1d4e4e12be00e92f399e94e11 Upstream (rewriting=1) 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase get_differs 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 fce5195a517ca73ca1f05caaf79cdac906f6fa42 = 0 777s git-debrebase *** WALK RETURN 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 694fabd170763cd189561b2d5ded51b5f5b05d34 777s git-debrebase: laundered (head was fce5195a517ca73ca1f05caaf79cdac906f6fa42) 777s git-debrebase >= update HEAD 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 fce5195a517ca73ca1f05caaf79cdac906f6fa42 777s git-debrebase >$ 777s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 777s git-debrebase get_differs 38adb96e2609b0f9b692f8f280882eaf951824f9 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 777s git-debrebase classify 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 38adb96e2609b0f9b692f8f280882eaf951824f9/0x2 777s git-debrebase = Upstream {"Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 38adb96e2609b0f9b692f8f280882eaf951824f9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9"}],"CommitId" => "63570646c8a86a28ffdae60e9a2206bfaab7b2e9","Type" => "Upstream","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f"} 777s git-debrebase get_differs 968ac7831234feb26bf03250b5808ae8a697f6d1 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 777s git-debrebase classify 38adb96e2609b0f9b692f8f280882eaf951824f9 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 968ac7831234feb26bf03250b5808ae8a697f6d1/0x2 777s git-debrebase = Upstream {"Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 968ac7831234feb26bf03250b5808ae8a697f6d1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src-us.c (us-2)\n","CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9","Type" => "Upstream","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1"} 777s git-debrebase get_differs db95bbf8416b619f338841d51ae66aa51f0c2c62 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 777s git-debrebase classify 968ac7831234feb26bf03250b5808ae8a697f6d1 $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p db95bbf8416b619f338841d51ae66aa51f0c2c62/0x2 777s git-debrebase = Upstream {"CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d","Type" => "Upstream","Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent db95bbf8416b619f338841d51ae66aa51f0c2c62\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62"}],"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 777s git-debrebase get_differs 8c61e7177f487b7e68e7b16249954d807bacda63 af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 777s git-debrebase classify db95bbf8416b619f338841d51ae66aa51f0c2c62 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p 8c61e7177f487b7e68e7b16249954d807bacda63/0x2 777s git-debrebase = Upstream {"Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent 8c61e7177f487b7e68e7b16249954d807bacda63\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63"}],"Msg" => "UPSTREAM edit src-us.c (us-1)\n","CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62","Type" => "Upstream","Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf"} 777s git-debrebase get_differs 867ac05f34d6446ed08fce3967442a8665a7e645 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 777s git-debrebase classify 8c61e7177f487b7e68e7b16249954d807bacda63 $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 867ac05f34d6446ed08fce3967442a8665a7e645/0x2 777s git-debrebase = Upstream {"CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63","Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1","Type" => "Upstream","Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 867ac05f34d6446ed08fce3967442a8665a7e645\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645"}]} 777s git-debrebase get_differs d2b50f8a2bc139a9ff66ed259ac99df1865c37aa e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 777s git-debrebase classify 867ac05f34d6446ed08fce3967442a8665a7e645 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p d2b50f8a2bc139a9ff66ed259ac99df1865c37aa/0x2 777s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928","CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645","Msg" => "UPSTREAM edit src.c (before)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa"}],"Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent d2b50f8a2bc139a9ff66ed259ac99df1865c37aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 777s git-debrebase get_differs fcad7fbc6be7978081440c91aa8e8393450c49ee 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 777s git-debrebase classify d2b50f8a2bc139a9ff66ed259ac99df1865c37aa $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p fcad7fbc6be7978081440c91aa8e8393450c49ee/0x2 777s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent fcad7fbc6be7978081440c91aa8e8393450c49ee\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa"} 777s git-debrebase get_differs 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 777s git-debrebase classify fcad7fbc6be7978081440c91aa8e8393450c49ee $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac/0x2 777s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 777s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 777s git-debrebase classify 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x2 777s git-debrebase = Upstream {"Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","Type" => "Upstream","CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6"}],"Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 777s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 777s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 777s git-debrebase = Packaging {"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Type" => "Packaging","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}]} 777s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 777s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 777s git-debrebase = Packaging {"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Ix" => 0,"Differs" => 32}],"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Type" => "Packaging"} 777s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 777s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 777s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Type" => "Packaging","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"} 777s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 777s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 777s git-debrebase = Changelog {"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Differs" => 16,"Ix" => 0}],"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog"} 777s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 777s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 777s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 777s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase >= delete refs/ffq-prev/heads/master 328d24039a38cc4aee804e69e33ede6c84c0898b 777s git-debrebase >= update refs/debrebase-last/heads/master 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 0000000000000000000000000000000000000000 777s git-debrebase >= update HEAD 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 777s git-debrebase >$ 777s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 777s ' 777s + : ----- introduce a vanilla merge ----- 777s + t-merge-conflicted-stripping-conflict-markers other debian/zorkmid 777s + local otherbranch=other 777s + local file=debian/zorkmid 777s + t-expect-fail 'F:Merge conflict in debian/zorkmid' git merge other 777s + local 'mpat=F:Merge conflict in debian/zorkmid' 777s + shift 777s + set +o pipefail 777s + LC_MESSAGES=C 777s + LANGUAGE=C 777s + git merge other 777s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s Auto-merging debian/zorkmid 777s CONFLICT (content): Merge conflict in debian/zorkmid 777s Automatic merge failed; fix conflicts and then commit the result. 777s + local 'ps=1 0' 777s + set -o pipefail 777s + case $ps in 777s + t-grep-mpat 'F:Merge conflict in debian/zorkmid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s + local 'mpat=F:Merge conflict in debian/zorkmid' 777s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s + local grepper=fgrep 777s + case "$mpat" in 777s + case "$mpat" in 777s + grepper=fgrep 777s + mpat='Merge conflict in debian/zorkmid' 777s + fgrep -e 'Merge conflict in debian/zorkmid' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s CONFLICT (content): Merge conflict in debian/zorkmid 777s + perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid 777s + git add debian/zorkmid 777s + git commit --no-edit 777s [master a25963a] Merge branch 'other' 777s + t-expect-fail 'E:general two-parent merge' t-git-debrebase 777s + local 'mpat=E:general two-parent merge' 777s + shift 777s + set +o pipefail 777s + LC_MESSAGES=C 777s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s + LANGUAGE=C 777s + t-git-debrebase 777s + local gdr=git-debrebase 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + git-debrebase --dgit=dgit -D 777s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 777s git-debrebase ffq check_specs * 777s git-debrebase ffq merge master 777s git-debrebase ffq check_remote origin remote fetch/merge branch 777s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 777s OK, you are ahead of refs/remotes/origin/master 777s git-debrebase ffq check_remote undef remote push branch 777s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 777s git-debrebase *** WALK a25963afb7676bc7ab7d5316b21a3caf49cd41d8 0 - 777s git-debrebase get_differs 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 777s git-debrebase get_differs 5c115b3d4589514b997b0c81347bbc6789296a1a deabef6f96bb1b7178f35d435657581e016549cf = 0x32 777s git-debrebase classify a25963afb7676bc7ab7d5316b21a3caf49cd41d8 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 657ed93bc76651e8c98dd5ea0a79b5cf212b2591/0x22 5c115b3d4589514b997b0c81347bbc6789296a1a/0x32 777s git-debrebase ** Unknown 777s git-debrebase *** WALK BOMB unrecognised 777s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 777s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 777s 777s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit a25963afb7676bc7ab7d5316b21a3caf49cd41d8) (d.0x22 0x32) 777s git-debrebase: Branch/history seems mangled - no longer in gdr format. 777s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 777s + local 'ps=255 0' 777s + set -o pipefail 777s + case $ps in 777s + t-grep-mpat 'E:general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s + local 'mpat=E:general two-parent merge' 777s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s + local grepper=fgrep 777s + case "$mpat" in 777s + case "$mpat" in 777s + grepper=egrep 777s + mpat='general two-parent merge' 777s + egrep -e 'general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 777s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit a25963afb7676bc7ab7d5316b21a3caf49cd41d8) (d.0x22 0x32) 777s + t_gdr_xopts+=' --experimental-merge-resolution' 777s + : ----- expect to be able to merge ----- 777s + t-git-debrebase 777s + local gdr=git-debrebase 777s + : ' 777s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 777s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 778s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 778s git-debrebase ffq check_specs * 778s git-debrebase ffq merge master 778s git-debrebase ffq check_remote origin remote fetch/merge branch 778s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 778s OK, you are ahead of refs/remotes/origin/master 778s git-debrebase ffq check_remote undef remote push branch 778s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 778s git-debrebase *** WALK a25963afb7676bc7ab7d5316b21a3caf49cd41d8 0 - 778s git-debrebase get_differs 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 778s git-debrebase get_differs 5c115b3d4589514b997b0c81347bbc6789296a1a deabef6f96bb1b7178f35d435657581e016549cf = 0x32 778s git-debrebase classify a25963afb7676bc7ab7d5316b21a3caf49cd41d8 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 657ed93bc76651e8c98dd5ea0a79b5cf212b2591/0x22 5c115b3d4589514b997b0c81347bbc6789296a1a/0x32 778s git-debrebase = VanillaMerge {"Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent 657ed93bc76651e8c98dd5ea0a79b5cf212b2591\nparent 5c115b3d4589514b997b0c81347bbc6789296a1a\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "VanillaMerge","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n","CommitId" => "a25963afb7676bc7ab7d5316b21a3caf49cd41d8","Parents" => [{"CommitId" => "657ed93bc76651e8c98dd5ea0a79b5cf212b2591","Differs" => 34,"IsDgitImport" => undef,"IsOrigin" => "","Ix" => 0},{"Differs" => 50,"CommitId" => "5c115b3d4589514b997b0c81347bbc6789296a1a","IsOrigin" => "","Ix" => 1,"IsDgitImport" => undef}]} 778s git-debrebase *** MERGE 778s git-debrebase mwrecknote vanilla-merge a25963afb7676bc7ab7d5316b21a3caf49cd41d8 778s git-debrebase *** WALK 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 0 - 778s git-debrebase get_differs 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 e38de421676caa1148e6e5d6e455bf955514342f = 0 778s git-debrebase get_differs 328d24039a38cc4aee804e69e33ede6c84c0898b e38de421676caa1148e6e5d6e455bf955514342f = 0x32 778s git-debrebase classify 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 63570646c8a86a28ffdae60e9a2206bfaab7b2e9/0 328d24039a38cc4aee804e69e33ede6c84c0898b/0x32 778s git-debrebase = Pseudomerge {"Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 63570646c8a86a28ffdae60e9a2206bfaab7b2e9\nparent 328d24039a38cc4aee804e69e33ede6c84c0898b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Pseudomerge","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","CommitId" => "657ed93bc76651e8c98dd5ea0a79b5cf212b2591","Contributor" => {"CommitId" => "63570646c8a86a28ffdae60e9a2206bfaab7b2e9","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"Ix" => 1,"CommitId" => "328d24039a38cc4aee804e69e33ede6c84c0898b","Differs" => 50}],"Overwritten" => [$VAR1->{"Parents"}[1]]} 778s git-debrebase get_differs 38adb96e2609b0f9b692f8f280882eaf951824f9 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 778s git-debrebase classify 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 38adb96e2609b0f9b692f8f280882eaf951824f9/0x2 778s git-debrebase = Upstream {"CommitId" => "63570646c8a86a28ffdae60e9a2206bfaab7b2e9","Parents" => [{"CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 38adb96e2609b0f9b692f8f280882eaf951824f9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 778s git-debrebase get_differs 968ac7831234feb26bf03250b5808ae8a697f6d1 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 778s git-debrebase classify 38adb96e2609b0f9b692f8f280882eaf951824f9 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 968ac7831234feb26bf03250b5808ae8a697f6d1/0x2 778s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n","CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1"}],"Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 968ac7831234feb26bf03250b5808ae8a697f6d1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1"} 778s git-debrebase get_differs db95bbf8416b619f338841d51ae66aa51f0c2c62 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 778s git-debrebase classify 968ac7831234feb26bf03250b5808ae8a697f6d1 $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p db95bbf8416b619f338841d51ae66aa51f0c2c62/0x2 778s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62","Ix" => 0}],"CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1","Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent db95bbf8416b619f338841d51ae66aa51f0c2c62\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d","Type" => "Upstream"} 778s git-debrebase get_differs 8c61e7177f487b7e68e7b16249954d807bacda63 af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 778s git-debrebase classify db95bbf8416b619f338841d51ae66aa51f0c2c62 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p 8c61e7177f487b7e68e7b16249954d807bacda63/0x2 778s git-debrebase = Upstream {"CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62","Parents" => [{"CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src-us.c (us-1)\n","Type" => "Upstream","Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf","Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent 8c61e7177f487b7e68e7b16249954d807bacda63\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 778s git-debrebase get_differs 867ac05f34d6446ed08fce3967442a8665a7e645 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 778s git-debrebase classify 8c61e7177f487b7e68e7b16249954d807bacda63 $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 867ac05f34d6446ed08fce3967442a8665a7e645/0x2 778s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645"}],"CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63","Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 867ac05f34d6446ed08fce3967442a8665a7e645\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1","Type" => "Upstream"} 778s git-debrebase get_differs d2b50f8a2bc139a9ff66ed259ac99df1865c37aa e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 778s git-debrebase classify 867ac05f34d6446ed08fce3967442a8665a7e645 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p d2b50f8a2bc139a9ff66ed259ac99df1865c37aa/0x2 778s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa","Differs" => 2}],"CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928","Type" => "Upstream","Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent d2b50f8a2bc139a9ff66ed259ac99df1865c37aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 778s git-debrebase get_differs fcad7fbc6be7978081440c91aa8e8393450c49ee 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 778s git-debrebase classify d2b50f8a2bc139a9ff66ed259ac99df1865c37aa $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p fcad7fbc6be7978081440c91aa8e8393450c49ee/0x2 778s git-debrebase = Upstream {"CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent fcad7fbc6be7978081440c91aa8e8393450c49ee\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 778s git-debrebase get_differs 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 778s git-debrebase classify fcad7fbc6be7978081440c91aa8e8393450c49ee $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac/0x2 778s git-debrebase = Upstream {"Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee","Parents" => [{"CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Differs" => 2,"Ix" => 0}]} 778s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 778s git-debrebase classify 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x2 778s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Ix" => 0}],"CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","Type" => "Upstream"} 778s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 778s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 778s git-debrebase = Packaging {"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Ix" => 0}],"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Msg" => "us-conflict\n"} 778s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 778s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 778s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Parents" => [{"Ix" => 0,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Differs" => 32}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 778s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 778s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 778s git-debrebase = Packaging {"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid-us (us-2)\n","Type" => "Packaging","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 778s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 778s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 778s git-debrebase = Changelog {"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 778s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 778s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 778s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 778s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Parents" => [{"Differs" => 2,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 778s git-debrebase *** WALK prep done cur=694fabd170763cd189561b2d5ded51b5f5b05d34 brw 3 upp 9 proc 15 pm 0 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase WALK REBUILD 694fabd170763cd189561b2d5ded51b5f5b05d34 16 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase WALK BUILD 6a136a23e1a27d5bab2b312af53e895b30e42594 Debian (rewriting=0) 778s git-debrebase WALK BUILD 67a0f012d1be22a33c325c82531a9c208788029d Debian (rewriting=0) 778s git-debrebase WALK BUILD 3605e71ce841416742a545849af32397859b7dd1 Debian (rewriting=0) 778s git-debrebase WALK BUILD d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 Debian (rewriting=0) 778s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 778s git-debrebase WALK BUILD 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac Upstream (rewriting=0) 778s git-debrebase WALK BUILD fcad7fbc6be7978081440c91aa8e8393450c49ee Upstream (rewriting=0) 778s git-debrebase WALK BUILD d2b50f8a2bc139a9ff66ed259ac99df1865c37aa Upstream (rewriting=0) 778s git-debrebase WALK BUILD 867ac05f34d6446ed08fce3967442a8665a7e645 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 8c61e7177f487b7e68e7b16249954d807bacda63 Upstream (rewriting=0) 778s git-debrebase WALK BUILD db95bbf8416b619f338841d51ae66aa51f0c2c62 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 968ac7831234feb26bf03250b5808ae8a697f6d1 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 38adb96e2609b0f9b692f8f280882eaf951824f9 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 Upstream (rewriting=0) 778s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase get_differs 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 = 0 778s git-debrebase *** WALK RETURN 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 694fabd170763cd189561b2d5ded51b5f5b05d34 778s git-debrebase mwrecknote left-input 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 778s git-debrebase mwrecknote left-laundered 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 778s git-debrebase mwrecknote left-breakwater d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 778s git-debrebase mwrecknote left-anchor 694fabd170763cd189561b2d5ded51b5f5b05d34 778s git-debrebase MERGE BA best=694fabd170763cd189561b2d5ded51b5f5b05d34 p=694fabd170763cd189561b2d5ded51b5f5b05d34 778s git-debrebase *** WALK 5c115b3d4589514b997b0c81347bbc6789296a1a 0 - 778s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 11cb3d048b147c76ac8e15998d01b777a72434a7 = 0x20 778s git-debrebase classify 5c115b3d4589514b997b0c81347bbc6789296a1a $t=11cb3d048b147c76ac8e15998d01b777a72434a7 @p cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x20 778s git-debrebase = Packaging {"Hdr" => "tree 11cb3d048b147c76ac8e15998d01b777a72434a7\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n","Type" => "Packaging","Tree" => "11cb3d048b147c76ac8e15998d01b777a72434a7","Msg" => "other-conflict\n","CommitId" => "5c115b3d4589514b997b0c81347bbc6789296a1a","Parents" => [{"Ix" => 0,"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Differs" => 32}]} 778s git-debrebase get_differs c441f3b13985fc4b000fd25c35a60b7026a9d477 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 778s git-debrebase classify cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c441f3b13985fc4b000fd25c35a60b7026a9d477/0x22 778s git-debrebase = Mixed {"Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c441f3b13985fc4b000fd25c35a60b7026a9d477\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Type" => "Mixed","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","Msg" => "MIXED add both(-other) (other)\n","CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Parents" => [{"CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Differs" => 34,"Ix" => 0}]} 778s git-debrebase get_differs 16fdcfc4a487589ef6e2aed24a5d717bde301a34 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 778s git-debrebase classify c441f3b13985fc4b000fd25c35a60b7026a9d477 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 16fdcfc4a487589ef6e2aed24a5d717bde301a34/0x2 778s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 16fdcfc4a487589ef6e2aed24a5d717bde301a34\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Parents" => [{"CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src-other.c (other)\n"} 778s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 778s git-debrebase classify 16fdcfc4a487589ef6e2aed24a5d717bde301a34 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p 25b5400e549fae4178ac03009ca007e4d5de00dc/0x20 778s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"}],"CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","Type" => "Packaging","Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 778s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 778s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 778s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 778s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Differs" => 0,"Ix" => 0},{"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Differs" => 0,"Ix" => 1}],"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"SubType" => "Ambiguous","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Pseudomerge","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 778s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 778s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Ix" => 0}],"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Upstream","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 778s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 778s git-debrebase = Upstream {"Parents" => [{"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Differs" => 2,"Ix" => 0}],"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Msg" => "UPSTREAM edit src.c (before)\n","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Type" => "Upstream","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 778s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 778s git-debrebase = Upstream {"Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Type" => "Upstream","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"}],"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 778s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 778s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 778s git-debrebase = Upstream {"Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0}],"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883"} 778s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 778s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 778s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 2}]} 778s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 778s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 778s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"} 778s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 778s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 778s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32,"Ix" => 0}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n"} 778s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 778s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 778s git-debrebase = Changelog {"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 778s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 778s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 778s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 778s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 778s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 778s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 778s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 7 upp 7 proc 16 pm 0 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 778s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 778s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 778s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 778s git-debrebase WALK BUILD 16fdcfc4a487589ef6e2aed24a5d717bde301a34 Debian (rewriting=0) 778s git-debrebase WALK REWRITING NOW cl=HASH(0x56062e264d80) procd=HASH(0x56062e26fd68) 778s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 778s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Debian (rewriting=1) 778s git-debrebase WALK BUILD 5c115b3d4589514b997b0c81347bbc6789296a1a Debian (rewriting=1) 778s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 778s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=1) 778s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=1) 778s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=1) 778s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=1) 778s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=1) 778s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 778s git-debrebase WALK BUILD c441f3b13985fc4b000fd25c35a60b7026a9d477 Upstream (rewriting=1) 778s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Upstream (rewriting=1) 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase get_differs 538a2aa816a9c1c0eefb2118bce60bb02b207730 5c115b3d4589514b997b0c81347bbc6789296a1a = 0 778s git-debrebase *** WALK RETURN 538a2aa816a9c1c0eefb2118bce60bb02b207730 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 778s git-debrebase mwrecknote right-input 5c115b3d4589514b997b0c81347bbc6789296a1a 778s git-debrebase mwrecknote right-laundered 538a2aa816a9c1c0eefb2118bce60bb02b207730 778s git-debrebase mwrecknote right-breakwater 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 778s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 778s git-debrebase MERGE BA best=694fabd170763cd189561b2d5ded51b5f5b05d34 p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 778s git-debrebase mwrecknote result-anchor 694fabd170763cd189561b2d5ded51b5f5b05d34 778s git-debrebase mwrecknote interchange-mbcand-ok-0 25b5400e549fae4178ac03009ca007e4d5de00dc 778s git-debrebase *** WALK 25b5400e549fae4178ac03009ca007e4d5de00dc 0 - 778s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 778s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 778s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 778s git-debrebase = Pseudomerge {"SubType" => "Ambiguous","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [{"Differs" => 0,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Ix" => 1}],"Parents" => [{"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Differs" => 0,"Ix" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Type" => "Pseudomerge"} 778s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 778s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 778s git-debrebase = Upstream {"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Parents" => [{"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 778s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 778s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183"}],"Msg" => "UPSTREAM edit src.c (before)\n"} 778s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 778s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 778s git-debrebase = Upstream {"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Upstream","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Parents" => [{"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Differs" => 2,"Ix" => 0}]} 778s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 778s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 778s git-debrebase = Upstream {"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 778s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 778s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}],"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","Type" => "Upstream","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 778s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 778s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"Differs" => 32,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0}]} 778s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 778s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 778s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 778s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 778s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 778s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 778s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 778s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 778s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 778s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 778s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 778s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 778s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 778s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 12 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 778s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 778s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 778s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 778s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 778s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=0) 778s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=0) 778s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=0) 778s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 25b5400e549fae4178ac03009ca007e4d5de00dc = 0 778s git-debrebase *** WALK RETURN 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 778s git-debrebase mwrecknote mergebase-laundered 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 778s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 778s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 778s git-debrebase *** WALK prep done cur=a25963afb7676bc7ab7d5316b21a3caf49cd41d8 brw 0 upp 0 proc 0 pm -1 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase WALK REBUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 1 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 778s git-debrebase WALK BUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 MergeCreateMergedBreakwaters (rewriting=0) 778s Found a general merge, will try to tidy it up. 778s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 778s git-debrebase WALK BUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 MergeMergeSeries (rewriting=1) 778s git-debrebase >(no reflog) 778s Running merge resolution for a25963afb7676bc7ab7d5316b21a3caf49cd41d8... 778s git-debrebase mwrecknote new-base 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 778s git-debrebase merge_series newbase=1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 778s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 778s git-debrebase gbp_pq_export p-base 075ef1bebca2f99591cafd47f62fb9ceb67c6317 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 778s git-debrebase merge_series pec 2a07ed6891731091b3033661c02542dbafd9ba7f pec' 0f5e9e188dcec95b2ed6b48b00f032ba8af981fe 778s git-debrebase mwrecknote mergebase-patchqueue 0f5e9e188dcec95b2ed6b48b00f032ba8af981fe 778s git-debrebase gbp_pq_export p-1 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 538a2aa816a9c1c0eefb2118bce60bb02b207730 778s git-debrebase merge_series pec 061fe4f37148b2d2733b6aa5bb61a0d673d6317b pec' 83d01e6925240135108b581892ef353083dd81b6 778s git-debrebase mwrecknote right-patchqueue 83d01e6925240135108b581892ef353083dd81b6 778s git-debrebase gbp_pq_export p-0 d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 779s git-debrebase merge_series pec 5e50b87a496f57a89962217377fd65ff6e886e86 pec' 3aa396240f03dbf63d2877195aee1af4922d3e87 779s git-debrebase mwrecknote left-patchqueue 3aa396240f03dbf63d2877195aee1af4922d3e87 779s git-debrebase merge_series merging... 779s git-debrebase merge_series merge ok, series... 779s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 779s merge_series patch 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 779s merge_series patch 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 779s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 779s merge_series patch 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> subdir/addnewups keep 779s merge_series patch 0007-MIXED-add-both-other-other.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 779s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 779s merge_series patch 0007-MIXED-add-both-us-us-1.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 779s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> subdir/addnewups keep 779s merge_series patch 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 779s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> subdir/addnewups keep 779s merge_series patch 0009-MIXED-add-both-us-us-2.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0002-Edit-the-.c-file.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0005-MIXED-add-both-before.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 779s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> subdir/addnewups keep 779s merge_series patch subdir/addnewups keep 779s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 779s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 779s merge_series series next 0001-Add-a-new-upstream-file.patch 779s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 779s git-debrebase merge_series series next subdir/addnewups 779s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 779s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 779s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 779s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 779s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-us.c-us-1.patch 779s git-debrebase merge_series series next 0007-MIXED-add-both-us-us-1.patch 779s git-debrebase merge_series series next 0008-UPSTREAM-edit-src-us.c-us-2.patch 779s git-debrebase merge_series series next 0009-MIXED-add-both-us-us-2.patch 779s git-debrebase mwrecknote merged-patchqueue 7e2e32f2ba3ad0fa892178520b499d9c9567f4dc 779s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 779s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 779s git-debrebase merge_series series gbp pq import 779s gbp:info: Trying to apply patches at '7e2e32f2ba3ad0fa892178520b499d9c9567f4dc' 779s gbp:info: 11 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 779s git-debrebase merge_series series ok, building... 779s git-debrebase merge_series series ok, building b50c46a1a0b037b71700cc9d46c7633a54c16857 779s git-debrebase merge_series series ok, building 2ed3dd96762fa208bb26c71ff85410667599e9d8 779s git-debrebase merge_series series ok, building aaaf45bdbc5cb53126c7b663146717c0d01e973b 779s git-debrebase merge_series series ok, building c4d87568da6f43d92eb485edd4d556153e9bd6fa 779s git-debrebase merge_series series ok, building 046ffee8cc2bc6fbec3ebbc5ff6951b1f4480173 779s git-debrebase merge_series series ok, building 9f3717e0f2035412604d9d0f37383a85017167ac 779s git-debrebase merge_series series ok, building a45a09f2a7ad8f7cf15cf93bd3cfb5d9170554cd 779s git-debrebase merge_series series ok, building 6da49574d931a87ebec21023f1761d568e9feb8e 779s git-debrebase merge_series series ok, building 15526e469645066f58f01b1cdc50473959659b10 779s git-debrebase merge_series series ok, building 937593f68e62e7765ac251fb826420d0975773ec 779s git-debrebase merge_series series ok, building 7acbd164c0f91a0e6fa2092ff1e45b06b8cb713b 779s git-debrebase mwrecknote merged-result 5031bdfe15eba7775a080d91defb665677909cf2 779s git-debrebase merge_series done debug=115f2dd409c41d7bddfa33fcb9823c0549a9cda0 779s git-debrebase mwrecknote merged-debug 115f2dd409c41d7bddfa33fcb9823c0549a9cda0 779s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 779s git-debrebase merge_series returns 5031bdfe15eba7775a080d91defb665677909cf2 779s git-debrebase get_differs 5031bdfe15eba7775a080d91defb665677909cf2 a25963afb7676bc7ab7d5316b21a3caf49cd41d8 = 0 779s git-debrebase get_differs 5031bdfe15eba7775a080d91defb665677909cf2 a25963afb7676bc7ab7d5316b21a3caf49cd41d8 = 0 779s Merge resolution successful. 779s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 779s git-debrebase get_differs 5031bdfe15eba7775a080d91defb665677909cf2 a25963afb7676bc7ab7d5316b21a3caf49cd41d8 = 0 779s git-debrebase *** WALK RETURN 5031bdfe15eba7775a080d91defb665677909cf2 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 694fabd170763cd189561b2d5ded51b5f5b05d34 779s git-debrebase: laundered (head was a25963afb7676bc7ab7d5316b21a3caf49cd41d8) 779s git-debrebase >= update refs/ffq-prev/heads/master a25963afb7676bc7ab7d5316b21a3caf49cd41d8 0000000000000000000000000000000000000000 779s git-debrebase >= delete refs/debrebase-last/heads/master 779s git-debrebase >= update HEAD 5031bdfe15eba7775a080d91defb665677909cf2 a25963afb7676bc7ab7d5316b21a3caf49cd41d8 779s git-debrebase >$ 779s Recorded previous head for preservation 779s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 779s ' 779s + t-gdr-good laundered 779s + local state=laundered 779s + local beforetag= 779s + case $state in 779s + git diff --quiet -- :. ':!debian/patches' 779s + LC_MESSAGES=C 779s + t-git-debrebase status 779s + local gdr=git-debrebase 779s + : ' 779s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 779s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 779s git-debrebase get_differs c80275bed28f408c0f643c2614bd7ffd84fa89e1 deabef6f96bb1b7178f35d435657581e016549cf = 0x2 779s git-debrebase classify 5031bdfe15eba7775a080d91defb665677909cf2 $t=deabef6f96bb1b7178f35d435657581e016549cf @p c80275bed28f408c0f643c2614bd7ffd84fa89e1/0x2 779s git-debrebase = Upstream {"Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","Type" => "Upstream","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent c80275bed28f408c0f643c2614bd7ffd84fa89e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1"}],"CommitId" => "5031bdfe15eba7775a080d91defb665677909cf2"} 779s git-debrebase get_differs b43279774c76aecfe256fd046eecd2beda0a5d0d a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 779s git-debrebase classify c80275bed28f408c0f643c2614bd7ffd84fa89e1 $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p b43279774c76aecfe256fd046eecd2beda0a5d0d/0x2 779s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Type" => "Upstream","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff","CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Parents" => [{"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Ix" => 0,"Differs" => 2}],"Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent b43279774c76aecfe256fd046eecd2beda0a5d0d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs df52f7f7d66678448325d63887560eddcd839143 acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 779s git-debrebase classify b43279774c76aecfe256fd046eecd2beda0a5d0d $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p df52f7f7d66678448325d63887560eddcd839143/0x2 779s git-debrebase = Upstream {"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "df52f7f7d66678448325d63887560eddcd839143"}],"Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent df52f7f7d66678448325d63887560eddcd839143\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch"} 779s git-debrebase get_differs ffb6a7b88439af6456f30f796c77ab1ea5324fcf 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 779s git-debrebase classify df52f7f7d66678448325d63887560eddcd839143 $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p ffb6a7b88439af6456f30f796c77ab1ea5324fcf/0x2 779s git-debrebase = Upstream {"Parents" => [{"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Differs" => 2,"Ix" => 0}],"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent ffb6a7b88439af6456f30f796c77ab1ea5324fcf\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Type" => "Upstream","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch"} 779s git-debrebase get_differs 8e4ff24b03fada0a0747a5830c791e8187a842e0 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 779s git-debrebase classify ffb6a7b88439af6456f30f796c77ab1ea5324fcf $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 8e4ff24b03fada0a0747a5830c791e8187a842e0/0x2 779s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Type" => "Upstream","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","Parents" => [{"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0","Differs" => 2,"Ix" => 0}],"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 8e4ff24b03fada0a0747a5830c791e8187a842e0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs 8be74fafc0619e609b8eb369ce1f6a72cc84670a 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 779s git-debrebase classify 8e4ff24b03fada0a0747a5830c791e8187a842e0 $t=4844b97a44f315daca96b2361badd4d135ea373c @p 8be74fafc0619e609b8eb369ce1f6a72cc84670a/0x2 779s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 8be74fafc0619e609b8eb369ce1f6a72cc84670a\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Ix" => 0,"Differs" => 2}],"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0"} 779s git-debrebase get_differs ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 779s git-debrebase classify 8be74fafc0619e609b8eb369ce1f6a72cc84670a $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff/0x2 779s git-debrebase = Upstream {"Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Ix" => 0,"Differs" => 2}],"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Type" => "Upstream","Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch"} 779s git-debrebase get_differs 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 779s git-debrebase classify ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb/0x2 779s git-debrebase = Upstream {"Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb"}],"Type" => "Upstream","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch"} 779s git-debrebase get_differs 4159b6886d61f1c4595b92fc880d0dc7254112f6 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 779s git-debrebase classify 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p 4159b6886d61f1c4595b92fc880d0dc7254112f6/0x2 779s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Parents" => [{"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Differs" => 2,"Ix" => 0}],"Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent 4159b6886d61f1c4595b92fc880d0dc7254112f6\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs 686d47a3c2c5e2e1af77e83b4c517601b408ac87 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 779s git-debrebase classify 4159b6886d61f1c4595b92fc880d0dc7254112f6 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 686d47a3c2c5e2e1af77e83b4c517601b408ac87/0x2 779s git-debrebase = Upstream {"Parents" => [{"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Ix" => 0,"Differs" => 2}],"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 686d47a3c2c5e2e1af77e83b4c517601b408ac87\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d"} 779s git-debrebase get_differs 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 779s git-debrebase classify 686d47a3c2c5e2e1af77e83b4c517601b408ac87 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5/0x2 779s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Parents" => [{"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Differs" => 2,"Ix" => 0}],"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 779s git-debrebase get_differs 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 779s git-debrebase classify 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7/0x32 779s git-debrebase = MergedBreakwaters {"Type" => "MergedBreakwaters","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Parents" => [{"IsOrigin" => "","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","IsDgitImport" => undef,"Ix" => 0,"Differs" => 32},{"Ix" => 1,"Differs" => 50,"CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","IsDgitImport" => undef,"IsOrigin" => ""}],"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 779s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 779s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}],"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Msg" => "us-conflict\n"} 779s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 779s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 779s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 779s git-debrebase = Packaging {"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"}],"Type" => "Packaging","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Msg" => "DEBIAN add zorkmid-us (us-2)\n"} 779s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 779s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 779s git-debrebase = Changelog {"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 779s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 779s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 779s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 779s git-debrebase = Anchor {"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a"},{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","OrigParents" => [$VAR1->{"Parents"}[1]]} 779s git-debrebase get_differs 5d37ce708adfca208b31894cfa69a69866f93d95 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 779s git-debrebase classify 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 5d37ce708adfca208b31894cfa69a69866f93d95/0x20 779s git-debrebase = Packaging {"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 5d37ce708adfca208b31894cfa69a69866f93d95\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95"}],"Msg" => "other-conflict\n","Type" => "Packaging","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c"} 779s git-debrebase get_differs 17e167a2b68ae33e638cdcff5be30cc29b081ea0 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 779s git-debrebase classify 5d37ce708adfca208b31894cfa69a69866f93d95 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 17e167a2b68ae33e638cdcff5be30cc29b081ea0/0x20 779s git-debrebase = Packaging {"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Parents" => [{"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 17e167a2b68ae33e638cdcff5be30cc29b081ea0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n"} 779s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 779s git-debrebase classify 17e167a2b68ae33e638cdcff5be30cc29b081ea0 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 779s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32,"Ix" => 0}],"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-other (other)\n"} 779s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 779s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 779s git-debrebase = Packaging {"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 779s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 779s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 779s git-debrebase = Packaging {"Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Differs" => 32,"Ix" => 0}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n"} 779s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 779s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 779s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 779s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 779s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 779s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 779s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 779s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 779s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 779s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]]} 779s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 779s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 779s ' 779s + case $state in 779s + egrep '^ *branch is laundered' ../status.check 779s branch is laundered 779s + t-gdr-good-analyse HEAD laundered 779s + local head=HEAD 779s + local state=laundered 779s + local wsfx= 779s + local etypes bwtip 779s + case $state in 779s + etypes=Upstream 779s ++ t-git-debrebase breakwater 779s ++ local gdr=git-debrebase 779s ++ : ' 779s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 779s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 779s git-debrebase get_differs c80275bed28f408c0f643c2614bd7ffd84fa89e1 deabef6f96bb1b7178f35d435657581e016549cf = 0x2 779s git-debrebase classify 5031bdfe15eba7775a080d91defb665677909cf2 $t=deabef6f96bb1b7178f35d435657581e016549cf @p c80275bed28f408c0f643c2614bd7ffd84fa89e1/0x2 779s git-debrebase = Upstream {"CommitId" => "5031bdfe15eba7775a080d91defb665677909cf2","Parents" => [{"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Differs" => 2,"Ix" => 0}],"Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent c80275bed28f408c0f643c2614bd7ffd84fa89e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Type" => "Upstream","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf"} 779s git-debrebase get_differs b43279774c76aecfe256fd046eecd2beda0a5d0d a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 779s git-debrebase classify c80275bed28f408c0f643c2614bd7ffd84fa89e1 $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p b43279774c76aecfe256fd046eecd2beda0a5d0d/0x2 779s git-debrebase = Upstream {"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Parents" => [{"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Ix" => 0,"Differs" => 2}],"Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent b43279774c76aecfe256fd046eecd2beda0a5d0d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Type" => "Upstream","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff"} 779s git-debrebase get_differs df52f7f7d66678448325d63887560eddcd839143 acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 779s git-debrebase classify b43279774c76aecfe256fd046eecd2beda0a5d0d $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p df52f7f7d66678448325d63887560eddcd839143/0x2 779s git-debrebase = Upstream {"Parents" => [{"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Ix" => 0,"Differs" => 2}],"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent df52f7f7d66678448325d63887560eddcd839143\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch","Type" => "Upstream","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c"} 779s git-debrebase get_differs ffb6a7b88439af6456f30f796c77ab1ea5324fcf 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 779s git-debrebase classify df52f7f7d66678448325d63887560eddcd839143 $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p ffb6a7b88439af6456f30f796c77ab1ea5324fcf/0x2 779s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent ffb6a7b88439af6456f30f796c77ab1ea5324fcf\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf"}],"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Type" => "Upstream"} 779s git-debrebase get_differs 8e4ff24b03fada0a0747a5830c791e8187a842e0 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 779s git-debrebase classify ffb6a7b88439af6456f30f796c77ab1ea5324fcf $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 8e4ff24b03fada0a0747a5830c791e8187a842e0/0x2 779s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 8e4ff24b03fada0a0747a5830c791e8187a842e0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Parents" => [{"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0","Differs" => 2,"Ix" => 0}],"Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","Type" => "Upstream"} 779s git-debrebase get_differs 8be74fafc0619e609b8eb369ce1f6a72cc84670a 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 779s git-debrebase classify 8e4ff24b03fada0a0747a5830c791e8187a842e0 $t=4844b97a44f315daca96b2361badd4d135ea373c @p 8be74fafc0619e609b8eb369ce1f6a72cc84670a/0x2 779s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 8be74fafc0619e609b8eb369ce1f6a72cc84670a\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Differs" => 2,"Ix" => 0}],"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0"} 779s git-debrebase get_differs ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 779s git-debrebase classify 8be74fafc0619e609b8eb369ce1f6a72cc84670a $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff/0x2 779s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff"}]} 779s git-debrebase get_differs 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 779s git-debrebase classify ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb/0x2 779s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Ix" => 0,"Differs" => 2}],"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Type" => "Upstream","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488"} 779s git-debrebase get_differs 4159b6886d61f1c4595b92fc880d0dc7254112f6 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 779s git-debrebase classify 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p 4159b6886d61f1c4595b92fc880d0dc7254112f6/0x2 779s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent 4159b6886d61f1c4595b92fc880d0dc7254112f6\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Parents" => [{"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Differs" => 2,"Ix" => 0}]} 779s git-debrebase get_differs 686d47a3c2c5e2e1af77e83b4c517601b408ac87 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 779s git-debrebase classify 4159b6886d61f1c4595b92fc880d0dc7254112f6 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 686d47a3c2c5e2e1af77e83b4c517601b408ac87/0x2 779s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","Parents" => [{"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Differs" => 2,"Ix" => 0}],"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 686d47a3c2c5e2e1af77e83b4c517601b408ac87\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 779s git-debrebase get_differs 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 779s git-debrebase classify 686d47a3c2c5e2e1af77e83b4c517601b408ac87 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5/0x2 779s git-debrebase = Upstream {"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Parents" => [{"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6"} 779s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 779s git-debrebase get_differs 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 779s git-debrebase classify 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7/0x32 779s git-debrebase = MergedBreakwaters {"Parents" => [{"IsOrigin" => "","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Differs" => 32,"Ix" => 0,"IsDgitImport" => undef},{"Differs" => 50,"IsDgitImport" => undef,"Ix" => 1,"IsOrigin" => "","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7"}],"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Type" => "MergedBreakwaters","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 779s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 779s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 779s git-debrebase = Packaging {"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}]} 779s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 779s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Parents" => [{"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Ix" => 0,"Differs" => 32}],"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 779s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 779s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Differs" => 32,"Ix" => 0}]} 779s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 779s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 779s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Parents" => [{"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0,"Differs" => 16}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 779s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 779s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 779s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 779s git-debrebase = Anchor {"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c"} 779s git-debrebase get_differs 5d37ce708adfca208b31894cfa69a69866f93d95 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 779s git-debrebase classify 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 5d37ce708adfca208b31894cfa69a69866f93d95/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Parents" => [{"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 5d37ce708adfca208b31894cfa69a69866f93d95\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "other-conflict\n"} 779s git-debrebase get_differs 17e167a2b68ae33e638cdcff5be30cc29b081ea0 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 779s git-debrebase classify 5d37ce708adfca208b31894cfa69a69866f93d95 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 17e167a2b68ae33e638cdcff5be30cc29b081ea0/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 17e167a2b68ae33e638cdcff5be30cc29b081ea0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0"}]} 779s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 779s git-debrebase classify 17e167a2b68ae33e638cdcff5be30cc29b081ea0 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 779s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0"} 779s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 779s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 779s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}],"Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 779s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 779s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 779s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0,"Differs" => 32}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Type" => "Packaging","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 779s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 779s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 779s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 779s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 779s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 779s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 779s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 779s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 779s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 779s git-debrebase = Anchor {"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 780s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 780s ' 780s + bwtip=Y:1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + anal=../anal 780s + t-git-debrebase analyse HEAD 780s + local gdr=git-debrebase 780s + : ' 780s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 780s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 780s git-debrebase *** WALK 5031bdfe15eba7775a080d91defb665677909cf2 1 *main::STDOUT 780s git-debrebase get_differs c80275bed28f408c0f643c2614bd7ffd84fa89e1 deabef6f96bb1b7178f35d435657581e016549cf = 0x2 780s git-debrebase classify 5031bdfe15eba7775a080d91defb665677909cf2 $t=deabef6f96bb1b7178f35d435657581e016549cf @p c80275bed28f408c0f643c2614bd7ffd84fa89e1/0x2 780s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent c80275bed28f408c0f643c2614bd7ffd84fa89e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1"}],"CommitId" => "5031bdfe15eba7775a080d91defb665677909cf2","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf"} 780s git-debrebase get_differs b43279774c76aecfe256fd046eecd2beda0a5d0d a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 780s git-debrebase classify c80275bed28f408c0f643c2614bd7ffd84fa89e1 $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p b43279774c76aecfe256fd046eecd2beda0a5d0d/0x2 780s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent b43279774c76aecfe256fd046eecd2beda0a5d0d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Ix" => 0,"Differs" => 2}],"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff"} 780s git-debrebase get_differs df52f7f7d66678448325d63887560eddcd839143 acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 780s git-debrebase classify b43279774c76aecfe256fd046eecd2beda0a5d0d $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p df52f7f7d66678448325d63887560eddcd839143/0x2 780s git-debrebase = Upstream {"Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent df52f7f7d66678448325d63887560eddcd839143\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch","Type" => "Upstream","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Parents" => [{"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Ix" => 0,"Differs" => 2}],"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d"} 780s git-debrebase get_differs ffb6a7b88439af6456f30f796c77ab1ea5324fcf 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 780s git-debrebase classify df52f7f7d66678448325d63887560eddcd839143 $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p ffb6a7b88439af6456f30f796c77ab1ea5324fcf/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Differs" => 2}],"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent ffb6a7b88439af6456f30f796c77ab1ea5324fcf\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 8e4ff24b03fada0a0747a5830c791e8187a842e0 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 780s git-debrebase classify ffb6a7b88439af6456f30f796c77ab1ea5324fcf $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 8e4ff24b03fada0a0747a5830c791e8187a842e0/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0","Ix" => 0}],"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 8e4ff24b03fada0a0747a5830c791e8187a842e0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 8be74fafc0619e609b8eb369ce1f6a72cc84670a 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 780s git-debrebase classify 8e4ff24b03fada0a0747a5830c791e8187a842e0 $t=4844b97a44f315daca96b2361badd4d135ea373c @p 8be74fafc0619e609b8eb369ce1f6a72cc84670a/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Parents" => [{"Ix" => 0,"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Differs" => 2}],"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0","Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 8be74fafc0619e609b8eb369ce1f6a72cc84670a\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch"} 780s git-debrebase get_differs ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 780s git-debrebase classify 8be74fafc0619e609b8eb369ce1f6a72cc84670a $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Parents" => [{"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Ix" => 0,"Differs" => 2}],"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a","Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch"} 780s git-debrebase get_differs 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 780s git-debrebase classify ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Differs" => 2}],"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 4159b6886d61f1c4595b92fc880d0dc7254112f6 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 780s git-debrebase classify 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p 4159b6886d61f1c4595b92fc880d0dc7254112f6/0x2 780s git-debrebase = Upstream {"Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Parents" => [{"Differs" => 2,"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Ix" => 0}],"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Type" => "Upstream","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent 4159b6886d61f1c4595b92fc880d0dc7254112f6\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 780s git-debrebase get_differs 686d47a3c2c5e2e1af77e83b4c517601b408ac87 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 780s git-debrebase classify 4159b6886d61f1c4595b92fc880d0dc7254112f6 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 686d47a3c2c5e2e1af77e83b4c517601b408ac87/0x2 780s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","Parents" => [{"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Ix" => 0,"Differs" => 2}],"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 686d47a3c2c5e2e1af77e83b4c517601b408ac87\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 780s git-debrebase get_differs 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 780s git-debrebase classify 686d47a3c2c5e2e1af77e83b4c517601b408ac87 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5/0x2 780s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Ix" => 0}],"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 780s git-debrebase get_differs 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 780s git-debrebase classify 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7/0x32 780s git-debrebase = MergedBreakwaters {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Parents" => [{"Differs" => 32,"IsOrigin" => "","IsDgitImport" => undef,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Ix" => 0},{"Differs" => 50,"IsOrigin" => "","Ix" => 1,"CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","IsDgitImport" => undef}],"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Type" => "MergedBreakwaters"} 780s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 780s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 780s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}],"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n"} 780s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 780s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 780s git-debrebase = Packaging {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Ix" => 0}],"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 780s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 780s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 780s git-debrebase = Packaging {"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"Differs" => 32,"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0}],"Type" => "Packaging"} 780s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 780s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 780s git-debrebase = Changelog {"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Parents" => [{"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0}],"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Type" => "Changelog","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 780s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 780s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 780s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 780s git-debrebase = Anchor {"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","OrigParents" => [{"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48}],"Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 780s git-debrebase get_differs 5d37ce708adfca208b31894cfa69a69866f93d95 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 780s git-debrebase classify 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 5d37ce708adfca208b31894cfa69a69866f93d95/0x20 780s git-debrebase = Packaging {"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95"}],"Type" => "Packaging","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 5d37ce708adfca208b31894cfa69a69866f93d95\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "other-conflict\n"} 780s git-debrebase get_differs 17e167a2b68ae33e638cdcff5be30cc29b081ea0 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 780s git-debrebase classify 5d37ce708adfca208b31894cfa69a69866f93d95 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 17e167a2b68ae33e638cdcff5be30cc29b081ea0/0x20 780s git-debrebase = Packaging {"Parents" => [{"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Ix" => 0,"Differs" => 32}],"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Type" => "Packaging","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 17e167a2b68ae33e638cdcff5be30cc29b081ea0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 780s git-debrebase classify 17e167a2b68ae33e638cdcff5be30cc29b081ea0 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 780s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}],"Type" => "Packaging"} 780s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 780s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 780s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}],"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Type" => "Packaging"} 780s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 780s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 780s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8"} 780s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 780s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 780s git-debrebase = Changelog {"Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 780s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 780s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 780s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 780s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 780s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 780s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 780s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 780s git-debrebase *** WALK prep done cur=1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 brw -1 upp 10 proc 11 pm -1 780s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 780s ' 780s ++ git rev-parse HEAD 780s + expect=5031bdfe15eba7775a080d91defb665677909cf2 780s + exec 780s + local cid ctype info nparents 780s + read cid ctype info 780s + : ===== 5031bdfe15eba7775a080d91defb665677909cf2 Upstream ===== 780s + test 5031bdfe15eba7775a080d91defb665677909cf2 = 5031bdfe15eba7775a080d91defb665677909cf2 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 5031bdfe15eba7775a080d91defb665677909cf2 780s + local parents=c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s + expect=c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s + enparents=1 780s + : Upstream/SAME c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== c80275bed28f408c0f643c2614bd7ffd84fa89e1 Upstream ===== 780s + test c80275bed28f408c0f643c2614bd7ffd84fa89e1 = c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P c80275bed28f408c0f643c2614bd7ffd84fa89e1 780s + local parents=b43279774c76aecfe256fd046eecd2beda0a5d0d 780s + expect=b43279774c76aecfe256fd046eecd2beda0a5d0d 780s + enparents=1 780s + : Upstream/SAME b43279774c76aecfe256fd046eecd2beda0a5d0d 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s b43279774c76aecfe256fd046eecd2beda0a5d0d 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo b43279774c76aecfe256fd046eecd2beda0a5d0d 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== b43279774c76aecfe256fd046eecd2beda0a5d0d Upstream ===== 780s + test b43279774c76aecfe256fd046eecd2beda0a5d0d = b43279774c76aecfe256fd046eecd2beda0a5d0d 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P b43279774c76aecfe256fd046eecd2beda0a5d0d 780s + local parents=df52f7f7d66678448325d63887560eddcd839143 780s + expect=df52f7f7d66678448325d63887560eddcd839143 780s + enparents=1 780s + : Upstream/SAME df52f7f7d66678448325d63887560eddcd839143 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s df52f7f7d66678448325d63887560eddcd839143 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo df52f7f7d66678448325d63887560eddcd839143 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== df52f7f7d66678448325d63887560eddcd839143 Upstream ===== 780s + test df52f7f7d66678448325d63887560eddcd839143 = df52f7f7d66678448325d63887560eddcd839143 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P df52f7f7d66678448325d63887560eddcd839143 780s + local parents=ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s + expect=ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s + enparents=1 780s + : Upstream/SAME ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== ffb6a7b88439af6456f30f796c77ab1ea5324fcf Upstream ===== 780s + test ffb6a7b88439af6456f30f796c77ab1ea5324fcf = ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P ffb6a7b88439af6456f30f796c77ab1ea5324fcf 780s + local parents=8e4ff24b03fada0a0747a5830c791e8187a842e0 780s + expect=8e4ff24b03fada0a0747a5830c791e8187a842e0 780s + enparents=1 780s + : Upstream/SAME 8e4ff24b03fada0a0747a5830c791e8187a842e0 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 8e4ff24b03fada0a0747a5830c791e8187a842e0 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 8e4ff24b03fada0a0747a5830c791e8187a842e0 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 8e4ff24b03fada0a0747a5830c791e8187a842e0 Upstream ===== 780s + test 8e4ff24b03fada0a0747a5830c791e8187a842e0 = 8e4ff24b03fada0a0747a5830c791e8187a842e0 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 8e4ff24b03fada0a0747a5830c791e8187a842e0 780s + local parents=8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s + expect=8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s + enparents=1 780s + : Upstream/SAME 8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 8be74fafc0619e609b8eb369ce1f6a72cc84670a Upstream ===== 780s + test 8be74fafc0619e609b8eb369ce1f6a72cc84670a = 8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 8be74fafc0619e609b8eb369ce1f6a72cc84670a 780s + local parents=ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s + expect=ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s + enparents=1 780s + : Upstream/SAME ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff Upstream ===== 780s + test ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff = ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 780s + local parents=942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s + expect=942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s + enparents=1 780s + : Upstream/SAME 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb Upstream ===== 780s + test 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb = 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 780s + local parents=4159b6886d61f1c4595b92fc880d0dc7254112f6 780s + expect=4159b6886d61f1c4595b92fc880d0dc7254112f6 780s + enparents=1 780s + : Upstream/SAME 4159b6886d61f1c4595b92fc880d0dc7254112f6 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 4159b6886d61f1c4595b92fc880d0dc7254112f6 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 4159b6886d61f1c4595b92fc880d0dc7254112f6 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 4159b6886d61f1c4595b92fc880d0dc7254112f6 Upstream ===== 780s + test 4159b6886d61f1c4595b92fc880d0dc7254112f6 = 4159b6886d61f1c4595b92fc880d0dc7254112f6 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 4159b6886d61f1c4595b92fc880d0dc7254112f6 780s + local parents=686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s + expect=686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s + enparents=1 780s + : Upstream/SAME 686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 686d47a3c2c5e2e1af77e83b4c517601b408ac87 Upstream ===== 780s + test 686d47a3c2c5e2e1af77e83b4c517601b408ac87 = 686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s + local cetype=Upstream 780s + '[' xUpstream = xUpstream ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 686d47a3c2c5e2e1af77e83b4c517601b408ac87 780s + local parents=1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + expect=1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + enparents=1 780s + : Upstream/SAME 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s ++ printf %s 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 MergedBreakwaters ===== 780s + test 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 = 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + local cetype=Upstream 780s + '[' xMergedBreakwaters = xUpstream ']' 780s ++ git log -n1 --pretty=format:%P 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 780s + local 'parents=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7' 780s + expect='d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7' 780s + enparents=1 780s + : MergedBreakwaters/Upstream 'd686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7' 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + enparents=2 780s ++ printf %s 'd686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7' 780s ++ wc -w 780s + local cnparents=2 780s + test 2 = 2 780s ++ for f in $parents 780s ++ echo d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s ++ for f in $parents 780s ++ wc -w 780s ++ echo 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=2 780s + test 2 = 2 780s + case "$parents" in 780s + case "$ctype" in 780s + local f 780s + local parent_ix=0 780s + for f in $parents 780s + t-gdr-good-analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 breakwater -mp0 780s + local head=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + local state=breakwater 780s + local wsfx=-mp0 780s + local etypes bwtip 780s + case $state in 780s + etypes=Packaging 780s + anal=../anal-mp0 780s + t-git-debrebase analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + local gdr=git-debrebase 780s + : ' 780s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 780s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s git-debrebase *** WALK d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1 *main::STDOUT 780s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 780s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 780s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}],"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Type" => "Packaging","Msg" => "us-conflict\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6"} 780s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 780s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 780s git-debrebase = Packaging {"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Type" => "Packaging","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Parents" => [{"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 780s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 780s git-debrebase = Packaging {"Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"} 780s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 780s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 780s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0,"Differs" => 16}]} 780s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 780s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 780s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 780s git-debrebase = Anchor {"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"} 780s git-debrebase *** WALK prep done cur=694fabd170763cd189561b2d5ded51b5f5b05d34 brw 3 upp -1 proc 4 pm -1 780s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 780s ' 780s ++ git rev-parse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + expect=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + exec 780s + local cid ctype info nparents 780s + read cid ctype info 780s + : ===== d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 Packaging ===== 780s + test d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 = d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 780s + local parents=3605e71ce841416742a545849af32397859b7dd1 780s + expect=3605e71ce841416742a545849af32397859b7dd1 780s + enparents=1 780s + : Packaging/SAME 3605e71ce841416742a545849af32397859b7dd1 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 3605e71ce841416742a545849af32397859b7dd1..d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 -- :. ':!debian' 780s + git diff --quiet 3605e71ce841416742a545849af32397859b7dd1..d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 3605e71ce841416742a545849af32397859b7dd1 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 3605e71ce841416742a545849af32397859b7dd1 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 3605e71ce841416742a545849af32397859b7dd1 Packaging ===== 780s + test 3605e71ce841416742a545849af32397859b7dd1 = 3605e71ce841416742a545849af32397859b7dd1 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 3605e71ce841416742a545849af32397859b7dd1 780s + local parents=67a0f012d1be22a33c325c82531a9c208788029d 780s + expect=67a0f012d1be22a33c325c82531a9c208788029d 780s + enparents=1 780s + : Packaging/SAME 67a0f012d1be22a33c325c82531a9c208788029d 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 67a0f012d1be22a33c325c82531a9c208788029d..3605e71ce841416742a545849af32397859b7dd1 -- :. ':!debian' 780s + git diff --quiet 67a0f012d1be22a33c325c82531a9c208788029d..3605e71ce841416742a545849af32397859b7dd1 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 67a0f012d1be22a33c325c82531a9c208788029d 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 67a0f012d1be22a33c325c82531a9c208788029d 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 67a0f012d1be22a33c325c82531a9c208788029d Packaging ===== 780s + test 67a0f012d1be22a33c325c82531a9c208788029d = 67a0f012d1be22a33c325c82531a9c208788029d 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 67a0f012d1be22a33c325c82531a9c208788029d 780s + local parents=6a136a23e1a27d5bab2b312af53e895b30e42594 780s + expect=6a136a23e1a27d5bab2b312af53e895b30e42594 780s + enparents=1 780s + : Packaging/SAME 6a136a23e1a27d5bab2b312af53e895b30e42594 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 6a136a23e1a27d5bab2b312af53e895b30e42594..67a0f012d1be22a33c325c82531a9c208788029d -- :. ':!debian' 780s + git diff --quiet 6a136a23e1a27d5bab2b312af53e895b30e42594..67a0f012d1be22a33c325c82531a9c208788029d -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 6a136a23e1a27d5bab2b312af53e895b30e42594 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 6a136a23e1a27d5bab2b312af53e895b30e42594 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 6a136a23e1a27d5bab2b312af53e895b30e42594 Changelog ===== 780s + test 6a136a23e1a27d5bab2b312af53e895b30e42594 = 6a136a23e1a27d5bab2b312af53e895b30e42594 780s + local cetype=Packaging 780s + '[' xChangelog = xPackaging ']' 780s ++ git log -n1 --pretty=format:%P 6a136a23e1a27d5bab2b312af53e895b30e42594 780s + local parents=694fabd170763cd189561b2d5ded51b5f5b05d34 780s + expect=694fabd170763cd189561b2d5ded51b5f5b05d34 780s + enparents=1 780s + : Changelog/Packaging 694fabd170763cd189561b2d5ded51b5f5b05d34 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 694fabd170763cd189561b2d5ded51b5f5b05d34..6a136a23e1a27d5bab2b312af53e895b30e42594 -- :. ':!debian/changelog' 780s + etypes=Packaging 780s ++ printf %s 694fabd170763cd189561b2d5ded51b5f5b05d34 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 694fabd170763cd189561b2d5ded51b5f5b05d34 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 694fabd170763cd189561b2d5ded51b5f5b05d34 Anchor ===== 780s + test 694fabd170763cd189561b2d5ded51b5f5b05d34 = 694fabd170763cd189561b2d5ded51b5f5b05d34 780s + local cetype=Packaging 780s + '[' xAnchor = xPackaging ']' 780s ++ git log -n1 --pretty=format:%P 694fabd170763cd189561b2d5ded51b5f5b05d34 780s + local 'parents=d835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 780s + expect='d835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 780s + enparents=1 780s + : Anchor/Packaging 'd835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + break 780s + parent_ix=1 780s + for f in $parents 780s + t-gdr-good-analyse 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 breakwater -mp1 780s + local head=9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + local state=breakwater 780s + local wsfx=-mp1 780s + local etypes bwtip 780s + case $state in 780s + etypes=Packaging 780s + anal=../anal-mp1 780s + t-git-debrebase analyse 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + local gdr=git-debrebase 780s + : ' 780s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 780s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s git-debrebase *** WALK 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 1 *main::STDOUT 780s git-debrebase get_differs 5d37ce708adfca208b31894cfa69a69866f93d95 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 780s git-debrebase classify 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 5d37ce708adfca208b31894cfa69a69866f93d95/0x20 780s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95"}],"Msg" => "other-conflict\n","Type" => "Packaging","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 5d37ce708adfca208b31894cfa69a69866f93d95\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 17e167a2b68ae33e638cdcff5be30cc29b081ea0 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 780s git-debrebase classify 5d37ce708adfca208b31894cfa69a69866f93d95 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 17e167a2b68ae33e638cdcff5be30cc29b081ea0/0x20 780s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Ix" => 0}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 17e167a2b68ae33e638cdcff5be30cc29b081ea0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95"} 780s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 780s git-debrebase classify 17e167a2b68ae33e638cdcff5be30cc29b081ea0 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 780s git-debrebase = Packaging {"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid-other (other)\n"} 780s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 780s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 780s git-debrebase = Packaging {"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32}],"Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 780s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 780s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 780s git-debrebase = Packaging {"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}]} 780s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 780s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 780s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 780s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 780s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 780s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 780s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 780s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 780s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 780s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 780s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 6 upp -1 proc 7 pm -1 780s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 780s ' 780s ++ git rev-parse 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + expect=9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + exec 780s + local cid ctype info nparents 780s + read cid ctype info 780s + : ===== 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 Packaging ===== 780s + test 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 = 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 780s + local parents=5d37ce708adfca208b31894cfa69a69866f93d95 780s + expect=5d37ce708adfca208b31894cfa69a69866f93d95 780s + enparents=1 780s + : Packaging/SAME 5d37ce708adfca208b31894cfa69a69866f93d95 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 5d37ce708adfca208b31894cfa69a69866f93d95..9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 -- :. ':!debian' 780s + git diff --quiet 5d37ce708adfca208b31894cfa69a69866f93d95..9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 5d37ce708adfca208b31894cfa69a69866f93d95 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 5d37ce708adfca208b31894cfa69a69866f93d95 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 5d37ce708adfca208b31894cfa69a69866f93d95 Packaging ===== 780s + test 5d37ce708adfca208b31894cfa69a69866f93d95 = 5d37ce708adfca208b31894cfa69a69866f93d95 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 5d37ce708adfca208b31894cfa69a69866f93d95 780s + local parents=17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s + expect=17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s + enparents=1 780s + : Packaging/SAME 17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 17e167a2b68ae33e638cdcff5be30cc29b081ea0..5d37ce708adfca208b31894cfa69a69866f93d95 -- :. ':!debian' 780s + git diff --quiet 17e167a2b68ae33e638cdcff5be30cc29b081ea0..5d37ce708adfca208b31894cfa69a69866f93d95 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 17e167a2b68ae33e638cdcff5be30cc29b081ea0 Packaging ===== 780s + test 17e167a2b68ae33e638cdcff5be30cc29b081ea0 = 17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 17e167a2b68ae33e638cdcff5be30cc29b081ea0 780s + local parents=075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s + expect=075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s + enparents=1 780s + : Packaging/SAME 075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..17e167a2b68ae33e638cdcff5be30cc29b081ea0 -- :. ':!debian' 780s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..17e167a2b68ae33e638cdcff5be30cc29b081ea0 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Packaging ===== 780s + test 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P 075ef1bebca2f99591cafd47f62fb9ceb67c6317 780s + local parents=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s + expect=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s + enparents=1 780s + : Packaging/SAME bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :. ':!debian' 780s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Packaging ===== 780s + test bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa = bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s + local cetype=Packaging 780s + '[' xPackaging = xPackaging ']' 780s + cetype=SAME 780s ++ git log -n1 --pretty=format:%P bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 780s + local parents=fc9b56489e07bdd371d3da847892acc46dfd58a8 780s + expect=fc9b56489e07bdd371d3da847892acc46dfd58a8 780s + enparents=1 780s + : Packaging/SAME fc9b56489e07bdd371d3da847892acc46dfd58a8 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :. ':!debian' 780s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :debian/patches 780s + etypes=Packaging 780s ++ printf %s fc9b56489e07bdd371d3da847892acc46dfd58a8 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo fc9b56489e07bdd371d3da847892acc46dfd58a8 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== fc9b56489e07bdd371d3da847892acc46dfd58a8 Changelog ===== 780s + test fc9b56489e07bdd371d3da847892acc46dfd58a8 = fc9b56489e07bdd371d3da847892acc46dfd58a8 780s + local cetype=Packaging 780s + '[' xChangelog = xPackaging ']' 780s ++ git log -n1 --pretty=format:%P fc9b56489e07bdd371d3da847892acc46dfd58a8 780s + local parents=5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s + expect=5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s + enparents=1 780s + : Changelog/Packaging 5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 5402b11174c7526744a60cd1accfa3aeecbc7e5d..fc9b56489e07bdd371d3da847892acc46dfd58a8 -- :. ':!debian/changelog' 780s + etypes=Packaging 780s ++ printf %s 5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 5402b11174c7526744a60cd1accfa3aeecbc7e5d Changelog ===== 780s + test 5402b11174c7526744a60cd1accfa3aeecbc7e5d = 5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s + local cetype=Packaging 780s + '[' xChangelog = xPackaging ']' 780s ++ git log -n1 --pretty=format:%P 5402b11174c7526744a60cd1accfa3aeecbc7e5d 780s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s + enparents=1 780s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..5402b11174c7526744a60cd1accfa3aeecbc7e5d -- :. ':!debian/changelog' 780s + etypes=Packaging 780s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s ++ wc -w 780s + local cnparents=1 780s + test 1 = 1 780s ++ for f in $parents 780s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s ++ wc -w 780s ++ t-sort -u 780s ++ LC_COLLATE=C 780s ++ sort -u 780s + local cndparents=1 780s + test 1 = 1 780s + case "$parents" in 780s + case "$ctype" in 780s + read cid ctype info 780s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 780s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s + local cetype=Packaging 780s + '[' xAnchor = xPackaging ']' 780s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 780s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 780s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 780s + enparents=1 780s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 780s + case "$ctype/$cetype" in 780s + case "$ctype/$etypes" in 780s + case "$cetype" in 780s + case "$ctype" in 780s + break 780s + parent_ix=2 780s + return 780s + t-refs-same-start 780s + unset t_ref_val 780s + t_ref_names=() 780s + t-ref-head 780s + local val 780s ++ git rev-parse HEAD 780s + val=5031bdfe15eba7775a080d91defb665677909cf2 780s + t-ref-same-val HEAD 5031bdfe15eba7775a080d91defb665677909cf2 780s + local name=HEAD 780s + local val=5031bdfe15eba7775a080d91defb665677909cf2 780s + case "${t_ref_val-unset}" in 780s + t_ref_val=5031bdfe15eba7775a080d91defb665677909cf2 780s + t_ref_names+=("$name") 780s + t-git-debrebase 780s + local gdr=git-debrebase 780s + : ' 780s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 780s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 780s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 780s git-debrebase *** WALK 5031bdfe15eba7775a080d91defb665677909cf2 0 - 780s git-debrebase get_differs c80275bed28f408c0f643c2614bd7ffd84fa89e1 deabef6f96bb1b7178f35d435657581e016549cf = 0x2 780s git-debrebase classify 5031bdfe15eba7775a080d91defb665677909cf2 $t=deabef6f96bb1b7178f35d435657581e016549cf @p c80275bed28f408c0f643c2614bd7ffd84fa89e1/0x2 780s git-debrebase = Upstream {"CommitId" => "5031bdfe15eba7775a080d91defb665677909cf2","Parents" => [{"Differs" => 2,"CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent c80275bed28f408c0f643c2614bd7ffd84fa89e1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf"} 780s git-debrebase get_differs b43279774c76aecfe256fd046eecd2beda0a5d0d a5b847c5f5608d10a68a18fee7f620409d6acdff = 0x2 780s git-debrebase classify c80275bed28f408c0f643c2614bd7ffd84fa89e1 $t=a5b847c5f5608d10a68a18fee7f620409d6acdff @p b43279774c76aecfe256fd046eecd2beda0a5d0d/0x2 780s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Tree" => "a5b847c5f5608d10a68a18fee7f620409d6acdff","Type" => "Upstream","Hdr" => "tree a5b847c5f5608d10a68a18fee7f620409d6acdff\nparent b43279774c76aecfe256fd046eecd2beda0a5d0d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "c80275bed28f408c0f643c2614bd7ffd84fa89e1","Parents" => [{"Ix" => 0,"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d","Differs" => 2}]} 780s git-debrebase get_differs df52f7f7d66678448325d63887560eddcd839143 acf4d861de73e2116f79da4799bd30ae73dc369c = 0x2 780s git-debrebase classify b43279774c76aecfe256fd046eecd2beda0a5d0d $t=acf4d861de73e2116f79da4799bd30ae73dc369c @p df52f7f7d66678448325d63887560eddcd839143/0x2 780s git-debrebase = Upstream {"Hdr" => "tree acf4d861de73e2116f79da4799bd30ae73dc369c\nparent df52f7f7d66678448325d63887560eddcd839143\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "acf4d861de73e2116f79da4799bd30ae73dc369c","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch","Parents" => [{"Differs" => 2,"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Ix" => 0}],"CommitId" => "b43279774c76aecfe256fd046eecd2beda0a5d0d"} 780s git-debrebase get_differs ffb6a7b88439af6456f30f796c77ab1ea5324fcf 92aac2dbe83cd0960a78439e44ee36c146c5df98 = 0x2 780s git-debrebase classify df52f7f7d66678448325d63887560eddcd839143 $t=92aac2dbe83cd0960a78439e44ee36c146c5df98 @p ffb6a7b88439af6456f30f796c77ab1ea5324fcf/0x2 780s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf"}],"CommitId" => "df52f7f7d66678448325d63887560eddcd839143","Hdr" => "tree 92aac2dbe83cd0960a78439e44ee36c146c5df98\nparent ffb6a7b88439af6456f30f796c77ab1ea5324fcf\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "92aac2dbe83cd0960a78439e44ee36c146c5df98","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch"} 780s git-debrebase get_differs 8e4ff24b03fada0a0747a5830c791e8187a842e0 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 = 0x2 780s git-debrebase classify ffb6a7b88439af6456f30f796c77ab1ea5324fcf $t=9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4 @p 8e4ff24b03fada0a0747a5830c791e8187a842e0/0x2 780s git-debrebase = Upstream {"Hdr" => "tree 9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4\nparent 8e4ff24b03fada0a0747a5830c791e8187a842e0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Tree" => "9cecdf9d07fcfc48a9a2f78c3fbd9e9f490199d4","CommitId" => "ffb6a7b88439af6456f30f796c77ab1ea5324fcf","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0"}]} 780s git-debrebase get_differs 8be74fafc0619e609b8eb369ce1f6a72cc84670a 4844b97a44f315daca96b2361badd4d135ea373c = 0x2 780s git-debrebase classify 8e4ff24b03fada0a0747a5830c791e8187a842e0 $t=4844b97a44f315daca96b2361badd4d135ea373c @p 8be74fafc0619e609b8eb369ce1f6a72cc84670a/0x2 780s git-debrebase = Upstream {"Hdr" => "tree 4844b97a44f315daca96b2361badd4d135ea373c\nparent 8be74fafc0619e609b8eb369ce1f6a72cc84670a\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "4844b97a44f315daca96b2361badd4d135ea373c","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a"}],"CommitId" => "8e4ff24b03fada0a0747a5830c791e8187a842e0"} 780s git-debrebase get_differs ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff 0e902e52f7664910822aaa8b2c8ce07adbe82b4b = 0x2 780s git-debrebase classify 8be74fafc0619e609b8eb369ce1f6a72cc84670a $t=0e902e52f7664910822aaa8b2c8ce07adbe82b4b @p ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff/0x2 780s git-debrebase = Upstream {"Hdr" => "tree 0e902e52f7664910822aaa8b2c8ce07adbe82b4b\nparent ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","Tree" => "0e902e52f7664910822aaa8b2c8ce07adbe82b4b","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Parents" => [{"Ix" => 0,"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff","Differs" => 2}],"CommitId" => "8be74fafc0619e609b8eb369ce1f6a72cc84670a"} 780s git-debrebase get_differs 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 = 0x2 780s git-debrebase classify ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff $t=2a7ff02ad3fb5c8ef0b42810651560a14f1f7488 @p 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb/0x2 780s git-debrebase = Upstream {"Tree" => "2a7ff02ad3fb5c8ef0b42810651560a14f1f7488","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Type" => "Upstream","Hdr" => "tree 2a7ff02ad3fb5c8ef0b42810651560a14f1f7488\nparent 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb"}],"CommitId" => "ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff"} 780s git-debrebase get_differs 4159b6886d61f1c4595b92fc880d0dc7254112f6 e604da492dadb01ff5ab227f55c684c7c9f7c4d0 = 0x2 780s git-debrebase classify 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb $t=e604da492dadb01ff5ab227f55c684c7c9f7c4d0 @p 4159b6886d61f1c4595b92fc880d0dc7254112f6/0x2 780s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6"}],"CommitId" => "942dceaa4d63e7803dd15451fc5eb57e0c2df4fb","Tree" => "e604da492dadb01ff5ab227f55c684c7c9f7c4d0","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree e604da492dadb01ff5ab227f55c684c7c9f7c4d0\nparent 4159b6886d61f1c4595b92fc880d0dc7254112f6\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 686d47a3c2c5e2e1af77e83b4c517601b408ac87 de8b92be7dce908cca5da61f752d0fff8f7c774d = 0x2 780s git-debrebase classify 4159b6886d61f1c4595b92fc880d0dc7254112f6 $t=de8b92be7dce908cca5da61f752d0fff8f7c774d @p 686d47a3c2c5e2e1af77e83b4c517601b408ac87/0x2 780s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "de8b92be7dce908cca5da61f752d0fff8f7c774d","Hdr" => "tree de8b92be7dce908cca5da61f752d0fff8f7c774d\nparent 686d47a3c2c5e2e1af77e83b4c517601b408ac87\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream","CommitId" => "4159b6886d61f1c4595b92fc880d0dc7254112f6","Parents" => [{"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Ix" => 0,"Differs" => 2}]} 780s git-debrebase get_differs 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 75f063f3c83d7c2317a507777c57d79aff85b4e6 = 0x2 780s git-debrebase classify 686d47a3c2c5e2e1af77e83b4c517601b408ac87 $t=75f063f3c83d7c2317a507777c57d79aff85b4e6 @p 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5/0x2 780s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Ix" => 0,"Differs" => 2}],"CommitId" => "686d47a3c2c5e2e1af77e83b4c517601b408ac87","Tree" => "75f063f3c83d7c2317a507777c57d79aff85b4e6","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 75f063f3c83d7c2317a507777c57d79aff85b4e6\nparent 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Upstream"} 780s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 780s git-debrebase get_differs 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 780s git-debrebase classify 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7/0x32 780s git-debrebase = MergedBreakwaters {"Parents" => [{"Differs" => 32,"IsDgitImport" => undef,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Ix" => 0,"IsOrigin" => ""},{"IsDgitImport" => undef,"IsOrigin" => "","Ix" => 1,"CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Differs" => 50}],"CommitId" => "1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5","Type" => "MergedBreakwaters","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n"} 780s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 780s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 780s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Msg" => "us-conflict\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}],"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6"} 780s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 780s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 780s git-debrebase = Packaging {"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Parents" => [{"Ix" => 0,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Differs" => 32}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 780s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 780s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 780s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0,"Differs" => 32}],"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Type" => "Packaging","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 780s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 780s git-debrebase = Changelog {"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Parents" => [{"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0}],"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 780s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 780s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 780s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 780s git-debrebase = Anchor {"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]]} 780s git-debrebase get_differs 5d37ce708adfca208b31894cfa69a69866f93d95 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 780s git-debrebase classify 9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p 5d37ce708adfca208b31894cfa69a69866f93d95/0x20 780s git-debrebase = Packaging {"Msg" => "other-conflict\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent 5d37ce708adfca208b31894cfa69a69866f93d95\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","CommitId" => "9e34b0bf6ffb025b384bf97e7fa771bca8da2fb7","Parents" => [{"Ix" => 0,"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Differs" => 32}]} 780s git-debrebase get_differs 17e167a2b68ae33e638cdcff5be30cc29b081ea0 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 780s git-debrebase classify 5d37ce708adfca208b31894cfa69a69866f93d95 $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 17e167a2b68ae33e638cdcff5be30cc29b081ea0/0x20 780s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Ix" => 0}],"CommitId" => "5d37ce708adfca208b31894cfa69a69866f93d95","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 17e167a2b68ae33e638cdcff5be30cc29b081ea0\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging"} 780s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 780s git-debrebase classify 17e167a2b68ae33e638cdcff5be30cc29b081ea0 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 780s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32}],"CommitId" => "17e167a2b68ae33e638cdcff5be30cc29b081ea0","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 780s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 780s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 780s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"}]} 780s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 780s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 780s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"} 780s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 780s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 780s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 781s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 781s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 781s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"} 781s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 781s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 781s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 781s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 781s git-debrebase *** WALK prep done cur=1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 brw -1 upp 10 proc 11 pm -1 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase WALK REBUILD 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 12 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 781s git-debrebase WALK BUILD 686d47a3c2c5e2e1af77e83b4c517601b408ac87 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 4159b6886d61f1c4595b92fc880d0dc7254112f6 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 942dceaa4d63e7803dd15451fc5eb57e0c2df4fb Upstream (rewriting=0) 781s git-debrebase WALK BUILD ff52ea13e7a45b0febeab7a0d26ca60ae4b7efff Upstream (rewriting=0) 781s git-debrebase WALK BUILD 8be74fafc0619e609b8eb369ce1f6a72cc84670a Upstream (rewriting=0) 781s git-debrebase WALK BUILD 8e4ff24b03fada0a0747a5830c791e8187a842e0 Upstream (rewriting=0) 781s git-debrebase WALK BUILD ffb6a7b88439af6456f30f796c77ab1ea5324fcf Upstream (rewriting=0) 781s git-debrebase WALK BUILD df52f7f7d66678448325d63887560eddcd839143 Upstream (rewriting=0) 781s git-debrebase WALK BUILD b43279774c76aecfe256fd046eecd2beda0a5d0d Upstream (rewriting=0) 781s git-debrebase WALK BUILD c80275bed28f408c0f643c2614bd7ffd84fa89e1 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 5031bdfe15eba7775a080d91defb665677909cf2 Upstream (rewriting=0) 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase get_differs 5031bdfe15eba7775a080d91defb665677909cf2 5031bdfe15eba7775a080d91defb665677909cf2 = 0 781s git-debrebase *** WALK RETURN 5031bdfe15eba7775a080d91defb665677909cf2 1ef54c22cd1bb27aae6f4056e9e11ec6d371a6c5 694fabd170763cd189561b2d5ded51b5f5b05d34 781s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 781s ' 781s + t-ref-head 781s + local val 781s ++ git rev-parse HEAD 781s + val=5031bdfe15eba7775a080d91defb665677909cf2 781s + t-ref-same-val HEAD 5031bdfe15eba7775a080d91defb665677909cf2 781s + local name=HEAD 781s + local val=5031bdfe15eba7775a080d91defb665677909cf2 781s + case "${t_ref_val-unset}" in 781s + t_ref_val=5031bdfe15eba7775a080d91defb665677909cf2 781s + t_ref_names+=("$name") 781s + t-git-debrebase scrap 781s + local gdr=git-debrebase 781s + : ' 781s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 781s + git-debrebase --dgit=dgit -D --experimental-merge-resolution scrap 781s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 781s git-debrebase >= update refs/debrebase-last/heads/master a25963afb7676bc7ab7d5316b21a3caf49cd41d8 0000000000000000000000000000000000000000 781s git-debrebase >= update refs/ffq-prev/heads/master 0000000000000000000000000000000000000000 a25963afb7676bc7ab7d5316b21a3caf49cd41d8 781s git-debrebase >= update HEAD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 5031bdfe15eba7775a080d91defb665677909cf2 781s git-debrebase >$ 781s HEAD is now at a25963a Merge branch 'other' 781s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 781s ' 781s + t-some-changes after 781s + local token=after 781s + local which=dum 781s + local fsuffix= 781s + t-git-next-date 781s + GIT_COMMITTER_DATE='1530000012 +0100' 781s + GIT_AUTHOR_DATE='1530000012 +0100' 781s + case "$which" in 781s + echo '// debian after' 781s + git add debian/zorkmid 781s + git commit -m 'DEBIAN add zorkmid (after)' 781s [master 76a64ae] DEBIAN add zorkmid (after) 781s 1 file changed, 1 insertion(+) 781s + case "$which" in 781s + echo '// upstream after' 781s + git add src.c 781s + git commit -m 'UPSTREAM edit src.c (after)' 781s [master 27e72c7] UPSTREAM edit src.c (after) 781s 1 file changed, 1 insertion(+) 781s + case "$which" in 781s + for f in debian/zorkmid$fsuffix src$fsuffix.c 781s + echo '// both! after' 781s + git add debian/zorkmid 781s + for f in debian/zorkmid$fsuffix src$fsuffix.c 781s + echo '// both! after' 781s + git add src.c 781s + git commit -m 'MIXED add both() (after)' 781s [master 483bec1] MIXED add both() (after) 781s 2 files changed, 2 insertions(+) 781s + t-git-next-date 781s + GIT_COMMITTER_DATE='1530000013 +0100' 781s + GIT_AUTHOR_DATE='1530000013 +0100' 781s + t-git-debrebase 781s + local gdr=git-debrebase 781s + : ' 781s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 781s + git-debrebase --dgit=dgit -D --experimental-merge-resolution 781s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 781s git-debrebase ffq check_specs * 781s git-debrebase ffq merge master 781s git-debrebase ffq check_remote origin remote fetch/merge branch 781s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 781s OK, you are ahead of refs/remotes/origin/master 781s git-debrebase ffq check_remote undef remote push branch 781s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 781s git-debrebase *** WALK 483bec124bc0b081dc1354cb8d2c5542b8742f83 0 - 781s git-debrebase get_differs 27e72c748098b91c81e4f67b285427ecae2f10bb 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x22 781s git-debrebase classify 483bec124bc0b081dc1354cb8d2c5542b8742f83 $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p 27e72c748098b91c81e4f67b285427ecae2f10bb/0x22 781s git-debrebase = Mixed {"Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94","CommitId" => "483bec124bc0b081dc1354cb8d2c5542b8742f83","Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent 27e72c748098b91c81e4f67b285427ecae2f10bb\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "MIXED add both() (after)\n","Type" => "Mixed","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "27e72c748098b91c81e4f67b285427ecae2f10bb"}]} 781s git-debrebase get_differs 76a64aea247c93e6d492a4d4d163d851caaa9d59 918c82da492809b49682be9409696c6897e8e7cc = 0x2 781s git-debrebase classify 27e72c748098b91c81e4f67b285427ecae2f10bb $t=918c82da492809b49682be9409696c6897e8e7cc @p 76a64aea247c93e6d492a4d4d163d851caaa9d59/0x2 781s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (after)\n","CommitId" => "27e72c748098b91c81e4f67b285427ecae2f10bb","Tree" => "918c82da492809b49682be9409696c6897e8e7cc","Hdr" => "tree 918c82da492809b49682be9409696c6897e8e7cc\nparent 76a64aea247c93e6d492a4d4d163d851caaa9d59\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "76a64aea247c93e6d492a4d4d163d851caaa9d59","Differs" => 2}],"Type" => "Upstream"} 781s git-debrebase get_differs a25963afb7676bc7ab7d5316b21a3caf49cd41d8 4a2544d3f07debb25659ba494041c70c896e5887 = 0x20 781s git-debrebase classify 76a64aea247c93e6d492a4d4d163d851caaa9d59 $t=4a2544d3f07debb25659ba494041c70c896e5887 @p a25963afb7676bc7ab7d5316b21a3caf49cd41d8/0x20 781s git-debrebase = Packaging {"Tree" => "4a2544d3f07debb25659ba494041c70c896e5887","CommitId" => "76a64aea247c93e6d492a4d4d163d851caaa9d59","Hdr" => "tree 4a2544d3f07debb25659ba494041c70c896e5887\nparent a25963afb7676bc7ab7d5316b21a3caf49cd41d8\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000012 +0100\n","Msg" => "DEBIAN add zorkmid (after)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a25963afb7676bc7ab7d5316b21a3caf49cd41d8"}]} 781s git-debrebase get_differs 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 deabef6f96bb1b7178f35d435657581e016549cf = 0x22 781s git-debrebase get_differs 5c115b3d4589514b997b0c81347bbc6789296a1a deabef6f96bb1b7178f35d435657581e016549cf = 0x32 781s git-debrebase classify a25963afb7676bc7ab7d5316b21a3caf49cd41d8 $t=deabef6f96bb1b7178f35d435657581e016549cf @p 657ed93bc76651e8c98dd5ea0a79b5cf212b2591/0x22 5c115b3d4589514b997b0c81347bbc6789296a1a/0x32 781s git-debrebase = VanillaMerge {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n","Hdr" => "tree deabef6f96bb1b7178f35d435657581e016549cf\nparent 657ed93bc76651e8c98dd5ea0a79b5cf212b2591\nparent 5c115b3d4589514b997b0c81347bbc6789296a1a\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "deabef6f96bb1b7178f35d435657581e016549cf","CommitId" => "a25963afb7676bc7ab7d5316b21a3caf49cd41d8","Parents" => [{"CommitId" => "657ed93bc76651e8c98dd5ea0a79b5cf212b2591","Ix" => 0,"IsDgitImport" => undef,"IsOrigin" => "","Differs" => 34},{"Ix" => 1,"IsDgitImport" => undef,"CommitId" => "5c115b3d4589514b997b0c81347bbc6789296a1a","IsOrigin" => "","Differs" => 50}],"Type" => "VanillaMerge"} 781s git-debrebase *** MERGE 781s git-debrebase mwrecknote vanilla-merge a25963afb7676bc7ab7d5316b21a3caf49cd41d8 781s git-debrebase *** WALK 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 0 - 781s git-debrebase get_differs 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 e38de421676caa1148e6e5d6e455bf955514342f = 0 781s git-debrebase get_differs 328d24039a38cc4aee804e69e33ede6c84c0898b e38de421676caa1148e6e5d6e455bf955514342f = 0x32 781s git-debrebase classify 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 63570646c8a86a28ffdae60e9a2206bfaab7b2e9/0 328d24039a38cc4aee804e69e33ede6c84c0898b/0x32 781s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 50,"CommitId" => "328d24039a38cc4aee804e69e33ede6c84c0898b","Ix" => 1}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","CommitId" => "657ed93bc76651e8c98dd5ea0a79b5cf212b2591","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 63570646c8a86a28ffdae60e9a2206bfaab7b2e9\nparent 328d24039a38cc4aee804e69e33ede6c84c0898b\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "63570646c8a86a28ffdae60e9a2206bfaab7b2e9"},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge"} 781s git-debrebase get_differs 38adb96e2609b0f9b692f8f280882eaf951824f9 e38de421676caa1148e6e5d6e455bf955514342f = 0x2 781s git-debrebase classify 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 $t=e38de421676caa1148e6e5d6e455bf955514342f @p 38adb96e2609b0f9b692f8f280882eaf951824f9/0x2 781s git-debrebase = Upstream {"CommitId" => "63570646c8a86a28ffdae60e9a2206bfaab7b2e9","Tree" => "e38de421676caa1148e6e5d6e455bf955514342f","Hdr" => "tree e38de421676caa1148e6e5d6e455bf955514342f\nparent 38adb96e2609b0f9b692f8f280882eaf951824f9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9","Ix" => 0,"Differs" => 2}]} 781s git-debrebase get_differs 968ac7831234feb26bf03250b5808ae8a697f6d1 698a2560d79a004c2c8f172bfb77966a4d931ec1 = 0x2 781s git-debrebase classify 38adb96e2609b0f9b692f8f280882eaf951824f9 $t=698a2560d79a004c2c8f172bfb77966a4d931ec1 @p 968ac7831234feb26bf03250b5808ae8a697f6d1/0x2 781s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-us.c (us-2)\n","Hdr" => "tree 698a2560d79a004c2c8f172bfb77966a4d931ec1\nparent 968ac7831234feb26bf03250b5808ae8a697f6d1\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "38adb96e2609b0f9b692f8f280882eaf951824f9","Tree" => "698a2560d79a004c2c8f172bfb77966a4d931ec1","Parents" => [{"Differs" => 2,"CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1","Ix" => 0}],"Type" => "Upstream"} 781s git-debrebase get_differs db95bbf8416b619f338841d51ae66aa51f0c2c62 e8b94450cb8e681e494689fb8332a4becf2fd75d = 0x2 781s git-debrebase classify 968ac7831234feb26bf03250b5808ae8a697f6d1 $t=e8b94450cb8e681e494689fb8332a4becf2fd75d @p db95bbf8416b619f338841d51ae66aa51f0c2c62/0x2 781s git-debrebase = Upstream {"Hdr" => "tree e8b94450cb8e681e494689fb8332a4becf2fd75d\nparent db95bbf8416b619f338841d51ae66aa51f0c2c62\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e8b94450cb8e681e494689fb8332a4becf2fd75d","CommitId" => "968ac7831234feb26bf03250b5808ae8a697f6d1","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62","Ix" => 0}]} 781s git-debrebase get_differs 8c61e7177f487b7e68e7b16249954d807bacda63 af732c5124a36938b085e0b7c534b2935a2519bf = 0x2 781s git-debrebase classify db95bbf8416b619f338841d51ae66aa51f0c2c62 $t=af732c5124a36938b085e0b7c534b2935a2519bf @p 8c61e7177f487b7e68e7b16249954d807bacda63/0x2 781s git-debrebase = Upstream {"Hdr" => "tree af732c5124a36938b085e0b7c534b2935a2519bf\nparent 8c61e7177f487b7e68e7b16249954d807bacda63\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "af732c5124a36938b085e0b7c534b2935a2519bf","CommitId" => "db95bbf8416b619f338841d51ae66aa51f0c2c62","Msg" => "UPSTREAM edit src-us.c (us-1)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63","Ix" => 0}]} 781s git-debrebase get_differs 867ac05f34d6446ed08fce3967442a8665a7e645 3e1d62be2276fc0c07e618f0afa1c015ba613ae1 = 0x2 781s git-debrebase classify 8c61e7177f487b7e68e7b16249954d807bacda63 $t=3e1d62be2276fc0c07e618f0afa1c015ba613ae1 @p 867ac05f34d6446ed08fce3967442a8665a7e645/0x2 781s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645","Ix" => 0}],"Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "8c61e7177f487b7e68e7b16249954d807bacda63","Tree" => "3e1d62be2276fc0c07e618f0afa1c015ba613ae1","Hdr" => "tree 3e1d62be2276fc0c07e618f0afa1c015ba613ae1\nparent 867ac05f34d6446ed08fce3967442a8665a7e645\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 781s git-debrebase get_differs d2b50f8a2bc139a9ff66ed259ac99df1865c37aa e0b7dfbd5a539e0394c71cfd449ea9de3914f928 = 0x2 781s git-debrebase classify 867ac05f34d6446ed08fce3967442a8665a7e645 $t=e0b7dfbd5a539e0394c71cfd449ea9de3914f928 @p d2b50f8a2bc139a9ff66ed259ac99df1865c37aa/0x2 781s git-debrebase = Upstream {"Hdr" => "tree e0b7dfbd5a539e0394c71cfd449ea9de3914f928\nparent d2b50f8a2bc139a9ff66ed259ac99df1865c37aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "e0b7dfbd5a539e0394c71cfd449ea9de3914f928","CommitId" => "867ac05f34d6446ed08fce3967442a8665a7e645","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa"}]} 781s git-debrebase get_differs fcad7fbc6be7978081440c91aa8e8393450c49ee 5f7f15e4216ca911d7d124f6ecc91b968ab63310 = 0x2 781s git-debrebase classify d2b50f8a2bc139a9ff66ed259ac99df1865c37aa $t=5f7f15e4216ca911d7d124f6ecc91b968ab63310 @p fcad7fbc6be7978081440c91aa8e8393450c49ee/0x2 781s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 5f7f15e4216ca911d7d124f6ecc91b968ab63310\nparent fcad7fbc6be7978081440c91aa8e8393450c49ee\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "5f7f15e4216ca911d7d124f6ecc91b968ab63310","CommitId" => "d2b50f8a2bc139a9ff66ed259ac99df1865c37aa","Parents" => [{"Ix" => 0,"CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee","Differs" => 2}],"Type" => "Upstream"} 781s git-debrebase get_differs 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac 290db9f88b6ffa542315f3f8b5f24f15797c33d2 = 0x2 781s git-debrebase classify fcad7fbc6be7978081440c91aa8e8393450c49ee $t=290db9f88b6ffa542315f3f8b5f24f15797c33d2 @p 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac/0x2 781s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "290db9f88b6ffa542315f3f8b5f24f15797c33d2","CommitId" => "fcad7fbc6be7978081440c91aa8e8393450c49ee","Hdr" => "tree 290db9f88b6ffa542315f3f8b5f24f15797c33d2\nparent 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 781s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd = 0x2 781s git-debrebase classify 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac $t=7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x2 781s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac","Tree" => "7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd","Hdr" => "tree 7f4ec6ccc8682f187ee1f5ec95e2b10be25d7cdd\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6"}],"Type" => "Upstream"} 781s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 781s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 781s git-debrebase = Packaging {"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Msg" => "us-conflict\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}]} 781s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 781s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 781s git-debrebase = Packaging {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"}],"Type" => "Packaging"} 781s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 781s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 781s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af"} 781s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 781s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 781s git-debrebase = Changelog {"Parents" => [{"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"} 781s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 781s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 781s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 781s git-debrebase = Anchor {"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Parents" => [{"Ix" => 0,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Differs" => 2},{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 781s git-debrebase *** WALK prep done cur=694fabd170763cd189561b2d5ded51b5f5b05d34 brw 3 upp 9 proc 15 pm 0 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase WALK REBUILD 694fabd170763cd189561b2d5ded51b5f5b05d34 16 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase WALK BUILD 6a136a23e1a27d5bab2b312af53e895b30e42594 Debian (rewriting=0) 781s git-debrebase WALK BUILD 67a0f012d1be22a33c325c82531a9c208788029d Debian (rewriting=0) 781s git-debrebase WALK BUILD 3605e71ce841416742a545849af32397859b7dd1 Debian (rewriting=0) 781s git-debrebase WALK BUILD d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 Debian (rewriting=0) 781s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 781s git-debrebase WALK BUILD 1da7c99fd2f49c69c10ce6e41b6d29a2af1ce5ac Upstream (rewriting=0) 781s git-debrebase WALK BUILD fcad7fbc6be7978081440c91aa8e8393450c49ee Upstream (rewriting=0) 781s git-debrebase WALK BUILD d2b50f8a2bc139a9ff66ed259ac99df1865c37aa Upstream (rewriting=0) 781s git-debrebase WALK BUILD 867ac05f34d6446ed08fce3967442a8665a7e645 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 8c61e7177f487b7e68e7b16249954d807bacda63 Upstream (rewriting=0) 781s git-debrebase WALK BUILD db95bbf8416b619f338841d51ae66aa51f0c2c62 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 968ac7831234feb26bf03250b5808ae8a697f6d1 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 38adb96e2609b0f9b692f8f280882eaf951824f9 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 Upstream (rewriting=0) 781s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase get_differs 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 = 0 781s git-debrebase *** WALK RETURN 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 694fabd170763cd189561b2d5ded51b5f5b05d34 781s git-debrebase mwrecknote left-input 657ed93bc76651e8c98dd5ea0a79b5cf212b2591 781s git-debrebase mwrecknote left-laundered 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 781s git-debrebase mwrecknote left-breakwater d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 781s git-debrebase mwrecknote left-anchor 694fabd170763cd189561b2d5ded51b5f5b05d34 781s git-debrebase MERGE BA best=694fabd170763cd189561b2d5ded51b5f5b05d34 p=694fabd170763cd189561b2d5ded51b5f5b05d34 781s git-debrebase *** WALK 5c115b3d4589514b997b0c81347bbc6789296a1a 0 - 781s git-debrebase get_differs cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 11cb3d048b147c76ac8e15998d01b777a72434a7 = 0x20 781s git-debrebase classify 5c115b3d4589514b997b0c81347bbc6789296a1a $t=11cb3d048b147c76ac8e15998d01b777a72434a7 @p cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0/0x20 781s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0"}],"Type" => "Packaging","Msg" => "other-conflict\n","CommitId" => "5c115b3d4589514b997b0c81347bbc6789296a1a","Tree" => "11cb3d048b147c76ac8e15998d01b777a72434a7","Hdr" => "tree 11cb3d048b147c76ac8e15998d01b777a72434a7\nparent cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000007 +0100\n"} 781s git-debrebase get_differs c441f3b13985fc4b000fd25c35a60b7026a9d477 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 = 0x22 781s git-debrebase classify cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 $t=8ec2e8af3cc50dca242c85f8e0cf6e6abde54143 @p c441f3b13985fc4b000fd25c35a60b7026a9d477/0x22 781s git-debrebase = Mixed {"Msg" => "MIXED add both(-other) (other)\n","Tree" => "8ec2e8af3cc50dca242c85f8e0cf6e6abde54143","CommitId" => "cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0","Hdr" => "tree 8ec2e8af3cc50dca242c85f8e0cf6e6abde54143\nparent c441f3b13985fc4b000fd25c35a60b7026a9d477\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Differs" => 34}],"Type" => "Mixed"} 781s git-debrebase get_differs 16fdcfc4a487589ef6e2aed24a5d717bde301a34 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 = 0x2 781s git-debrebase classify c441f3b13985fc4b000fd25c35a60b7026a9d477 $t=6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3 @p 16fdcfc4a487589ef6e2aed24a5d717bde301a34/0x2 781s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src-other.c (other)\n","CommitId" => "c441f3b13985fc4b000fd25c35a60b7026a9d477","Tree" => "6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3","Hdr" => "tree 6aeb79677bdf46a1e1d33b0fe85350e7d00e1fd3\nparent 16fdcfc4a487589ef6e2aed24a5d717bde301a34\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Parents" => [{"CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 781s git-debrebase get_differs 25b5400e549fae4178ac03009ca007e4d5de00dc 0b23db5d4cdb928c7302154a99ab0e961fcb877a = 0x20 781s git-debrebase classify 16fdcfc4a487589ef6e2aed24a5d717bde301a34 $t=0b23db5d4cdb928c7302154a99ab0e961fcb877a @p 25b5400e549fae4178ac03009ca007e4d5de00dc/0x20 781s git-debrebase = Packaging {"Hdr" => "tree 0b23db5d4cdb928c7302154a99ab0e961fcb877a\nparent 25b5400e549fae4178ac03009ca007e4d5de00dc\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","CommitId" => "16fdcfc4a487589ef6e2aed24a5d717bde301a34","Tree" => "0b23db5d4cdb928c7302154a99ab0e961fcb877a","Msg" => "DEBIAN add zorkmid-other (other)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"}]} 781s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 781s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 781s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 781s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Ix" => 0},{"Differs" => 0,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Ix" => 1}],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","SubType" => "Ambiguous","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe"} 781s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 781s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 781s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Ix" => 0}],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 781s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 781s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 781s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (before)\n","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","Parents" => [{"Ix" => 0,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Differs" => 2}],"Type" => "Upstream"} 781s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 781s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 781s git-debrebase = Upstream {"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Differs" => 2}]} 781s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 781s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 781s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 781s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 781s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 781s git-debrebase = Upstream {"Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}]} 781s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 781s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 781s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}],"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 781s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 781s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 781s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa"} 781s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 781s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 781s git-debrebase = Changelog {"Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 781s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 781s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 781s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 781s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 781s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 781s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 781s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 781s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 7 upp 7 proc 16 pm 0 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 17 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 781s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 781s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 781s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 781s git-debrebase WALK BUILD 16fdcfc4a487589ef6e2aed24a5d717bde301a34 Debian (rewriting=0) 781s git-debrebase WALK REWRITING NOW cl=HASH(0x5565eda6f198) procd=HASH(0x5565eda7a128) 781s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 781s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Debian (rewriting=1) 781s git-debrebase WALK BUILD 5c115b3d4589514b997b0c81347bbc6789296a1a Debian (rewriting=1) 781s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 781s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=1) 781s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=1) 781s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=1) 781s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=1) 781s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=1) 781s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 781s git-debrebase WALK BUILD c441f3b13985fc4b000fd25c35a60b7026a9d477 Upstream (rewriting=1) 781s git-debrebase WALK BUILD cef09e113eb27d9c7a70fcdfdc0b07351d7d02d0 Upstream (rewriting=1) 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase get_differs 54ff134d627894fa89bc5b5a1c8e95e0e60e4d18 5c115b3d4589514b997b0c81347bbc6789296a1a = 0 781s git-debrebase *** WALK RETURN 54ff134d627894fa89bc5b5a1c8e95e0e60e4d18 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 781s git-debrebase mwrecknote right-input 5c115b3d4589514b997b0c81347bbc6789296a1a 781s git-debrebase mwrecknote right-laundered 54ff134d627894fa89bc5b5a1c8e95e0e60e4d18 781s git-debrebase mwrecknote right-breakwater 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 781s git-debrebase mwrecknote right-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 781s git-debrebase MERGE BA best=694fabd170763cd189561b2d5ded51b5f5b05d34 p=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 781s git-debrebase mwrecknote result-anchor 694fabd170763cd189561b2d5ded51b5f5b05d34 781s git-debrebase mwrecknote interchange-mbcand-ok-0 25b5400e549fae4178ac03009ca007e4d5de00dc 781s git-debrebase *** WALK 25b5400e549fae4178ac03009ca007e4d5de00dc 0 - 781s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 781s git-debrebase get_differs 6edd94b52b631f4746ff2c69392544c34fb93858 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0 781s git-debrebase classify 25b5400e549fae4178ac03009ca007e4d5de00dc $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 8afdeca0bc5af448f4f39cd06ad3fd49532e0136/0 6edd94b52b631f4746ff2c69392544c34fb93858/0 781s git-debrebase = Pseudomerge {"Parents" => [{"Differs" => 0,"CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Ix" => 0},{"Ix" => 1,"CommitId" => "6edd94b52b631f4746ff2c69392544c34fb93858","Differs" => 0}],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","SubType" => "Ambiguous","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 8afdeca0bc5af448f4f39cd06ad3fd49532e0136\nparent 6edd94b52b631f4746ff2c69392544c34fb93858\nauthor dgit test git user 1530000005 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","CommitId" => "25b5400e549fae4178ac03009ca007e4d5de00dc"} 781s git-debrebase get_differs 80a8e21903bd775225c62ff4a16852eb9dacbee3 af6c6fa9b375dcca6288346d8544faaeea2aeefe = 0x2 781s git-debrebase classify 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 $t=af6c6fa9b375dcca6288346d8544faaeea2aeefe @p 80a8e21903bd775225c62ff4a16852eb9dacbee3/0x2 781s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3"}],"Type" => "Upstream","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "8afdeca0bc5af448f4f39cd06ad3fd49532e0136","Tree" => "af6c6fa9b375dcca6288346d8544faaeea2aeefe","Hdr" => "tree af6c6fa9b375dcca6288346d8544faaeea2aeefe\nparent 80a8e21903bd775225c62ff4a16852eb9dacbee3\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 781s git-debrebase get_differs 21a05eb1a007fc359f7f61a85155968a6a2fa183 e59055ff805942fa4dd991330f3d6e20c7e308fd = 0x2 781s git-debrebase classify 80a8e21903bd775225c62ff4a16852eb9dacbee3 $t=e59055ff805942fa4dd991330f3d6e20c7e308fd @p 21a05eb1a007fc359f7f61a85155968a6a2fa183/0x2 781s git-debrebase = Upstream {"Tree" => "e59055ff805942fa4dd991330f3d6e20c7e308fd","CommitId" => "80a8e21903bd775225c62ff4a16852eb9dacbee3","Hdr" => "tree e59055ff805942fa4dd991330f3d6e20c7e308fd\nparent 21a05eb1a007fc359f7f61a85155968a6a2fa183\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183"}]} 781s git-debrebase get_differs eae56baf9264c3260193cb0771bfcdc8afb2c883 9177be7c131370febf901947ab7237b6e55edaa3 = 0x2 781s git-debrebase classify 21a05eb1a007fc359f7f61a85155968a6a2fa183 $t=9177be7c131370febf901947ab7237b6e55edaa3 @p eae56baf9264c3260193cb0771bfcdc8afb2c883/0x2 781s git-debrebase = Upstream {"Hdr" => "tree 9177be7c131370febf901947ab7237b6e55edaa3\nparent eae56baf9264c3260193cb0771bfcdc8afb2c883\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "9177be7c131370febf901947ab7237b6e55edaa3","CommitId" => "21a05eb1a007fc359f7f61a85155968a6a2fa183","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Differs" => 2}]} 781s git-debrebase get_differs e5fc35d042e9152dde69fe17388b9b11794cfef5 0077270cd9a130dbcd7d45ec01adc4f94a941a5c = 0x2 781s git-debrebase classify eae56baf9264c3260193cb0771bfcdc8afb2c883 $t=0077270cd9a130dbcd7d45ec01adc4f94a941a5c @p e5fc35d042e9152dde69fe17388b9b11794cfef5/0x2 781s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5"}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 0077270cd9a130dbcd7d45ec01adc4f94a941a5c\nparent e5fc35d042e9152dde69fe17388b9b11794cfef5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "eae56baf9264c3260193cb0771bfcdc8afb2c883","Tree" => "0077270cd9a130dbcd7d45ec01adc4f94a941a5c"} 781s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 b844d7e259825f957f5218a07ab2b5bc77b5f666 = 0x2 781s git-debrebase classify e5fc35d042e9152dde69fe17388b9b11794cfef5 $t=b844d7e259825f957f5218a07ab2b5bc77b5f666 @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x2 781s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree b844d7e259825f957f5218a07ab2b5bc77b5f666\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "b844d7e259825f957f5218a07ab2b5bc77b5f666","CommitId" => "e5fc35d042e9152dde69fe17388b9b11794cfef5","Parents" => [{"Differs" => 2,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}],"Type" => "Upstream"} 781s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 781s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 781s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Ix" => 0,"Differs" => 32}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 781s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 781s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 781s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n"} 781s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 781s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 781s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 781s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 781s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 781s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 781s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 781s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 781s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 781s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 781s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 12 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase WALK BUILD 5402b11174c7526744a60cd1accfa3aeecbc7e5d Debian (rewriting=0) 781s git-debrebase WALK BUILD fc9b56489e07bdd371d3da847892acc46dfd58a8 Debian (rewriting=0) 781s git-debrebase WALK BUILD bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Debian (rewriting=0) 781s git-debrebase WALK BUILD 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Debian (rewriting=0) 781s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 781s git-debrebase WALK BUILD e5fc35d042e9152dde69fe17388b9b11794cfef5 Upstream (rewriting=0) 781s git-debrebase WALK BUILD eae56baf9264c3260193cb0771bfcdc8afb2c883 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 21a05eb1a007fc359f7f61a85155968a6a2fa183 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 80a8e21903bd775225c62ff4a16852eb9dacbee3 Upstream (rewriting=0) 781s git-debrebase WALK BUILD 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 Upstream (rewriting=0) 781s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase get_differs 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 25b5400e549fae4178ac03009ca007e4d5de00dc = 0 781s git-debrebase *** WALK RETURN 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 075ef1bebca2f99591cafd47f62fb9ceb67c6317 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 781s git-debrebase mwrecknote mergebase-laundered 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 781s git-debrebase mwrecknote mergebase-breakwater 075ef1bebca2f99591cafd47f62fb9ceb67c6317 781s git-debrebase mwrecknote mergebase-anchor 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 781s git-debrebase *** WALK prep done cur=a25963afb7676bc7ab7d5316b21a3caf49cd41d8 brw 3 upp 2 proc 4 pm -1 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase WALK REBUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 5 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 781s git-debrebase WALK BUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 MergeCreateMergedBreakwaters (rewriting=0) 781s Found a general merge, will try to tidy it up. 781s git-debrebase WALK BUILD 76a64aea247c93e6d492a4d4d163d851caaa9d59 Debian (rewriting=1) 781s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 781s git-debrebase WALK BUILD 483bec124bc0b081dc1354cb8d2c5542b8742f83 Debian (rewriting=1) 781s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 781s git-debrebase WALK BUILD a25963afb7676bc7ab7d5316b21a3caf49cd41d8 MergeMergeSeries (rewriting=1) 781s git-debrebase >(no reflog) 781s Running merge resolution for a25963afb7676bc7ab7d5316b21a3caf49cd41d8... 781s git-debrebase mwrecknote new-base 937c1b2189426659100db91673264976a0879dc4 781s git-debrebase merge_series newbase=937c1b2189426659100db91673264976a0879dc4 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 781s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 782s git-debrebase gbp_pq_export p-base 075ef1bebca2f99591cafd47f62fb9ceb67c6317 8afdeca0bc5af448f4f39cd06ad3fd49532e0136 782s git-debrebase merge_series pec a95d9ec5899ee3a8677b9af1aa3a20671114492f pec' 938175fcfc5c5b289e3a9deca1a86116db92315a 782s git-debrebase mwrecknote mergebase-patchqueue 938175fcfc5c5b289e3a9deca1a86116db92315a 782s git-debrebase gbp_pq_export p-1 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 54ff134d627894fa89bc5b5a1c8e95e0e60e4d18 782s git-debrebase merge_series pec 1cde272eb026ee8b82dbe9419790fa49c455f210 pec' bfbec1ca44e752dcf0466218133f5a9425caf4c7 782s git-debrebase mwrecknote right-patchqueue bfbec1ca44e752dcf0466218133f5a9425caf4c7 782s git-debrebase gbp_pq_export p-0 d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 63570646c8a86a28ffdae60e9a2206bfaab7b2e9 782s git-debrebase merge_series pec 12b77c083714f5f923dd102074227958cdb9c27a pec' 22b59d2488e768c550738ffb393cb9b83b6eb05c 782s git-debrebase mwrecknote left-patchqueue 22b59d2488e768c550738ffb393cb9b83b6eb05c 782s git-debrebase merge_series merging... 782s git-debrebase merge_series merge ok, series... 782s git-debrebase merge_series patch 0001-Add-a-new-upstream-file.patch keep 782s merge_series patch 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0002-Edit-the-.c-file.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series patch 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0004-UPSTREAM-edit-src.c-before.patch -> subdir/addnewups keep 782s merge_series patch 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0005-MIXED-add-both-before.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0005-MIXED-add-both-before.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0005-MIXED-add-both-before.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0005-MIXED-add-both-before.patch -> subdir/addnewups keep 782s merge_series patch 0006-UPSTREAM-edit-src-other.c-other.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-other.c-other.patch -> subdir/addnewups keep 782s merge_series patch 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0006-UPSTREAM-edit-src-us.c-us-1.patch -> subdir/addnewups keep 782s merge_series patch 0007-MIXED-add-both-other-other.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> 0006-UPSTREAM-edit-src-other.c-other.patch keep 782s merge_series prereq 0007-MIXED-add-both-other-other.patch -> subdir/addnewups keep 782s merge_series patch 0007-MIXED-add-both-us-us-1.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 782s merge_series prereq 0007-MIXED-add-both-us-us-1.patch -> subdir/addnewups keep 782s merge_series patch 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 782s merge_series prereq 0008-UPSTREAM-edit-src-us.c-us-2.patch -> subdir/addnewups keep 782s merge_series patch 0009-MIXED-add-both-us-us-2.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0002-Edit-the-.c-file.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0004-UPSTREAM-edit-src.c-before.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0005-MIXED-add-both-before.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0006-UPSTREAM-edit-src-us.c-us-1.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0007-MIXED-add-both-us-us-1.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> 0008-UPSTREAM-edit-src-us.c-us-2.patch keep 782s merge_series prereq 0009-MIXED-add-both-us-us-2.patch -> subdir/addnewups keep 782s merge_series patch subdir/addnewups keep 782s merge_series prereq subdir/addnewups -> 0001-Add-a-new-upstream-file.patch keep 782s merge_series prereq subdir/addnewups -> 0002-Edit-the-.c-file.patch keep 782s merge_series series next 0001-Add-a-new-upstream-file.patch 782s git-debrebase merge_series series next 0002-Edit-the-.c-file.patch 782s git-debrebase merge_series series next subdir/addnewups 782s git-debrebase merge_series series next 0004-UPSTREAM-edit-src.c-before.patch 782s git-debrebase merge_series series next 0005-MIXED-add-both-before.patch 782s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-other.c-other.patch 782s git-debrebase merge_series series next 0007-MIXED-add-both-other-other.patch 782s git-debrebase merge_series series next 0006-UPSTREAM-edit-src-us.c-us-1.patch 782s git-debrebase merge_series series next 0007-MIXED-add-both-us-us-1.patch 782s git-debrebase merge_series series next 0008-UPSTREAM-edit-src-us.c-us-2.patch 782s git-debrebase merge_series series next 0009-MIXED-add-both-us-us-2.patch 782s git-debrebase mwrecknote merged-patchqueue 0019885f4db6282e06c44fd28d304c869d957a02 782s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 782s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/merge 782s git-debrebase merge_series series gbp pq import 782s gbp:info: Trying to apply patches at '0019885f4db6282e06c44fd28d304c869d957a02' 782s gbp:info: 11 patches listed in 'debian/patches/series' imported on 'patch-queue/mergec' 782s git-debrebase merge_series series ok, building... 782s git-debrebase merge_series series ok, building 1a1717df447868dd116a2eb42631553c8f6df874 782s git-debrebase merge_series series ok, building 4eed1de673a238fe44a4ed3c9c0932221cf2a7c3 782s git-debrebase merge_series series ok, building 40a25a693d903bf2fc2620ff5c82fc0c286d57b4 782s git-debrebase merge_series series ok, building 7d5a3d34a486b29600f9351bcd3a648a7d6f46b2 782s git-debrebase merge_series series ok, building 5a3e024008f8d2e844955f92ec07bea63a6f34a9 782s git-debrebase merge_series series ok, building d221014c1360e4d3a717ac8f5c021ca2c219b2a5 782s git-debrebase merge_series series ok, building c1c1985d0bd4489b700f629c40ec1c62bb3a209d 782s git-debrebase merge_series series ok, building 59fa9d98eb8b75ab5fc92aa696eeb0aa4ae6b8fc 782s git-debrebase merge_series series ok, building 7e602293d7dd8601ca27bf8a930f4fd7c6ae7bbe 782s git-debrebase merge_series series ok, building f4e0d75788ff6fb330872eed13390f397a707f55 782s git-debrebase merge_series series ok, building 590255e085fc0596488186b8d05c98d4b3939d7a 782s git-debrebase mwrecknote merged-result 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 782s git-debrebase merge_series done debug=9133296b250607b6a0a1633430ba2d0b43b17a85 782s git-debrebase mwrecknote merged-debug 9133296b250607b6a0a1633430ba2d0b43b17a85 782s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 782s git-debrebase merge_series returns 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 782s git-debrebase get_differs 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 483bec124bc0b081dc1354cb8d2c5542b8742f83 = 0x2 782s git-debrebase get_differs 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b a25963afb7676bc7ab7d5316b21a3caf49cd41d8 = 0x20 782s Merge resolution successful. 782s git-debrebase WALK BUILD 27e72c748098b91c81e4f67b285427ecae2f10bb Upstream (rewriting=1) 782s git-debrebase WALK BUILD 483bec124bc0b081dc1354cb8d2c5542b8742f83 Upstream (rewriting=1) 782s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 782s git-debrebase get_differs f463f9e290a21ba0a8042dab055ee456cecd94e5 483bec124bc0b081dc1354cb8d2c5542b8742f83 = 0 782s git-debrebase *** WALK RETURN f463f9e290a21ba0a8042dab055ee456cecd94e5 937c1b2189426659100db91673264976a0879dc4 694fabd170763cd189561b2d5ded51b5f5b05d34 782s git-debrebase: laundered (head was 483bec124bc0b081dc1354cb8d2c5542b8742f83) 782s git-debrebase >= update refs/ffq-prev/heads/master 483bec124bc0b081dc1354cb8d2c5542b8742f83 0000000000000000000000000000000000000000 782s git-debrebase >= delete refs/debrebase-last/heads/master 782s git-debrebase >= update HEAD f463f9e290a21ba0a8042dab055ee456cecd94e5 483bec124bc0b081dc1354cb8d2c5542b8742f83 782s git-debrebase >$ 782s Recorded previous head for preservation 782s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 782s ' 782s + t-gdr-good laundered 782s + local state=laundered 782s + local beforetag= 782s + case $state in 782s + git diff --quiet -- :. ':!debian/patches' 782s + LC_MESSAGES=C 782s + t-git-debrebase status 782s + local gdr=git-debrebase 782s + : ' 782s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 782s + git-debrebase --dgit=dgit -D --experimental-merge-resolution status 782s git-debrebase get_differs becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 782s git-debrebase classify f463f9e290a21ba0a8042dab055ee456cecd94e5 $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p becb4ef38f1b6087bfc923eccef2fb5f02abd8b8/0x2 782s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8"}],"Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94","CommitId" => "f463f9e290a21ba0a8042dab055ee456cecd94e5","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent becb4ef38f1b6087bfc923eccef2fb5f02abd8b8\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 782s git-debrebase get_differs 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 782s git-debrebase classify becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b/0x2 782s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (after)\n","Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b"}],"Type" => "Upstream","Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e"} 782s git-debrebase get_differs 9738e08c35cd075193992a6f0ff1bc671c1effb9 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 782s git-debrebase classify 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 9738e08c35cd075193992a6f0ff1bc671c1effb9/0x2 782s git-debrebase = Upstream {"Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9"}],"CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b","Hdr" => "tree dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 9738e08c35cd075193992a6f0ff1bc671c1effb9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch"} 782s git-debrebase get_differs 4c47fcf4f2d15218e3a241550df450ff407e5090 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 782s git-debrebase classify 9738e08c35cd075193992a6f0ff1bc671c1effb9 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 4c47fcf4f2d15218e3a241550df450ff407e5090/0x2 782s git-debrebase = Upstream {"Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 4c47fcf4f2d15218e3a241550df450ff407e5090\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9","Tree" => "7ce18c5e10981609d50192088aa2c9ddab148e5f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090"}],"Type" => "Upstream"} 782s git-debrebase get_differs 731cc3da98a8b3d7254e52b614ddb2c21373a745 320f33774da63c1af34184340b30482ab2d0646f = 0x2 782s git-debrebase classify 4c47fcf4f2d15218e3a241550df450ff407e5090 $t=320f33774da63c1af34184340b30482ab2d0646f @p 731cc3da98a8b3d7254e52b614ddb2c21373a745/0x2 782s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745"}],"Tree" => "320f33774da63c1af34184340b30482ab2d0646f","CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch","Hdr" => "tree 320f33774da63c1af34184340b30482ab2d0646f\nparent 731cc3da98a8b3d7254e52b614ddb2c21373a745\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 782s git-debrebase get_differs ed6545edf4d2a3112c786bdeb207bb43c63166e8 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 782s git-debrebase classify 731cc3da98a8b3d7254e52b614ddb2c21373a745 $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p ed6545edf4d2a3112c786bdeb207bb43c63166e8/0x2 782s git-debrebase = Upstream {"Hdr" => "tree 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent ed6545edf4d2a3112c786bdeb207bb43c63166e8\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745","Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db","Type" => "Upstream","Parents" => [{"CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8","Ix" => 0,"Differs" => 2}]} 782s git-debrebase get_differs 84c02475194c8c40abd163442c5ad31af5db71c5 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 782s git-debrebase classify ed6545edf4d2a3112c786bdeb207bb43c63166e8 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 84c02475194c8c40abd163442c5ad31af5db71c5/0x2 782s git-debrebase = Upstream {"Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340","Type" => "Upstream","Parents" => [{"CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5","Differs" => 2,"Ix" => 0}],"CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8","Hdr" => "tree 4c4a6301aed0ae82707d492584b12ed493ad7340\nparent 84c02475194c8c40abd163442c5ad31af5db71c5\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch"} 782s git-debrebase get_differs 19ba2342be5601a9a65d0eb0e9017463b275b702 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 782s git-debrebase classify 84c02475194c8c40abd163442c5ad31af5db71c5 $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p 19ba2342be5601a9a65d0eb0e9017463b275b702/0x2 782s git-debrebase = Upstream {"Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent 19ba2342be5601a9a65d0eb0e9017463b275b702\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5","Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8","Parents" => [{"CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 782s git-debrebase get_differs ac65c6d65e81c68b187c326dd98d939ec1851dcb d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 782s git-debrebase classify 19ba2342be5601a9a65d0eb0e9017463b275b702 $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p ac65c6d65e81c68b187c326dd98d939ec1851dcb/0x2 782s git-debrebase = Upstream {"CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Tree" => "d528e23895b1ecfa8c8af7e67d226e9c73ff23df","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb"}],"Hdr" => "tree d528e23895b1ecfa8c8af7e67d226e9c73ff23df\nparent ac65c6d65e81c68b187c326dd98d939ec1851dcb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch"} 782s git-debrebase get_differs 72b7c7a86257b0aeb823765abe427c8370f311b9 170122084d775751a61793936186c10b4ca772fa = 0x2 782s git-debrebase classify ac65c6d65e81c68b187c326dd98d939ec1851dcb $t=170122084d775751a61793936186c10b4ca772fa @p 72b7c7a86257b0aeb823765abe427c8370f311b9/0x2 782s git-debrebase = Upstream {"CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9"}],"Tree" => "170122084d775751a61793936186c10b4ca772fa","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 72b7c7a86257b0aeb823765abe427c8370f311b9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 782s git-debrebase get_differs ab077ca528976054ab36bc8ac27380d4d1cb2c42 953d36410163f668869d1114fad41586b0005040 = 0x2 782s git-debrebase classify 72b7c7a86257b0aeb823765abe427c8370f311b9 $t=953d36410163f668869d1114fad41586b0005040 @p ab077ca528976054ab36bc8ac27380d4d1cb2c42/0x2 782s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent ab077ca528976054ab36bc8ac27380d4d1cb2c42\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42"}],"Tree" => "953d36410163f668869d1114fad41586b0005040","CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9"} 782s git-debrebase get_differs 19e490ce4be22044c5d125478ef04816d173135e 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 782s git-debrebase classify ab077ca528976054ab36bc8ac27380d4d1cb2c42 $t=337538f5b7a945372f29120288088e8dfebbfc9a @p 19e490ce4be22044c5d125478ef04816d173135e/0x2 782s git-debrebase = Upstream {"CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42","Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "19e490ce4be22044c5d125478ef04816d173135e"}],"Type" => "Upstream","Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent 19e490ce4be22044c5d125478ef04816d173135e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 782s git-debrebase get_differs 937c1b2189426659100db91673264976a0879dc4 efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 782s git-debrebase classify 19e490ce4be22044c5d125478ef04816d173135e $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 937c1b2189426659100db91673264976a0879dc4/0x2 782s git-debrebase = Upstream {"Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "937c1b2189426659100db91673264976a0879dc4"}],"Type" => "Upstream","CommitId" => "19e490ce4be22044c5d125478ef04816d173135e","Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 937c1b2189426659100db91673264976a0879dc4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 783s git-debrebase get_differs 625036c9eb0e04fbcf7976a5f3892401d22cd74b 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 783s git-debrebase classify 937c1b2189426659100db91673264976a0879dc4 $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p 625036c9eb0e04fbcf7976a5f3892401d22cd74b/0x20 783s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b"}],"Type" => "Packaging","Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","CommitId" => "937c1b2189426659100db91673264976a0879dc4","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent 625036c9eb0e04fbcf7976a5f3892401d22cd74b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs c9eb967d19ff3ad6d28665dab962df26c0426acf 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 783s git-debrebase classify 625036c9eb0e04fbcf7976a5f3892401d22cd74b $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p c9eb967d19ff3ad6d28665dab962df26c0426acf/0x20 783s git-debrebase = Packaging {"CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b","Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf"}],"Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent c9eb967d19ff3ad6d28665dab962df26c0426acf\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid (after)\n"} 783s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 783s git-debrebase get_differs 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 783s git-debrebase classify c9eb967d19ff3ad6d28665dab962df26c0426acf $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4/0x32 783s git-debrebase = MergedBreakwaters {"Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf","Parents" => [{"IsDgitImport" => undef,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Differs" => 32,"IsOrigin" => "","Ix" => 0},{"Ix" => 1,"IsOrigin" => "","Differs" => 50,"CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","IsDgitImport" => undef}],"Type" => "MergedBreakwaters","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 783s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 783s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Parents" => [{"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6"} 783s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 783s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 783s git-debrebase = Packaging {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 783s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 783s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 783s git-debrebase = Packaging {"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Type" => "Packaging","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Ix" => 0,"Differs" => 32}],"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 783s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 783s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 783s git-debrebase = Changelog {"Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Type" => "Changelog","Parents" => [{"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0,"Differs" => 16}],"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"} 783s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 783s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 783s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 783s git-debrebase = Anchor {"Type" => "Anchor","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a"},{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 783s git-debrebase get_differs c65db7f1ec89de8e69667cdf099a9144e22daa7e 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 783s git-debrebase classify 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p c65db7f1ec89de8e69667cdf099a9144e22daa7e/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent c65db7f1ec89de8e69667cdf099a9144e22daa7e\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "other-conflict\n","CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e"}],"Type" => "Packaging"} 783s git-debrebase get_differs 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 783s git-debrebase classify c65db7f1ec89de8e69667cdf099a9144e22daa7e $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 783s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 783s git-debrebase classify 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid-other (other)\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}],"Type" => "Packaging","CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05"} 783s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 783s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 783s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 783s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 783s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 783s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}],"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Msg" => "DEBIAN add zorkmid (before)\n","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 783s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 783s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 783s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"} 783s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 783s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 783s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 783s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 783s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 783s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 783s git-debrebase = Anchor {"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 783s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 783s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 783s ' 783s + case $state in 783s + egrep '^ *branch is laundered' ../status.check 783s branch is laundered 783s + t-gdr-good-analyse HEAD laundered 783s + local head=HEAD 783s + local state=laundered 783s + local wsfx= 783s + local etypes bwtip 783s + case $state in 783s + etypes=Upstream 783s ++ t-git-debrebase breakwater 783s ++ local gdr=git-debrebase 783s ++ : ' 783s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 783s ++ git-debrebase --dgit=dgit -D --experimental-merge-resolution breakwater 783s git-debrebase get_differs becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 783s git-debrebase classify f463f9e290a21ba0a8042dab055ee456cecd94e5 $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p becb4ef38f1b6087bfc923eccef2fb5f02abd8b8/0x2 783s git-debrebase = Upstream {"Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent becb4ef38f1b6087bfc923eccef2fb5f02abd8b8\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8","Ix" => 0}],"CommitId" => "f463f9e290a21ba0a8042dab055ee456cecd94e5","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94"} 783s git-debrebase get_differs 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 783s git-debrebase classify becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b/0x2 783s git-debrebase = Upstream {"CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b"}],"Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e","Msg" => "UPSTREAM edit src.c (after)\n","Type" => "Upstream"} 783s git-debrebase get_differs 9738e08c35cd075193992a6f0ff1bc671c1effb9 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 783s git-debrebase classify 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 9738e08c35cd075193992a6f0ff1bc671c1effb9/0x2 783s git-debrebase = Upstream {"Hdr" => "tree dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 9738e08c35cd075193992a6f0ff1bc671c1effb9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9","Ix" => 0}],"CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b","Type" => "Upstream","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db"} 783s git-debrebase get_differs 4c47fcf4f2d15218e3a241550df450ff407e5090 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 783s git-debrebase classify 9738e08c35cd075193992a6f0ff1bc671c1effb9 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 4c47fcf4f2d15218e3a241550df450ff407e5090/0x2 783s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090","Ix" => 0}],"CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9","Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 4c47fcf4f2d15218e3a241550df450ff407e5090\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Type" => "Upstream","Tree" => "7ce18c5e10981609d50192088aa2c9ddab148e5f"} 783s git-debrebase get_differs 731cc3da98a8b3d7254e52b614ddb2c21373a745 320f33774da63c1af34184340b30482ab2d0646f = 0x2 783s git-debrebase classify 4c47fcf4f2d15218e3a241550df450ff407e5090 $t=320f33774da63c1af34184340b30482ab2d0646f @p 731cc3da98a8b3d7254e52b614ddb2c21373a745/0x2 783s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch","Tree" => "320f33774da63c1af34184340b30482ab2d0646f","Parents" => [{"Ix" => 0,"CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745","Differs" => 2}],"CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090","Hdr" => "tree 320f33774da63c1af34184340b30482ab2d0646f\nparent 731cc3da98a8b3d7254e52b614ddb2c21373a745\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs ed6545edf4d2a3112c786bdeb207bb43c63166e8 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 783s git-debrebase classify 731cc3da98a8b3d7254e52b614ddb2c21373a745 $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p ed6545edf4d2a3112c786bdeb207bb43c63166e8/0x2 783s git-debrebase = Upstream {"Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Type" => "Upstream","Hdr" => "tree 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent ed6545edf4d2a3112c786bdeb207bb43c63166e8\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8"}]} 783s git-debrebase get_differs 84c02475194c8c40abd163442c5ad31af5db71c5 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 783s git-debrebase classify ed6545edf4d2a3112c786bdeb207bb43c63166e8 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 84c02475194c8c40abd163442c5ad31af5db71c5/0x2 783s git-debrebase = Upstream {"Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Type" => "Upstream","Hdr" => "tree 4c4a6301aed0ae82707d492584b12ed493ad7340\nparent 84c02475194c8c40abd163442c5ad31af5db71c5\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8","Parents" => [{"CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5","Differs" => 2,"Ix" => 0}]} 783s git-debrebase get_differs 19ba2342be5601a9a65d0eb0e9017463b275b702 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 783s git-debrebase classify 84c02475194c8c40abd163442c5ad31af5db71c5 $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p 19ba2342be5601a9a65d0eb0e9017463b275b702/0x2 783s git-debrebase = Upstream {"CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5","Parents" => [{"CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent 19ba2342be5601a9a65d0eb0e9017463b275b702\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Type" => "Upstream"} 783s git-debrebase get_differs ac65c6d65e81c68b187c326dd98d939ec1851dcb d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 783s git-debrebase classify 19ba2342be5601a9a65d0eb0e9017463b275b702 $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p ac65c6d65e81c68b187c326dd98d939ec1851dcb/0x2 783s git-debrebase = Upstream {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Type" => "Upstream","Tree" => "d528e23895b1ecfa8c8af7e67d226e9c73ff23df","Parents" => [{"CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb","Differs" => 2,"Ix" => 0}],"CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Hdr" => "tree d528e23895b1ecfa8c8af7e67d226e9c73ff23df\nparent ac65c6d65e81c68b187c326dd98d939ec1851dcb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs 72b7c7a86257b0aeb823765abe427c8370f311b9 170122084d775751a61793936186c10b4ca772fa = 0x2 783s git-debrebase classify ac65c6d65e81c68b187c326dd98d939ec1851dcb $t=170122084d775751a61793936186c10b4ca772fa @p 72b7c7a86257b0aeb823765abe427c8370f311b9/0x2 783s git-debrebase = Upstream {"Tree" => "170122084d775751a61793936186c10b4ca772fa","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch","CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9"}],"Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 72b7c7a86257b0aeb823765abe427c8370f311b9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs ab077ca528976054ab36bc8ac27380d4d1cb2c42 953d36410163f668869d1114fad41586b0005040 = 0x2 783s git-debrebase classify 72b7c7a86257b0aeb823765abe427c8370f311b9 $t=953d36410163f668869d1114fad41586b0005040 @p ab077ca528976054ab36bc8ac27380d4d1cb2c42/0x2 783s git-debrebase = Upstream {"Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent ab077ca528976054ab36bc8ac27380d4d1cb2c42\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42","Differs" => 2,"Ix" => 0}],"CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "953d36410163f668869d1114fad41586b0005040"} 783s git-debrebase get_differs 19e490ce4be22044c5d125478ef04816d173135e 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 783s git-debrebase classify ab077ca528976054ab36bc8ac27380d4d1cb2c42 $t=337538f5b7a945372f29120288088e8dfebbfc9a @p 19e490ce4be22044c5d125478ef04816d173135e/0x2 783s git-debrebase = Upstream {"Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent 19e490ce4be22044c5d125478ef04816d173135e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42","Parents" => [{"Ix" => 0,"CommitId" => "19e490ce4be22044c5d125478ef04816d173135e","Differs" => 2}],"Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 783s git-debrebase get_differs 937c1b2189426659100db91673264976a0879dc4 efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 783s git-debrebase classify 19e490ce4be22044c5d125478ef04816d173135e $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 937c1b2189426659100db91673264976a0879dc4/0x2 783s git-debrebase = Upstream {"Parents" => [{"CommitId" => "937c1b2189426659100db91673264976a0879dc4","Differs" => 2,"Ix" => 0}],"CommitId" => "19e490ce4be22044c5d125478ef04816d173135e","Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 937c1b2189426659100db91673264976a0879dc4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143"} 783s git-debrebase get_differs 625036c9eb0e04fbcf7976a5f3892401d22cd74b 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 783s git-debrebase classify 937c1b2189426659100db91673264976a0879dc4 $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p 625036c9eb0e04fbcf7976a5f3892401d22cd74b/0x20 783s git-debrebase = Packaging {"Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","Parents" => [{"Differs" => 32,"CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b","Ix" => 0}],"CommitId" => "937c1b2189426659100db91673264976a0879dc4","Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent 625036c9eb0e04fbcf7976a5f3892401d22cd74b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs c9eb967d19ff3ad6d28665dab962df26c0426acf 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 783s git-debrebase classify 625036c9eb0e04fbcf7976a5f3892401d22cd74b $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p c9eb967d19ff3ad6d28665dab962df26c0426acf/0x20 783s git-debrebase = Packaging {"Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","Msg" => "DEBIAN add zorkmid (after)\n","Type" => "Packaging","Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent c9eb967d19ff3ad6d28665dab962df26c0426acf\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b","Parents" => [{"Differs" => 32,"CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf","Ix" => 0}]} 783s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 783s git-debrebase get_differs 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 783s git-debrebase classify c9eb967d19ff3ad6d28665dab962df26c0426acf $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4/0x32 783s git-debrebase = MergedBreakwaters {"Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf","Parents" => [{"IsOrigin" => "","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Differs" => 32,"Ix" => 0,"IsDgitImport" => undef},{"IsOrigin" => "","CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","Differs" => 50,"IsDgitImport" => undef,"Ix" => 1}],"Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Type" => "MergedBreakwaters"} 783s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 783s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 783s git-debrebase = Packaging {"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Type" => "Packaging","Msg" => "us-conflict\n","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Parents" => [{"Differs" => 32,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Ix" => 0}],"Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 783s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 783s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 783s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Differs" => 32}],"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103"} 783s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 783s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 783s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Differs" => 32,"Ix" => 0}]} 783s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 783s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 783s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Differs" => 16}],"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"} 783s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 783s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 783s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 783s git-debrebase = Anchor {"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","OrigParents" => [{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 783s git-debrebase get_differs c65db7f1ec89de8e69667cdf099a9144e22daa7e 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 783s git-debrebase classify 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p c65db7f1ec89de8e69667cdf099a9144e22daa7e/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent c65db7f1ec89de8e69667cdf099a9144e22daa7e\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","Parents" => [{"Ix" => 0,"CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Differs" => 32}],"Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Type" => "Packaging","Msg" => "other-conflict\n"} 783s git-debrebase get_differs 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 783s git-debrebase classify c65db7f1ec89de8e69667cdf099a9144e22daa7e $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Parents" => [{"Differs" => 32,"CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Ix" => 0}],"Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 783s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 783s git-debrebase classify 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 783s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Parents" => [{"Differs" => 32,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Ix" => 0}],"Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 783s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 783s git-debrebase = Packaging {"Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","Type" => "Packaging","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n"} 783s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 783s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 783s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (before)\n","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 783s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 783s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 783s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}]} 783s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 783s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 783s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 783s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 783s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 783s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 783s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 783s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 783s ' 783s + bwtip=Y:937c1b2189426659100db91673264976a0879dc4 783s + anal=../anal 783s + t-git-debrebase analyse HEAD 783s + local gdr=git-debrebase 783s + : ' 783s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 783s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse HEAD 783s git-debrebase *** WALK f463f9e290a21ba0a8042dab055ee456cecd94e5 1 *main::STDOUT 783s git-debrebase get_differs becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 08b4d440266f8a32c8baf2817a7ed53db9476b94 = 0x2 783s git-debrebase classify f463f9e290a21ba0a8042dab055ee456cecd94e5 $t=08b4d440266f8a32c8baf2817a7ed53db9476b94 @p becb4ef38f1b6087bfc923eccef2fb5f02abd8b8/0x2 783s git-debrebase = Upstream {"CommitId" => "f463f9e290a21ba0a8042dab055ee456cecd94e5","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8"}],"Tree" => "08b4d440266f8a32c8baf2817a7ed53db9476b94","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 08b4d440266f8a32c8baf2817a7ed53db9476b94\nparent becb4ef38f1b6087bfc923eccef2fb5f02abd8b8\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b b3664fc8202269e2ddaf0a8afac7c3c69c89700e = 0x2 783s git-debrebase classify becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 $t=b3664fc8202269e2ddaf0a8afac7c3c69c89700e @p 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b/0x2 783s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b"}],"CommitId" => "becb4ef38f1b6087bfc923eccef2fb5f02abd8b8","Type" => "Upstream","Hdr" => "tree b3664fc8202269e2ddaf0a8afac7c3c69c89700e\nparent 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src.c (after)\n","Tree" => "b3664fc8202269e2ddaf0a8afac7c3c69c89700e"} 783s git-debrebase get_differs 9738e08c35cd075193992a6f0ff1bc671c1effb9 dfc2b044477d951ef2d5a59908ca6641f0a738db = 0x2 783s git-debrebase classify 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b $t=dfc2b044477d951ef2d5a59908ca6641f0a738db @p 9738e08c35cd075193992a6f0ff1bc671c1effb9/0x2 783s git-debrebase = Upstream {"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0009-MIXED-add-both-us-us-2.patch","Hdr" => "tree dfc2b044477d951ef2d5a59908ca6641f0a738db\nparent 9738e08c35cd075193992a6f0ff1bc671c1effb9\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "dfc2b044477d951ef2d5a59908ca6641f0a738db","Parents" => [{"Differs" => 2,"CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9","Ix" => 0}],"Type" => "Upstream","CommitId" => "3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b"} 783s git-debrebase get_differs 4c47fcf4f2d15218e3a241550df450ff407e5090 7ce18c5e10981609d50192088aa2c9ddab148e5f = 0x2 783s git-debrebase classify 9738e08c35cd075193992a6f0ff1bc671c1effb9 $t=7ce18c5e10981609d50192088aa2c9ddab148e5f @p 4c47fcf4f2d15218e3a241550df450ff407e5090/0x2 783s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090","Ix" => 0}],"Type" => "Upstream","CommitId" => "9738e08c35cd075193992a6f0ff1bc671c1effb9","Hdr" => "tree 7ce18c5e10981609d50192088aa2c9ddab148e5f\nparent 4c47fcf4f2d15218e3a241550df450ff407e5090\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-2)\n\n\nGbp-Pq: Name 0008-UPSTREAM-edit-src-us.c-us-2.patch","Tree" => "7ce18c5e10981609d50192088aa2c9ddab148e5f"} 783s git-debrebase get_differs 731cc3da98a8b3d7254e52b614ddb2c21373a745 320f33774da63c1af34184340b30482ab2d0646f = 0x2 783s git-debrebase classify 4c47fcf4f2d15218e3a241550df450ff407e5090 $t=320f33774da63c1af34184340b30482ab2d0646f @p 731cc3da98a8b3d7254e52b614ddb2c21373a745/0x2 783s git-debrebase = Upstream {"CommitId" => "4c47fcf4f2d15218e3a241550df450ff407e5090","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745"}],"Tree" => "320f33774da63c1af34184340b30482ab2d0646f","Hdr" => "tree 320f33774da63c1af34184340b30482ab2d0646f\nparent 731cc3da98a8b3d7254e52b614ddb2c21373a745\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both(-us) (us-1)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-us-us-1.patch"} 783s git-debrebase get_differs ed6545edf4d2a3112c786bdeb207bb43c63166e8 4bcf95b33e0884588c97627a8a1d6565144b68db = 0x2 783s git-debrebase classify 731cc3da98a8b3d7254e52b614ddb2c21373a745 $t=4bcf95b33e0884588c97627a8a1d6565144b68db @p ed6545edf4d2a3112c786bdeb207bb43c63166e8/0x2 783s git-debrebase = Upstream {"Parents" => [{"CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8","Differs" => 2,"Ix" => 0}],"CommitId" => "731cc3da98a8b3d7254e52b614ddb2c21373a745","Type" => "Upstream","Hdr" => "tree 4bcf95b33e0884588c97627a8a1d6565144b68db\nparent ed6545edf4d2a3112c786bdeb207bb43c63166e8\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-us.c (us-1)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-us.c-us-1.patch","Tree" => "4bcf95b33e0884588c97627a8a1d6565144b68db"} 783s git-debrebase get_differs 84c02475194c8c40abd163442c5ad31af5db71c5 4c4a6301aed0ae82707d492584b12ed493ad7340 = 0x2 783s git-debrebase classify ed6545edf4d2a3112c786bdeb207bb43c63166e8 $t=4c4a6301aed0ae82707d492584b12ed493ad7340 @p 84c02475194c8c40abd163442c5ad31af5db71c5/0x2 783s git-debrebase = Upstream {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0007-MIXED-add-both-other-other.patch","Hdr" => "tree 4c4a6301aed0ae82707d492584b12ed493ad7340\nparent 84c02475194c8c40abd163442c5ad31af5db71c5\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "4c4a6301aed0ae82707d492584b12ed493ad7340","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5"}],"CommitId" => "ed6545edf4d2a3112c786bdeb207bb43c63166e8","Type" => "Upstream"} 783s git-debrebase get_differs 19ba2342be5601a9a65d0eb0e9017463b275b702 48963840b2862a360dd004044de5a24b3c83d8c8 = 0x2 783s git-debrebase classify 84c02475194c8c40abd163442c5ad31af5db71c5 $t=48963840b2862a360dd004044de5a24b3c83d8c8 @p 19ba2342be5601a9a65d0eb0e9017463b275b702/0x2 783s git-debrebase = Upstream {"Parents" => [{"CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "84c02475194c8c40abd163442c5ad31af5db71c5","Hdr" => "tree 48963840b2862a360dd004044de5a24b3c83d8c8\nparent 19ba2342be5601a9a65d0eb0e9017463b275b702\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src-other.c (other)\n\n\nGbp-Pq: Name 0006-UPSTREAM-edit-src-other.c-other.patch","Tree" => "48963840b2862a360dd004044de5a24b3c83d8c8"} 783s git-debrebase get_differs ac65c6d65e81c68b187c326dd98d939ec1851dcb d528e23895b1ecfa8c8af7e67d226e9c73ff23df = 0x2 783s git-debrebase classify 19ba2342be5601a9a65d0eb0e9017463b275b702 $t=d528e23895b1ecfa8c8af7e67d226e9c73ff23df @p ac65c6d65e81c68b187c326dd98d939ec1851dcb/0x2 783s git-debrebase = Upstream {"Tree" => "d528e23895b1ecfa8c8af7e67d226e9c73ff23df","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: upstream part]\n\nGbp-Pq: Name 0005-MIXED-add-both-before.patch","Hdr" => "tree d528e23895b1ecfa8c8af7e67d226e9c73ff23df\nparent ac65c6d65e81c68b187c326dd98d939ec1851dcb\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "19ba2342be5601a9a65d0eb0e9017463b275b702","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb"}]} 783s git-debrebase get_differs 72b7c7a86257b0aeb823765abe427c8370f311b9 170122084d775751a61793936186c10b4ca772fa = 0x2 783s git-debrebase classify ac65c6d65e81c68b187c326dd98d939ec1851dcb $t=170122084d775751a61793936186c10b4ca772fa @p 72b7c7a86257b0aeb823765abe427c8370f311b9/0x2 783s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "ac65c6d65e81c68b187c326dd98d939ec1851dcb","Parents" => [{"Differs" => 2,"CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9","Ix" => 0}],"Tree" => "170122084d775751a61793936186c10b4ca772fa","Hdr" => "tree 170122084d775751a61793936186c10b4ca772fa\nparent 72b7c7a86257b0aeb823765abe427c8370f311b9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src.c (before)\n\n\nGbp-Pq: Name 0004-UPSTREAM-edit-src.c-before.patch"} 783s git-debrebase get_differs ab077ca528976054ab36bc8ac27380d4d1cb2c42 953d36410163f668869d1114fad41586b0005040 = 0x2 783s git-debrebase classify 72b7c7a86257b0aeb823765abe427c8370f311b9 $t=953d36410163f668869d1114fad41586b0005040 @p ab077ca528976054ab36bc8ac27380d4d1cb2c42/0x2 783s git-debrebase = Upstream {"Tree" => "953d36410163f668869d1114fad41586b0005040","Hdr" => "tree 953d36410163f668869d1114fad41586b0005040\nparent ab077ca528976054ab36bc8ac27380d4d1cb2c42\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "72b7c7a86257b0aeb823765abe427c8370f311b9","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42"}]} 783s git-debrebase get_differs 19e490ce4be22044c5d125478ef04816d173135e 337538f5b7a945372f29120288088e8dfebbfc9a = 0x2 783s git-debrebase classify ab077ca528976054ab36bc8ac27380d4d1cb2c42 $t=337538f5b7a945372f29120288088e8dfebbfc9a @p 19e490ce4be22044c5d125478ef04816d173135e/0x2 783s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 337538f5b7a945372f29120288088e8dfebbfc9a\nparent 19e490ce4be22044c5d125478ef04816d173135e\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "337538f5b7a945372f29120288088e8dfebbfc9a","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "19e490ce4be22044c5d125478ef04816d173135e"}],"CommitId" => "ab077ca528976054ab36bc8ac27380d4d1cb2c42","Type" => "Upstream"} 783s git-debrebase get_differs 937c1b2189426659100db91673264976a0879dc4 efe85a2cec64a871da32e67c06c01674bd56f143 = 0x2 783s git-debrebase classify 19e490ce4be22044c5d125478ef04816d173135e $t=efe85a2cec64a871da32e67c06c01674bd56f143 @p 937c1b2189426659100db91673264976a0879dc4/0x2 783s git-debrebase = Upstream {"CommitId" => "19e490ce4be22044c5d125478ef04816d173135e","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "937c1b2189426659100db91673264976a0879dc4"}],"Tree" => "efe85a2cec64a871da32e67c06c01674bd56f143","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree efe85a2cec64a871da32e67c06c01674bd56f143\nparent 937c1b2189426659100db91673264976a0879dc4\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs 625036c9eb0e04fbcf7976a5f3892401d22cd74b 1bd039d4fd485427ff22f59123a3a27f729e9cd7 = 0x20 783s git-debrebase classify 937c1b2189426659100db91673264976a0879dc4 $t=1bd039d4fd485427ff22f59123a3a27f729e9cd7 @p 625036c9eb0e04fbcf7976a5f3892401d22cd74b/0x20 783s git-debrebase = Packaging {"CommitId" => "937c1b2189426659100db91673264976a0879dc4","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b"}],"Tree" => "1bd039d4fd485427ff22f59123a3a27f729e9cd7","Msg" => "MIXED add both() (after)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1bd039d4fd485427ff22f59123a3a27f729e9cd7\nparent 625036c9eb0e04fbcf7976a5f3892401d22cd74b\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 783s git-debrebase get_differs c9eb967d19ff3ad6d28665dab962df26c0426acf 571dff7c8d67a53ee1fa0f48175c01ed43949f6d = 0x20 783s git-debrebase classify 625036c9eb0e04fbcf7976a5f3892401d22cd74b $t=571dff7c8d67a53ee1fa0f48175c01ed43949f6d @p c9eb967d19ff3ad6d28665dab962df26c0426acf/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 571dff7c8d67a53ee1fa0f48175c01ed43949f6d\nparent c9eb967d19ff3ad6d28665dab962df26c0426acf\nauthor dgit test git user 1530000012 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "DEBIAN add zorkmid (after)\n","Tree" => "571dff7c8d67a53ee1fa0f48175c01ed43949f6d","Parents" => [{"Differs" => 32,"CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf","Ix" => 0}],"Type" => "Packaging","CommitId" => "625036c9eb0e04fbcf7976a5f3892401d22cd74b"} 783s git-debrebase get_differs d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x20 783s git-debrebase get_differs 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 c9d15b2f2cace66c8c20f16142317b8174d401d6 = 0x32 783s git-debrebase classify c9eb967d19ff3ad6d28665dab962df26c0426acf $t=c9d15b2f2cace66c8c20f16142317b8174d401d6 @p d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6/0x20 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4/0x32 783s git-debrebase = MergedBreakwaters {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","IsOrigin" => "","IsDgitImport" => undef},{"IsDgitImport" => undef,"Ix" => 1,"Differs" => 50,"CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","IsOrigin" => ""}],"Type" => "MergedBreakwaters","CommitId" => "c9eb967d19ff3ad6d28665dab962df26c0426acf","Hdr" => "tree c9d15b2f2cace66c8c20f16142317b8174d401d6\nparent d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6\nparent 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "Merge branch 'other'\n\n# Conflicts:\n#\tdebian/zorkmid\n\n[git-debrebase merged-breakwater: constructed from vanilla merge]\n","Tree" => "c9d15b2f2cace66c8c20f16142317b8174d401d6"} 783s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 783s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 783s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1"}],"Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Msg" => "us-conflict\n","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 783s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 783s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 783s git-debrebase = Packaging {"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"}],"Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 783s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 783s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 783s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Msg" => "DEBIAN add zorkmid-us (us-2)\n","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "Packaging","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594"}]} 783s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 783s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 783s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Parents" => [{"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0}],"Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 783s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 783s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 783s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 783s git-debrebase = Anchor {"Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Parents" => [{"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 783s git-debrebase get_differs c65db7f1ec89de8e69667cdf099a9144e22daa7e 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 783s git-debrebase classify 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p c65db7f1ec89de8e69667cdf099a9144e22daa7e/0x20 783s git-debrebase = Packaging {"Msg" => "other-conflict\n","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent c65db7f1ec89de8e69667cdf099a9144e22daa7e\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","Parents" => [{"Differs" => 32,"CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Ix" => 0}],"Type" => "Packaging","CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4"} 783s git-debrebase get_differs 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 783s git-debrebase classify c65db7f1ec89de8e69667cdf099a9144e22daa7e $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05/0x20 783s git-debrebase = Packaging {"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6","Parents" => [{"CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e"} 783s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 783s git-debrebase classify 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 783s git-debrebase = Packaging {"Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c","Msg" => "DEBIAN add zorkmid-other (other)\n","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317"}]} 783s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 783s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 783s git-debrebase = Packaging {"Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941"} 783s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 783s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 783s git-debrebase = Packaging {"Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "DEBIAN add zorkmid (before)\n","Type" => "Packaging","CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8"}]} 783s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 783s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 783s git-debrebase = Changelog {"Parents" => [{"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16,"Ix" => 0}],"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 783s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 783s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 783s git-debrebase = Changelog {"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 783s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 783s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 783s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 783s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 783s git-debrebase *** WALK prep done cur=c9eb967d19ff3ad6d28665dab962df26c0426acf brw 1 upp 12 proc 15 pm -1 783s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 783s ' 783s ++ git rev-parse HEAD 783s + expect=f463f9e290a21ba0a8042dab055ee456cecd94e5 783s + exec 783s + local cid ctype info nparents 783s + read cid ctype info 783s + : ===== f463f9e290a21ba0a8042dab055ee456cecd94e5 Upstream ===== 783s + test f463f9e290a21ba0a8042dab055ee456cecd94e5 = f463f9e290a21ba0a8042dab055ee456cecd94e5 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P f463f9e290a21ba0a8042dab055ee456cecd94e5 783s + local parents=becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s + expect=becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s + enparents=1 783s + : Upstream/SAME becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 Upstream ===== 783s + test becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 = becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P becb4ef38f1b6087bfc923eccef2fb5f02abd8b8 783s + local parents=3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s + expect=3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s + enparents=1 783s + : Upstream/SAME 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b Upstream ===== 783s + test 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b = 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 3ec9c77ae1cefecfb88fca6f6c71cc5516e7118b 783s + local parents=9738e08c35cd075193992a6f0ff1bc671c1effb9 783s + expect=9738e08c35cd075193992a6f0ff1bc671c1effb9 783s + enparents=1 783s + : Upstream/SAME 9738e08c35cd075193992a6f0ff1bc671c1effb9 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 9738e08c35cd075193992a6f0ff1bc671c1effb9 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 9738e08c35cd075193992a6f0ff1bc671c1effb9 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 9738e08c35cd075193992a6f0ff1bc671c1effb9 Upstream ===== 783s + test 9738e08c35cd075193992a6f0ff1bc671c1effb9 = 9738e08c35cd075193992a6f0ff1bc671c1effb9 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 9738e08c35cd075193992a6f0ff1bc671c1effb9 783s + local parents=4c47fcf4f2d15218e3a241550df450ff407e5090 783s + expect=4c47fcf4f2d15218e3a241550df450ff407e5090 783s + enparents=1 783s + : Upstream/SAME 4c47fcf4f2d15218e3a241550df450ff407e5090 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 4c47fcf4f2d15218e3a241550df450ff407e5090 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 4c47fcf4f2d15218e3a241550df450ff407e5090 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 4c47fcf4f2d15218e3a241550df450ff407e5090 Upstream ===== 783s + test 4c47fcf4f2d15218e3a241550df450ff407e5090 = 4c47fcf4f2d15218e3a241550df450ff407e5090 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 4c47fcf4f2d15218e3a241550df450ff407e5090 783s + local parents=731cc3da98a8b3d7254e52b614ddb2c21373a745 783s + expect=731cc3da98a8b3d7254e52b614ddb2c21373a745 783s + enparents=1 783s + : Upstream/SAME 731cc3da98a8b3d7254e52b614ddb2c21373a745 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 731cc3da98a8b3d7254e52b614ddb2c21373a745 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 731cc3da98a8b3d7254e52b614ddb2c21373a745 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 731cc3da98a8b3d7254e52b614ddb2c21373a745 Upstream ===== 783s + test 731cc3da98a8b3d7254e52b614ddb2c21373a745 = 731cc3da98a8b3d7254e52b614ddb2c21373a745 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 731cc3da98a8b3d7254e52b614ddb2c21373a745 783s + local parents=ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s + expect=ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s + enparents=1 783s + : Upstream/SAME ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== ed6545edf4d2a3112c786bdeb207bb43c63166e8 Upstream ===== 783s + test ed6545edf4d2a3112c786bdeb207bb43c63166e8 = ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P ed6545edf4d2a3112c786bdeb207bb43c63166e8 783s + local parents=84c02475194c8c40abd163442c5ad31af5db71c5 783s + expect=84c02475194c8c40abd163442c5ad31af5db71c5 783s + enparents=1 783s + : Upstream/SAME 84c02475194c8c40abd163442c5ad31af5db71c5 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 84c02475194c8c40abd163442c5ad31af5db71c5 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 84c02475194c8c40abd163442c5ad31af5db71c5 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 84c02475194c8c40abd163442c5ad31af5db71c5 Upstream ===== 783s + test 84c02475194c8c40abd163442c5ad31af5db71c5 = 84c02475194c8c40abd163442c5ad31af5db71c5 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 84c02475194c8c40abd163442c5ad31af5db71c5 783s + local parents=19ba2342be5601a9a65d0eb0e9017463b275b702 783s + expect=19ba2342be5601a9a65d0eb0e9017463b275b702 783s + enparents=1 783s + : Upstream/SAME 19ba2342be5601a9a65d0eb0e9017463b275b702 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 19ba2342be5601a9a65d0eb0e9017463b275b702 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 19ba2342be5601a9a65d0eb0e9017463b275b702 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 19ba2342be5601a9a65d0eb0e9017463b275b702 Upstream ===== 783s + test 19ba2342be5601a9a65d0eb0e9017463b275b702 = 19ba2342be5601a9a65d0eb0e9017463b275b702 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 19ba2342be5601a9a65d0eb0e9017463b275b702 783s + local parents=ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s + expect=ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s + enparents=1 783s + : Upstream/SAME ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== ac65c6d65e81c68b187c326dd98d939ec1851dcb Upstream ===== 783s + test ac65c6d65e81c68b187c326dd98d939ec1851dcb = ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P ac65c6d65e81c68b187c326dd98d939ec1851dcb 783s + local parents=72b7c7a86257b0aeb823765abe427c8370f311b9 783s + expect=72b7c7a86257b0aeb823765abe427c8370f311b9 783s + enparents=1 783s + : Upstream/SAME 72b7c7a86257b0aeb823765abe427c8370f311b9 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 72b7c7a86257b0aeb823765abe427c8370f311b9 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 72b7c7a86257b0aeb823765abe427c8370f311b9 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 72b7c7a86257b0aeb823765abe427c8370f311b9 Upstream ===== 783s + test 72b7c7a86257b0aeb823765abe427c8370f311b9 = 72b7c7a86257b0aeb823765abe427c8370f311b9 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 72b7c7a86257b0aeb823765abe427c8370f311b9 783s + local parents=ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s + expect=ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s + enparents=1 783s + : Upstream/SAME ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== ab077ca528976054ab36bc8ac27380d4d1cb2c42 Upstream ===== 783s + test ab077ca528976054ab36bc8ac27380d4d1cb2c42 = ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P ab077ca528976054ab36bc8ac27380d4d1cb2c42 783s + local parents=19e490ce4be22044c5d125478ef04816d173135e 783s + expect=19e490ce4be22044c5d125478ef04816d173135e 783s + enparents=1 783s + : Upstream/SAME 19e490ce4be22044c5d125478ef04816d173135e 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 19e490ce4be22044c5d125478ef04816d173135e 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 19e490ce4be22044c5d125478ef04816d173135e 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 19e490ce4be22044c5d125478ef04816d173135e Upstream ===== 783s + test 19e490ce4be22044c5d125478ef04816d173135e = 19e490ce4be22044c5d125478ef04816d173135e 783s + local cetype=Upstream 783s + '[' xUpstream = xUpstream ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 19e490ce4be22044c5d125478ef04816d173135e 783s + local parents=937c1b2189426659100db91673264976a0879dc4 783s + expect=937c1b2189426659100db91673264976a0879dc4 783s + enparents=1 783s + : Upstream/SAME 937c1b2189426659100db91673264976a0879dc4 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s ++ printf %s 937c1b2189426659100db91673264976a0879dc4 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 937c1b2189426659100db91673264976a0879dc4 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 937c1b2189426659100db91673264976a0879dc4 Packaging ===== 783s + test 937c1b2189426659100db91673264976a0879dc4 = 937c1b2189426659100db91673264976a0879dc4 783s + local cetype=Upstream 783s + '[' xPackaging = xUpstream ']' 783s ++ git log -n1 --pretty=format:%P 937c1b2189426659100db91673264976a0879dc4 783s + local parents=625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s + expect=625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s + enparents=1 783s + : Packaging/Upstream 625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + '[' xY:937c1b2189426659100db91673264976a0879dc4 '!=' x ']' 783s + test Y:937c1b2189426659100db91673264976a0879dc4 = Y:937c1b2189426659100db91673264976a0879dc4 783s + bwtip= 783s + case "$cetype" in 783s + case "$ctype" in 783s + git diff --quiet 625036c9eb0e04fbcf7976a5f3892401d22cd74b..937c1b2189426659100db91673264976a0879dc4 -- :. ':!debian' 783s + git diff --quiet 625036c9eb0e04fbcf7976a5f3892401d22cd74b..937c1b2189426659100db91673264976a0879dc4 -- :debian/patches 783s + etypes=Packaging 783s ++ printf %s 625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo 625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== 625036c9eb0e04fbcf7976a5f3892401d22cd74b Packaging ===== 783s + test 625036c9eb0e04fbcf7976a5f3892401d22cd74b = 625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s + local cetype=Packaging 783s + '[' xPackaging = xPackaging ']' 783s + cetype=SAME 783s ++ git log -n1 --pretty=format:%P 625036c9eb0e04fbcf7976a5f3892401d22cd74b 783s + local parents=c9eb967d19ff3ad6d28665dab962df26c0426acf 783s + expect=c9eb967d19ff3ad6d28665dab962df26c0426acf 783s + enparents=1 783s + : Packaging/SAME c9eb967d19ff3ad6d28665dab962df26c0426acf 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s + git diff --quiet c9eb967d19ff3ad6d28665dab962df26c0426acf..625036c9eb0e04fbcf7976a5f3892401d22cd74b -- :. ':!debian' 783s + git diff --quiet c9eb967d19ff3ad6d28665dab962df26c0426acf..625036c9eb0e04fbcf7976a5f3892401d22cd74b -- :debian/patches 783s + etypes=Packaging 783s ++ printf %s c9eb967d19ff3ad6d28665dab962df26c0426acf 783s ++ wc -w 783s + local cnparents=1 783s + test 1 = 1 783s ++ for f in $parents 783s ++ echo c9eb967d19ff3ad6d28665dab962df26c0426acf 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=1 783s + test 1 = 1 783s + case "$parents" in 783s + case "$ctype" in 783s + read cid ctype info 783s + : ===== c9eb967d19ff3ad6d28665dab962df26c0426acf MergedBreakwaters ===== 783s + test c9eb967d19ff3ad6d28665dab962df26c0426acf = c9eb967d19ff3ad6d28665dab962df26c0426acf 783s + local cetype=Packaging 783s + '[' xMergedBreakwaters = xPackaging ']' 783s ++ git log -n1 --pretty=format:%P c9eb967d19ff3ad6d28665dab962df26c0426acf 783s + local 'parents=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4' 783s + expect='d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4' 783s + enparents=1 783s + : MergedBreakwaters/Packaging 'd686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4' 783s + case "$ctype/$cetype" in 783s + case "$ctype/$etypes" in 783s + case "$cetype" in 783s + case "$ctype" in 783s + enparents=2 783s ++ printf %s 'd686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4' 783s ++ wc -w 783s + local cnparents=2 783s + test 2 = 2 783s ++ for f in $parents 783s ++ echo d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 783s ++ for f in $parents 783s ++ echo 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 783s ++ wc -w 783s ++ t-sort -u 783s ++ LC_COLLATE=C 783s ++ sort -u 783s + local cndparents=2 783s + test 2 = 2 783s + case "$parents" in 783s + case "$ctype" in 783s + local f 783s + local parent_ix=0 783s + for f in $parents 783s + t-gdr-good-analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 breakwater -mp0 783s + local head=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 783s + local state=breakwater 783s + local wsfx=-mp0 783s + local etypes bwtip 783s + case $state in 783s + etypes=Packaging 783s + anal=../anal-mp0 783s + t-git-debrebase analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 783s + local gdr=git-debrebase 783s + : ' 783s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 783s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 783s git-debrebase *** WALK d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 1 *main::STDOUT 783s git-debrebase get_differs 3605e71ce841416742a545849af32397859b7dd1 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 = 0x20 783s git-debrebase classify d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 $t=5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6 @p 3605e71ce841416742a545849af32397859b7dd1/0x20 783s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6","Hdr" => "tree 5dc0378d1e2122ce096f353d9a3fdfdfc4f7eca6\nparent 3605e71ce841416742a545849af32397859b7dd1\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Msg" => "us-conflict\n","Parents" => [{"Ix" => 0,"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Differs" => 32}],"CommitId" => "d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6"} 783s git-debrebase get_differs 67a0f012d1be22a33c325c82531a9c208788029d 566de0ac9c37f10736794e7037692a70f9cf4103 = 0x20 783s git-debrebase classify 3605e71ce841416742a545849af32397859b7dd1 $t=566de0ac9c37f10736794e7037692a70f9cf4103 @p 67a0f012d1be22a33c325c82531a9c208788029d/0x20 783s git-debrebase = Packaging {"CommitId" => "3605e71ce841416742a545849af32397859b7dd1","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d"}],"Msg" => "MIXED add both(-us) (us-2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "566de0ac9c37f10736794e7037692a70f9cf4103","Type" => "Packaging","Hdr" => "tree 566de0ac9c37f10736794e7037692a70f9cf4103\nparent 67a0f012d1be22a33c325c82531a9c208788029d\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 783s git-debrebase get_differs 6a136a23e1a27d5bab2b312af53e895b30e42594 64f581ce808513cd3414d0822ed31d95b79a82af = 0x20 783s git-debrebase classify 67a0f012d1be22a33c325c82531a9c208788029d $t=64f581ce808513cd3414d0822ed31d95b79a82af @p 6a136a23e1a27d5bab2b312af53e895b30e42594/0x20 783s git-debrebase = Packaging {"Tree" => "64f581ce808513cd3414d0822ed31d95b79a82af","Type" => "Packaging","Hdr" => "tree 64f581ce808513cd3414d0822ed31d95b79a82af\nparent 6a136a23e1a27d5bab2b312af53e895b30e42594\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "67a0f012d1be22a33c325c82531a9c208788029d","Parents" => [{"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid-us (us-2)\n"} 784s git-debrebase get_differs 694fabd170763cd189561b2d5ded51b5f5b05d34 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 = 0x10 784s git-debrebase classify 6a136a23e1a27d5bab2b312af53e895b30e42594 $t=0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4 @p 694fabd170763cd189561b2d5ded51b5f5b05d34/0x10 784s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34","Ix" => 0}],"CommitId" => "6a136a23e1a27d5bab2b312af53e895b30e42594","Type" => "Changelog","Tree" => "0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4","Hdr" => "tree 0e7c9136f3e8ba3487c9a820fc3757114fc9a0f4\nparent 694fabd170763cd189561b2d5ded51b5f5b05d34\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n"} 784s git-debrebase get_differs d835bca600c6f88d12ac89e3300900cceb7eaf7a 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x2 784s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c = 0x30 784s git-debrebase classify 694fabd170763cd189561b2d5ded51b5f5b05d34 $t=038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c @p d835bca600c6f88d12ac89e3300900cceb7eaf7a/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 784s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c","Hdr" => "tree 038beb6a7b02cf14410b6cf7ebad0ba9f432ca9c\nparent d835bca600c6f88d12ac89e3300900cceb7eaf7a\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000009 +0100\ncommitter dgit test git user 1530000009 +0100\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Differs" => 2,"CommitId" => "d835bca600c6f88d12ac89e3300900cceb7eaf7a","Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "694fabd170763cd189561b2d5ded51b5f5b05d34"} 784s git-debrebase *** WALK prep done cur=694fabd170763cd189561b2d5ded51b5f5b05d34 brw 3 upp -1 proc 4 pm -1 784s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 784s ' 784s ++ git rev-parse d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 784s + expect=d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 784s + exec 784s + local cid ctype info nparents 784s + read cid ctype info 784s + : ===== d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 Packaging ===== 784s + test d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 = d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 784s + local parents=3605e71ce841416742a545849af32397859b7dd1 784s + expect=3605e71ce841416742a545849af32397859b7dd1 784s + enparents=1 784s + : Packaging/SAME 3605e71ce841416742a545849af32397859b7dd1 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 3605e71ce841416742a545849af32397859b7dd1..d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 -- :. ':!debian' 784s + git diff --quiet 3605e71ce841416742a545849af32397859b7dd1..d686a3e913e9b5a90c5a2f7c6ba5898362bd57c6 -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s 3605e71ce841416742a545849af32397859b7dd1 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 3605e71ce841416742a545849af32397859b7dd1 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 3605e71ce841416742a545849af32397859b7dd1 Packaging ===== 784s + test 3605e71ce841416742a545849af32397859b7dd1 = 3605e71ce841416742a545849af32397859b7dd1 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P 3605e71ce841416742a545849af32397859b7dd1 784s + local parents=67a0f012d1be22a33c325c82531a9c208788029d 784s + expect=67a0f012d1be22a33c325c82531a9c208788029d 784s + enparents=1 784s + : Packaging/SAME 67a0f012d1be22a33c325c82531a9c208788029d 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 67a0f012d1be22a33c325c82531a9c208788029d..3605e71ce841416742a545849af32397859b7dd1 -- :. ':!debian' 784s + git diff --quiet 67a0f012d1be22a33c325c82531a9c208788029d..3605e71ce841416742a545849af32397859b7dd1 -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s 67a0f012d1be22a33c325c82531a9c208788029d 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 67a0f012d1be22a33c325c82531a9c208788029d 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 67a0f012d1be22a33c325c82531a9c208788029d Packaging ===== 784s + test 67a0f012d1be22a33c325c82531a9c208788029d = 67a0f012d1be22a33c325c82531a9c208788029d 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P 67a0f012d1be22a33c325c82531a9c208788029d 784s + local parents=6a136a23e1a27d5bab2b312af53e895b30e42594 784s + expect=6a136a23e1a27d5bab2b312af53e895b30e42594 784s + enparents=1 784s + : Packaging/SAME 6a136a23e1a27d5bab2b312af53e895b30e42594 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 6a136a23e1a27d5bab2b312af53e895b30e42594..67a0f012d1be22a33c325c82531a9c208788029d -- :. ':!debian' 784s + git diff --quiet 6a136a23e1a27d5bab2b312af53e895b30e42594..67a0f012d1be22a33c325c82531a9c208788029d -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s 6a136a23e1a27d5bab2b312af53e895b30e42594 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 6a136a23e1a27d5bab2b312af53e895b30e42594 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 6a136a23e1a27d5bab2b312af53e895b30e42594 Changelog ===== 784s + test 6a136a23e1a27d5bab2b312af53e895b30e42594 = 6a136a23e1a27d5bab2b312af53e895b30e42594 784s + local cetype=Packaging 784s + '[' xChangelog = xPackaging ']' 784s ++ git log -n1 --pretty=format:%P 6a136a23e1a27d5bab2b312af53e895b30e42594 784s + local parents=694fabd170763cd189561b2d5ded51b5f5b05d34 784s + expect=694fabd170763cd189561b2d5ded51b5f5b05d34 784s + enparents=1 784s + : Changelog/Packaging 694fabd170763cd189561b2d5ded51b5f5b05d34 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 694fabd170763cd189561b2d5ded51b5f5b05d34..6a136a23e1a27d5bab2b312af53e895b30e42594 -- :. ':!debian/changelog' 784s + etypes=Packaging 784s ++ printf %s 694fabd170763cd189561b2d5ded51b5f5b05d34 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 694fabd170763cd189561b2d5ded51b5f5b05d34 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 694fabd170763cd189561b2d5ded51b5f5b05d34 Anchor ===== 784s + test 694fabd170763cd189561b2d5ded51b5f5b05d34 = 694fabd170763cd189561b2d5ded51b5f5b05d34 784s + local cetype=Packaging 784s + '[' xAnchor = xPackaging ']' 784s ++ git log -n1 --pretty=format:%P 694fabd170763cd189561b2d5ded51b5f5b05d34 784s + local 'parents=d835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 784s + expect='d835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 784s + enparents=1 784s + : Anchor/Packaging 'd835bca600c6f88d12ac89e3300900cceb7eaf7a 9638c2110033b719cc742997b9527505ffdc1a65' 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + break 784s + parent_ix=1 784s + for f in $parents 784s + t-gdr-good-analyse 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 breakwater -mp1 784s + local head=1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + local state=breakwater 784s + local wsfx=-mp1 784s + local etypes bwtip 784s + case $state in 784s + etypes=Packaging 784s + anal=../anal-mp1 784s + t-git-debrebase analyse 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + local gdr=git-debrebase 784s + : ' 784s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 784s + git-debrebase --dgit=dgit -D --experimental-merge-resolution analyse 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s git-debrebase *** WALK 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 1 *main::STDOUT 784s git-debrebase get_differs c65db7f1ec89de8e69667cdf099a9144e22daa7e 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c = 0x20 784s git-debrebase classify 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 $t=3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c @p c65db7f1ec89de8e69667cdf099a9144e22daa7e/0x20 784s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Differs" => 32,"Ix" => 0}],"Msg" => "other-conflict\n","Tree" => "3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c","CommitId" => "1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4","Hdr" => "tree 3c5c3f1f3d73b36fa79e4a05b1459da7390e5b1c\nparent c65db7f1ec89de8e69667cdf099a9144e22daa7e\nauthor dgit test git user 1530000007 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 784s git-debrebase get_differs 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 972adec4e8b9827099d670ba684b2cf8d24db5a6 = 0x20 784s git-debrebase classify c65db7f1ec89de8e69667cdf099a9144e22daa7e $t=972adec4e8b9827099d670ba684b2cf8d24db5a6 @p 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05/0x20 784s git-debrebase = Packaging {"Msg" => "MIXED add both(-other) (other)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Differs" => 32}],"Hdr" => "tree 972adec4e8b9827099d670ba684b2cf8d24db5a6\nparent 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "c65db7f1ec89de8e69667cdf099a9144e22daa7e","Tree" => "972adec4e8b9827099d670ba684b2cf8d24db5a6"} 784s git-debrebase get_differs 075ef1bebca2f99591cafd47f62fb9ceb67c6317 35c4ee256dff9ba61e647d7744ecc036eb75971c = 0x20 784s git-debrebase classify 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 $t=35c4ee256dff9ba61e647d7744ecc036eb75971c @p 075ef1bebca2f99591cafd47f62fb9ceb67c6317/0x20 784s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid-other (other)\n","CommitId" => "4b80c2be4a9d0aaa47017a24b46a2126c02b9a05","Hdr" => "tree 35c4ee256dff9ba61e647d7744ecc036eb75971c\nparent 075ef1bebca2f99591cafd47f62fb9ceb67c6317\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "35c4ee256dff9ba61e647d7744ecc036eb75971c"} 784s git-debrebase get_differs bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa cfe02a03e280c135ecdbd05d8f2593170b889941 = 0x20 784s git-debrebase classify 075ef1bebca2f99591cafd47f62fb9ceb67c6317 $t=cfe02a03e280c135ecdbd05d8f2593170b889941 @p bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa/0x20 784s git-debrebase = Packaging {"Msg" => "MIXED add both() (before)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Tree" => "cfe02a03e280c135ecdbd05d8f2593170b889941","CommitId" => "075ef1bebca2f99591cafd47f62fb9ceb67c6317","Hdr" => "tree cfe02a03e280c135ecdbd05d8f2593170b889941\nparent bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n"} 784s git-debrebase get_differs fc9b56489e07bdd371d3da847892acc46dfd58a8 7727b2c0c8332419504b39734391640ad35ca2a8 = 0x20 784s git-debrebase classify bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa $t=7727b2c0c8332419504b39734391640ad35ca2a8 @p fc9b56489e07bdd371d3da847892acc46dfd58a8/0x20 784s git-debrebase = Packaging {"CommitId" => "bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa","Hdr" => "tree 7727b2c0c8332419504b39734391640ad35ca2a8\nparent fc9b56489e07bdd371d3da847892acc46dfd58a8\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000005 +0100\n","Tree" => "7727b2c0c8332419504b39734391640ad35ca2a8","Msg" => "DEBIAN add zorkmid (before)\n","Parents" => [{"Differs" => 32,"CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Ix" => 0}],"Type" => "Packaging"} 784s git-debrebase get_differs 5402b11174c7526744a60cd1accfa3aeecbc7e5d b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 784s git-debrebase classify fc9b56489e07bdd371d3da847892acc46dfd58a8 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 5402b11174c7526744a60cd1accfa3aeecbc7e5d/0x10 784s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "fc9b56489e07bdd371d3da847892acc46dfd58a8","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 5402b11174c7526744a60cd1accfa3aeecbc7e5d\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Differs" => 16}]} 784s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 784s git-debrebase classify 5402b11174c7526744a60cd1accfa3aeecbc7e5d $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 784s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000005 +0100\n","CommitId" => "5402b11174c7526744a60cd1accfa3aeecbc7e5d","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}]} 784s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 784s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 784s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 784s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 784s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 6 upp -1 proc 7 pm -1 784s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 784s ' 784s ++ git rev-parse 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + expect=1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + exec 784s + local cid ctype info nparents 784s + read cid ctype info 784s + : ===== 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 Packaging ===== 784s + test 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 = 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P 1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 784s + local parents=c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s + expect=c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s + enparents=1 784s + : Packaging/SAME c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet c65db7f1ec89de8e69667cdf099a9144e22daa7e..1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 -- :. ':!debian' 784s + git diff --quiet c65db7f1ec89de8e69667cdf099a9144e22daa7e..1dea0f8e12a2c44cd7220633c398ad79e8a9b2a4 -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== c65db7f1ec89de8e69667cdf099a9144e22daa7e Packaging ===== 784s + test c65db7f1ec89de8e69667cdf099a9144e22daa7e = c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P c65db7f1ec89de8e69667cdf099a9144e22daa7e 784s + local parents=4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s + expect=4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s + enparents=1 784s + : Packaging/SAME 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05..c65db7f1ec89de8e69667cdf099a9144e22daa7e -- :. ':!debian' 784s + git diff --quiet 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05..c65db7f1ec89de8e69667cdf099a9144e22daa7e -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 Packaging ===== 784s + test 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 = 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P 4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 784s + local parents=075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s + expect=075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s + enparents=1 784s + : Packaging/SAME 075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 -- :. ':!debian' 784s + git diff --quiet 075ef1bebca2f99591cafd47f62fb9ceb67c6317..4b80c2be4a9d0aaa47017a24b46a2126c02b9a05 -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s 075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 075ef1bebca2f99591cafd47f62fb9ceb67c6317 Packaging ===== 784s + test 075ef1bebca2f99591cafd47f62fb9ceb67c6317 = 075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P 075ef1bebca2f99591cafd47f62fb9ceb67c6317 784s + local parents=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s + expect=bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s + enparents=1 784s + : Packaging/SAME bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :. ':!debian' 784s + git diff --quiet bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa..075ef1bebca2f99591cafd47f62fb9ceb67c6317 -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa Packaging ===== 784s + test bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa = bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s + local cetype=Packaging 784s + '[' xPackaging = xPackaging ']' 784s + cetype=SAME 784s ++ git log -n1 --pretty=format:%P bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa 784s + local parents=fc9b56489e07bdd371d3da847892acc46dfd58a8 784s + expect=fc9b56489e07bdd371d3da847892acc46dfd58a8 784s + enparents=1 784s + : Packaging/SAME fc9b56489e07bdd371d3da847892acc46dfd58a8 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :. ':!debian' 784s + git diff --quiet fc9b56489e07bdd371d3da847892acc46dfd58a8..bbc283ec2d9b0a07c0960e2b41e8c5d15c3d70aa -- :debian/patches 784s + etypes=Packaging 784s ++ printf %s fc9b56489e07bdd371d3da847892acc46dfd58a8 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo fc9b56489e07bdd371d3da847892acc46dfd58a8 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== fc9b56489e07bdd371d3da847892acc46dfd58a8 Changelog ===== 784s + test fc9b56489e07bdd371d3da847892acc46dfd58a8 = fc9b56489e07bdd371d3da847892acc46dfd58a8 784s + local cetype=Packaging 784s + '[' xChangelog = xPackaging ']' 784s ++ git log -n1 --pretty=format:%P fc9b56489e07bdd371d3da847892acc46dfd58a8 784s + local parents=5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s + expect=5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s + enparents=1 784s + : Changelog/Packaging 5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 5402b11174c7526744a60cd1accfa3aeecbc7e5d..fc9b56489e07bdd371d3da847892acc46dfd58a8 -- :. ':!debian/changelog' 784s + etypes=Packaging 784s ++ printf %s 5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 5402b11174c7526744a60cd1accfa3aeecbc7e5d Changelog ===== 784s + test 5402b11174c7526744a60cd1accfa3aeecbc7e5d = 5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s + local cetype=Packaging 784s + '[' xChangelog = xPackaging ']' 784s ++ git log -n1 --pretty=format:%P 5402b11174c7526744a60cd1accfa3aeecbc7e5d 784s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s + enparents=1 784s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..5402b11174c7526744a60cd1accfa3aeecbc7e5d -- :. ':!debian/changelog' 784s + etypes=Packaging 784s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s ++ wc -w 784s + local cnparents=1 784s + test 1 = 1 784s ++ for f in $parents 784s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s ++ wc -w 784s ++ t-sort -u 784s ++ LC_COLLATE=C 784s ++ sort -u 784s + local cndparents=1 784s + test 1 = 1 784s + case "$parents" in 784s + case "$ctype" in 784s + read cid ctype info 784s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 784s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s + local cetype=Packaging 784s + '[' xAnchor = xPackaging ']' 784s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 784s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 784s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 784s + enparents=1 784s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 784s + case "$ctype/$cetype" in 784s + case "$ctype/$etypes" in 784s + case "$cetype" in 784s + case "$ctype" in 784s + break 784s + parent_ix=2 784s + return 784s + t-dgit quilt-fixup 784s + local dgit=dgit 784s + pwd 784s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 784s + : ' 784s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 784s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A quilt-fixup 784s | git rev-parse --show-toplevel 784s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 784s | git config -z --get-regexp --local '.*' 784s | git config -z --get-regexp --local '.*' 784s | git config -z --get-regexp --global '.*' 784s | git config -z --get-regexp --system '.*' 784s format 3.0 (quilt), quilt mode linear 784s Format `3.0 (quilt)', need to check/update patch stack 784s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 784s => `' 784s + git diff --quiet HEAD 784s + dpkg-buildpackage '-i(?:^|/)'\\'.git(?:/|$)' -I.git -T clean 784s dpkg-buildpackage: info: source package example 784s dpkg-buildpackage: info: source version 2.1-1 784s dpkg-buildpackage: info: source distribution UNRELEASED 784s dpkg-buildpackage: info: source changed by dgit test git user 784s fakeroot debian/rules clean 784s EXAMPLE RULES TARGET clean 784s dh_clean 784s dh_clean: warning: Compatibility levels before 10 are deprecated (level 8 in use) 784s | git clean -dn 784s => `' 784s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 784s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 784s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 784s | git rev-parse 'HEAD~0' 784s => `f463f9e290a21ba0a8042dab055ee456cecd94e5' 784s | git symbolic-ref -q HEAD 784s => `refs/heads/master' 784s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 784s CD work 784s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 784s + git reset -q --hard f463f9e290a21ba0a8042dab055ee456cecd94e5 784s examining quilt state (multiple patches, linear mode) 784s branch_is_gdr f463f9e290a21ba0a8042dab055ee456cecd94e5... 784s branch_is_gdr c9eb967d19ff3ad6d28665dab962df26c0426acf gdr merged-breakwater YES 784s + git reset -q --hard f463f9e290a21ba0a8042dab055ee456cecd94e5 784s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 785s HEAD is now at 397b84f Commit patch queue (exported by git-debrebase) 785s | git rev-parse 'HEAD~0' 785s => `397b84f3784ea15f39130950259f2b0b360f4070' 785s QF linkorigs example_2.1.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.1.orig.tar.gz Y 785s + tar -cf './example_2.1-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 785s + gzip -1n './example_2.1-~~DGITFAKE.debian.tar' 785s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 785s CD fake 785s | find -name .git -prune -print0 785s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 785s + git checkout -f 397b84f3784ea15f39130950259f2b0b360f4070 -- debian 785s + git add -Af . 785s | git write-tree 785s => `b65fbda202442ce5fb2d9fcbb9a17fa7952408dc' 785s fake orig tree object b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 785s CD .. 785s + git reset -q --hard 397b84f3784ea15f39130950259f2b0b360f4070 785s CD ../fake 785s + git add -Af . 785s | git write-tree 785s => `1e473a8c2afe132a4fac6a676020f90f82e07240' 785s fake o+d/p tree object b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 785s CD ../work 785s | git ls-tree --name-only -z 397b84f3784ea15f39130950259f2b0b360f4070 785s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src-other.c\x00src-us.c\x00src.c\x00' 785s | git diff-tree -z --no-renames -r b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 397b84f3784ea15f39130950259f2b0b360f4070 785s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:000000 100644 0000000000000000000000000000000000000000 fe0e1779fdd599fbe7e7f512881c98c01d964e06 A\x00src-other.c\x00:000000 100644 0000000000000000000000000000000000000000 608876e939b72c0f7450230a50df85e5a50c07c2 A\x00src-us.c\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc f7e6a02b1ff2d0287d318f28bdd50ed7a753f52a M\x00src.c\x00' 785s quiltify_trees_differ b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 397b84f3784ea15f39130950259f2b0b360f4070 => 1 785s | git diff-tree -z --no-renames --name-only -r 397b84f3784ea15f39130950259f2b0b360f4070 1e473a8c2afe132a4fac6a676020f90f82e07240 785s => `' 785s quiltify_trees_differ 397b84f3784ea15f39130950259f2b0b360f4070 1e473a8c2afe132a4fac6a676020f90f82e07240 => 0 785s | git diff-tree -z --no-renames --name-only -r b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1e473a8c2afe132a4fac6a676020f90f82e07240 785s => `lib.c\x00new-upstream-file\x00src-other.c\x00src-us.c\x00src.c\x00' 785s quiltify_trees_differ b65fbda202442ce5fb2d9fcbb9a17fa7952408dc 1e473a8c2afe132a4fac6a676020f90f82e07240 => 1 785s differences @dl ## ## == == == ==. 785s dgit: base trees orig=b65fbda202442ce5fb2d o+d/p=1e473a8c2afe132a4fac 785s dgit: quilt differences: src: ## orig ## gitignores: == orig == 785s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 785s starting quiltify (multiple patches, linear mode) 785s | git ls-tree --name-only 397b84f3784ea15f39130950259f2b0b360f4070 -- debian/rules debian/control 785s => `debian/control'... 785s quiltify investigate 397b84f3784ea15f39130950259f2b0b360f4070 785s | git diff-tree -z --no-renames --name-only 397b84f3784ea15f39130950259f2b0b360f4070 1e473a8c2afe132a4fac6a676020f90f82e07240 785s => `' 785s quiltify_trees_differ 397b84f3784ea15f39130950259f2b0b360f4070 1e473a8c2afe132a4fac6a676020f90f82e07240 => 0 785s search finished hooray! 785s quiltify linearisation planning successful, executing... 785s + git checkout -q master 785s | git status --ignored --porcelain 785s => `?? .pc/' 785s nothing quilty to commit, ok. 785s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 785s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 785s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 785s ' 785s + t-gdr-made-patches 785s + git log -n1 --pretty=format:%B 785s + egrep '^\[git-debrebase' 785s [git-debrebase make-patches: export and commit patches] 785s + t-ok 785s + : ======================================== 785s + t-check-only-bpd 785s + '[' .. = .. ']' 785s + return 785s + t-fscks 785s + shopt -s nullglob 785s + for d in $tmp/*/.git $tmp/git/*.git 785s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 785s + t-git-fsck 785s ++ git rev-parse --git-dir 785s + local fsckerrs=.git/dgit-test-fsck.errs 785s + set +e 785s + LC_MESSAGES=C 785s + git fsck --no-dangling --strict 785s + tee .git/dgit-test-fsck.errs 785s + ps='0 0' 785s + set -e 785s + local pats 785s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 785s + test '0 0' = '0 0' 785s + pats+=(-e 'notice: HEAD points to an unborn branch') 785s + pats+=(-e 'notice: No default references') 785s + set +e 785s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 785s + rc=1 785s + set -e 785s + case $rc in 785s + t-save-artifacts 785s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-merge-artifacts 785s + '[' x/tmp/autopkgtest.ztMUxl/gdr-merge-artifacts = x ']' 785s + '[' xtmp = x ']' 785s + GZIP=-1v 785s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-merge-artifacts/gdr-merge.tar.gz '--exclude=*.tar' . 785s gzip: warning: GZIP environment variable is deprecated; use an alias or script 785s 81.7% 785s + echo ok. 785s ok. 785s + rc=0 785s + set +x 785s + set +e 785s + pwd 785s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 785s + '[' x '!=' x ']' 785s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 785s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 785s + set -e 785s + test 0 = 0 785s autopkgtest [12:31:19]: test gdr-merge: -----------------------] 785s gdr-merge PASS 785s autopkgtest [12:31:19]: test gdr-merge: - - - - - - - - - - results - - - - - - - - - - 786s autopkgtest [12:31:20]: test gdr-subcommands: preparing testbed 786s Reading package lists... 786s Building dependency tree... 786s Reading state information... 786s Starting pkgProblemResolver with broken count: 0 786s Starting 2 pkgProblemResolver with broken count: 0 786s Done 787s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 787s autopkgtest [12:31:21]: test gdr-subcommands: [----------------------- 787s ++ set -o pipefail 787s ++ . tests/lib-core 787s ++ . tests/lib-restricts 787s ++ trap ' 787s rc=$? 787s set +x 787s test $rc = 0 || echo " 787s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 787s 787s Most relevant logs are just before assignment rc=$rc 787s Will now do cleanup etc. 787s " 787s set -x 787s set +e 787s pwd 787s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 787s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 787s set -e 787s test $rc = 0 || t-report-failure 787s ' EXIT 787s ++ t-filter-out-git-hyphen-dir 787s ++ local pathent 787s +++ type -p git-rev-parse 787s +++ : 787s ++ pathent= 787s ++ case "$pathent" in 787s ++ return 787s ++ t-set-intree 787s ++ '[' x = x ']' 787s ++ return 787s ++ : -D 787s ++ export DGIT_TEST_DEBUG 787s ++ : x 787s ++ export DGIT_TEST_DEBPUSH_DEBUG 787s ++ : 787s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 787s ++ GIT_COMMITTER_DATE='1530000000 +0100' 787s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 787s ++ GIT_AUTHOR_DATE='1530000000 +0100' 787s ++ export LC_CTYPE=C.UTF-8 787s ++ LC_CTYPE=C.UTF-8 787s ++ unset CDPATH 787s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 787s ++ FILTER_BRANCH_SQUELCH_WARNING=1 787s +++ pwd 787s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 787s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ testname=gdr-subcommands 787s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ bpd=.. 787s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 787s ++ '[' x '!=' x ']' 787s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s +++ pwd 787s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ t-set-using-tmp 787s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 787s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 787s ++ export 'DEBFULLNAME=dgit test git user' 787s ++ DEBFULLNAME='dgit test git user' 787s ++ git config --global user.email dgit-test@debian.example.net 787s ++ git config --global user.name 'dgit test git user' 787s ++ git config --global protocol.ext.allow always 787s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 787s ++ env -0 787s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 787s ++ export DEBCHANGE_VENDOR=dpkg 787s ++ DEBCHANGE_VENDOR=dpkg 787s ++ unset VISUAL 787s ++ unset GIT_EDITOR 787s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 787s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 787s ++ cat 787s ++ schroot=build 787s ++ : aq 787s ++ : archive/test-dummy 787s ++ : sid:unstable 787s ++ t-git-config dgit.default.old-dsc-distro test-dummy 787s ++ git config --global dgit.default.old-dsc-distro test-dummy 787s ++ for import in ${autoimport-gnupg} 787s ++ case "$0" in 787s ++ t-setup-import gnupg 787s ++ local setupname=gnupg 787s ++ local setupsrc 787s ++ local lock 787s ++ '[' x = x ']' 787s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 787s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 787s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 787s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 787s cd "$1"; shift 787s setupname="$1"; shift 787s simport="$1"; shift 787s if [ -e "$simport" ]; then exit 0; fi 787s env - "$@" \ 787s "tests/setup/$setupname" 787s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 787s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 787s + shift 787s + setupname=gnupg 787s + shift 787s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 787s + shift 787s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 787s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-subcommands-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-subcommands-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-subcommands -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-subcommands' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 787s ++ set -o pipefail 787s ++ . tests/lib-core 787s ++ . tests/lib-restricts 787s ++ trap ' 787s rc=$? 787s set +x 787s test $rc = 0 || echo " 787s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 787s 787s Most relevant logs are just before assignment rc=$rc 787s Will now do cleanup etc. 787s " 787s set -x 787s set +e 787s pwd 787s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 787s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 787s set -e 787s test $rc = 0 || t-report-failure 787s ' EXIT 787s ++ t-filter-out-git-hyphen-dir 787s ++ local pathent 787s +++ type -p git-rev-parse 787s +++ : 787s ++ pathent= 787s ++ case "$pathent" in 787s ++ return 787s ++ t-set-intree 787s ++ '[' x = x ']' 787s ++ return 787s ++ : -D 787s ++ export DGIT_TEST_DEBUG 787s ++ : x 787s ++ export DGIT_TEST_DEBPUSH_DEBUG 787s ++ : 787s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 787s ++ GIT_COMMITTER_DATE='1530000000 +0100' 787s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 787s ++ GIT_AUTHOR_DATE='1530000000 +0100' 787s ++ export LC_CTYPE=C.UTF-8 787s ++ LC_CTYPE=C.UTF-8 787s ++ unset CDPATH 787s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 787s ++ FILTER_BRANCH_SQUELCH_WARNING=1 787s +++ pwd 787s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 787s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ testname=gnupg 787s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 787s ++ bpd=.. 787s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 787s ++ '[' x '!=' x ']' 787s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s +++ pwd 787s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ t-set-using-tmp 787s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 787s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 787s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 787s ++ export 'DEBFULLNAME=dgit test git user' 787s ++ DEBFULLNAME='dgit test git user' 787s ++ git config --global user.email dgit-test@debian.example.net 787s ++ git config --global user.name 'dgit test git user' 787s ++ git config --global protocol.ext.allow always 787s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 787s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 787s ++ export DEBCHANGE_VENDOR=dpkg 787s ++ DEBCHANGE_VENDOR=dpkg 787s ++ unset VISUAL 787s ++ unset GIT_EDITOR 787s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 787s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 787s ++ cat 787s ++ schroot=build 787s ++ : aq 787s ++ : archive/test-dummy 787s ++ : sid:unstable 787s ++ t-git-config dgit.default.old-dsc-distro test-dummy 787s ++ git config --global dgit.default.old-dsc-distro test-dummy 787s ++ for import in ${autoimport-gnupg} 787s ++ case "$0" in 787s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 787s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 787s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 787s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 787s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 787s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 787s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 787s + setup=' 787s export GNUPGHOME=$tmp/gnupg 787s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 787s 787s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 787s ssb rsa2048 2013-11-17 [E] 787s 787s sec rsa2048 2014-01-26 [SC] 787s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 787s uid [ultimate] Populus Romanus (test key) 787s ssb rsa2048 2014-01-26 [E] 787s 787s sec rsa2048 2014-01-26 [SC] 787s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 787s uid [ unknown] Hannibal (test key) 787s ssb rsa2048 2014-01-26 [E] 787s 787s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 787s export GNUPGHOME=$tmp/gnupg 787s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 787s 787s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 787s delete mode 100644 debian/source/format 787s + git tag v1.0 787s + : 'fake up that our quilt-tip was descended from upstream' 787s + git checkout quilt-tip 787s Switched to branch 'quilt-tip' 787s + git merge --no-edit -s ours upstream 787s Merge made by the 'ours' strategy. 787s + : 'fake up that our quilt-tip had the patch queue in it' 787s + git checkout patch-queue/quilt-tip 787s Switched to branch 'patch-queue/quilt-tip' 787s + gbp pq export 787s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 787s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 787s + git add debian/patches 787s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 787s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 787s 4 files changed, 50 insertions(+) 787s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 787s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 787s create mode 100644 debian/patches/series 787s create mode 100644 debian/patches/subdir/addnewups 787s + : 'make branch names more conventional' 787s + git branch -D master 787s Deleted branch master (was 17d67db). 787s + git branch -m quilt-tip master 787s + not-gdr-processable origin 787s + git branch gdr-unprocessable/origin 787s + t-git-debrebase analyse 787s + grep 'Unknown Unprocessable' 787s + local gdr=git-debrebase 787s + : ' 787s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 787s + git-debrebase --dgit=dgit -D analyse 787s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 787s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 787s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 787s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4,"Ix" => 0}],"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 787s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 787s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 787s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 787s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Msg" => "Merge branch 'upstream' into quilt-tip\n","Overwritten" => [$VAR1->{"Parents"}[1]]} 787s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 787s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 787s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 787s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 787s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 787s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 787s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 787s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 787s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Type" => "Packaging","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}]} 787s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 787s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 787s git-debrebase = Packaging {"Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 787s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 787s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 787s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 787s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 787s git-debrebase ** Unknown 787s git-debrebase *** WALK BOMB unrecognised 787s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 787s ' 787s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 787s + : 'fake up an upstream 2.0' 787s + git branch make-upstream upstream 787s + t-make-new-upstream-tarball 2.0 787s + local uv=2.0 787s + git checkout make-upstream 787s Switched to branch 'make-upstream' 787s + echo 'upstream 2.0' 787s + git commit -a -m 'upstream 2.0 tarball' 787s [make-upstream 4db56a8] upstream 2.0 tarball 787s 1 file changed, 1 insertion(+) 787s + t-make-orig example 2.0 make-upstream 787s + local p=example 787s + local v=2.0 787s + local tag=make-upstream 787s + ust=example_2.0.orig.tar.gz 787s + GZIP=-1 787s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 787s gzip: warning: GZIP environment variable is deprecated; use an alias or script 787s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 787s + git branch -D quilt-tip-2 787s Deleted branch quilt-tip-2 (was 99fcab4). 787s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 787s + git branch -D gitish-only 787s Deleted branch gitish-only (was 2b2ddc8). 787s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 787s + git branch -D quilt-tip-1.1 787s Deleted branch quilt-tip-1.1 (was 7fc34be). 787s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 787s + git branch -D patch-queue/quilt-tip 787s Deleted branch patch-queue/quilt-tip (was d843a68). 787s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 787s + git branch -D indep-arch 787s Deleted branch indep-arch (was e215729). 787s + : 'see what gbp import-orig does' 787s + git checkout master 787s Switched to branch 'master' 787s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 788s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 788s gbp:info: Source package is example 788s gbp:info: Upstream version is 2.0 788s gbp:info: Replacing upstream source on 'master' 788s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 788s + not-gdr-processable merge 788s + git branch gdr-unprocessable/merge 788s + t-git-debrebase analyse 788s + grep 'Unknown Unprocessable' 788s + local gdr=git-debrebase 788s + : ' 788s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 788s + git-debrebase --dgit=dgit -D analyse 788s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 788s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 788s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 788s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 788s git-debrebase ** Unknown 788s git-debrebase *** WALK BOMB unrecognised 788s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 788s ' 788s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 788s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 788s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 788s + DEBEMAIL=dgit-tests@example.org 788s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 788s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 788s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 788s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 788s 1 file changed, 6 insertions(+) 788s + t-dch-commit-r 788s + t-dch-r-rune t-dch-commit 788s + local cmd=t-dch-commit 788s + shift 788s + local suite=unstable 788s + t-dch-commit -r -D unstable '' 788s + t-debchange -r -D unstable '' 788s + DEBEMAIL=dgit-tests@example.org 788s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 788s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 788s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 788s libdistro-info-perl is not installed, Debian release names are not known. 788s libdistro-info-perl is not installed, Ubuntu release names are not known. 788s + git commit -m 'dch -r -D unstable ' debian/changelog 788s [master f31021f] dch -r -D unstable 788s 1 file changed, 3 insertions(+), 2 deletions(-) 788s + echo garbage 788s + git add debian/patches/garbage 788s + git commit -m 'add garbage' debian/patches/garbage 788s [master eb10718] add garbage 788s 1 file changed, 1 insertion(+) 788s create mode 100644 debian/patches/garbage 788s + t-archive-none example 788s + t-select-package example 788s + p=example 788s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 788s + t-archive-none-aq 788s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 788s + : 788s + local 'jsondelim=[' 788s + local suitespec 788s + for suitespec in $suitespecs 788s + local suite=sid 788s + local sname=unstable 788s + t-aq-archive-updated sid example 788s + local suite=sid 788s + local p=example 788s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 788s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 788s + perl -wne ' 788s use JSON; 788s use strict; 788s our @v; 788s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 788s push @v, { 788s "version" => "$1", 788s "sha256sum" => "$2", 788s "component" => "$3", 788s "filename" => "$4", 788s }; 788s END { 788s my $json = JSON->new->canonical(); 788s print $json->encode(\@v) or die $!; 788s } 788s ' 788s + t-aq-archive-updated new example 788s + local suite=new 788s + local p=example 788s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 788s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 788s + perl -wne ' 788s use JSON; 788s use strict; 788s our @v; 788s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 788s push @v, { 788s "version" => "$1", 788s "sha256sum" => "$2", 788s "component" => "$3", 788s "filename" => "$4", 788s }; 788s END { 788s my $json = JSON->new->canonical(); 788s print $json->encode(\@v) or die $!; 788s } 788s ' 788s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 788s + cat 788s + jsondelim=' },' 788s + cat 788s + t-git-none 788s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 788s + set -e 788s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 788s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 788s + t-dgit -wgf --gbp push-source --new 788s + local dgit=dgit 788s + pwd 788s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 788s + : ' 788s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 788s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 788s | git rev-parse --show-toplevel 788s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 788s | git config -z --get-regexp --local '.*' 788s | git config -z --get-regexp --local '.*' 788s | git config -z --get-regexp --global '.*' 788s | git config -z --get-regexp --system '.*' 788s format 3.0 (quilt), quilt mode gbp 788s Format `3.0 (quilt)', need to check/update patch stack 788s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 788s => `' 788s + git diff --quiet HEAD 788s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 788s canonical suite name for unstable is sid 788s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 788s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 788s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 788s | git rev-parse 'HEAD~0' 788s => `eb10718ab213ccfa83613ebbddefbffda941a548' 788s | git symbolic-ref -q HEAD 788s => `refs/heads/master' 788s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 788s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 788s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 788s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 788s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 788s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 2aa7fa68c2c004c7269b648da732137b14c174454afe0697c5a579d5649ab64b 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 788s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 788s >(no reflog) 788s splitbrain cache miss 788s CD work 788s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 788s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 788s + git checkout -q -b dgit-view 788s examining quilt state (multiple patches, gbp mode) 788s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 788s CD fake 788s | find -name .git -prune -print0 788s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 788s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 788s + git add -Af . 788s | git write-tree 788s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 788s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 788s CD .. 788s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 788s CD ../fake 788s + git add -Af . 788s | git write-tree 788s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 788s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 788s CD ../work 788s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 788s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 788s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 788s => `' 788s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 788s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 788s => `lib.c\x00new-upstream-file\x00src.c\x00' 788s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 788s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 788s => `lib.c\x00new-upstream-file\x00src.c\x00' 788s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 788s differences @dl == ## ## == == ==. 788s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 788s dgit: quilt differences: src: == orig ## gitignores: == orig == 788s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 788s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 788s => `1530000000 +0000' 788s dgit view: creating patches-applied version using gbp pq 788s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 788s + git update-ref refs/heads/dgit-view HEAD 788s + git checkout -q dgit-view 788s | git rev-parse 'HEAD~0' 788s => `45ea71a69fa522ce760afdab8a420200443753e9' 788s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 788s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 788s => `' 788s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 2aa7fa68c2c004c7269b648da732137b14c174454afe0697c5a579d5649ab64b 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 788s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 788s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 788s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 788s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 788s | git rev-parse 'HEAD~0' 788s => `eb10718ab213ccfa83613ebbddefbffda941a548' 788s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 788s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 789s dpkg-source: info: using source format '3.0 (quilt)' 789s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 789s dpkg-source: info: using patch list from debian/patches/series 789s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 789s dpkg-source: info: building example in example_2.0-1.dsc 789s CD work 789s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 789s package seems new, not specifying -v 789s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 789s dpkg-genchanges: info: not including original source code in upload 789s CD .. 789s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 789s renaming (Files) example_2.0.orig.tar.gz 789s renaming (Files) example_2.0-1.debian.tar.xz 789s renaming (dsc) example_2.0-1.dsc 789s renaming (changes) example_2.0-1_source.changes 789s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 789s actually entering push 789s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 789s => `0' 789s + git config remote.dgit.skipdefaultupdate true 789s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 789s get_archive_dsc: nothing in archive, returning undef 789s no version available from the archive 789s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 789s => `' 789s previous reference hash= 789s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 789s => `' 789s fetch_from_archive: lastfetch= 789s nothing found! 789s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 789s + git check-ref-format archive/test-dummy/2.0-1 789s | git symbolic-ref -q HEAD 789s => `refs/heads/master' 789s | git rev-parse 'HEAD~0' 789s => `eb10718ab213ccfa83613ebbddefbffda941a548' 789s ffq_prev_branchinfo branch current refs/heads/master 789s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 789s => `' 789s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 789s => `' 789s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 789s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 789s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 789s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 789s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 789s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - 2aa7fa68c2c004c7269b648da732137b14c174454afe0697c5a579d5649ab64b 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 789s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 789s CD work 789s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 789s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 789s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 789s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 789s splitbrain_pseudomerge... 789s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 789s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 789s => `' 789s + git diff --quiet HEAD 789s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 789s => `' 789s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 789s checking that example_2.0-1.dsc corresponds to HEAD 789s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 789s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 789s dpkg-source: info: extracting example in example-2.0 789s dpkg-source: info: unpacking example_2.0.orig.tar.gz 789s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 789s dpkg-source: info: using patch list from debian/patches/series 789s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 789s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 789s dpkg-source: info: applying subdir/addnewups 789s CD example-2.0 789s | find -name .git -prune -print0 789s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 789s + git add -Af . 789s | git write-tree 789s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 789s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 789s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 789s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 789s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 789s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 789s files_compare_inputs example_2.0-1.dsc 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 789s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 789s files_compare_inputs example_2.0-1.dsc Files 789s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 789s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 789s files_compare_inputs example_2.0-1_source.changes 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 789s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 789s files_compare_inputs example_2.0-1_source.changes Files 789s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 789s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 789s checking origs needed (2.0)... 789s checking origs needed placement 'devel extra'... 789s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 789s origs example_2.0.orig.tar.gz is_orig 789s -| sh -ec 'cd "$1"; shift 789s 789s find -name "$1" -print0 | 789s xargs -0r sha256sum 789s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 789s origs example_2.0.orig.tar.gz $#$have=-1 789s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 789s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 789s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 789s push_tagwants: $VAR1 = [ 789s '2.0-1', 789s '45ea71a69fa522ce760afdab8a420200443753e9', 789s 'eb10718ab213ccfa83613ebbddefbffda941a548', 789s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 789s ]; 789s $VAR2 = [ 789s { 789s 'TagFn' => sub { "DUMMY" }, 789s 'TfSuffix' => '', 789s 'View' => 'dgit', 789s 'Tag' => 'archive/test-dummy/2.0-1', 789s 'Tfn' => sub { "DUMMY" }, 789s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9' 789s }, 789s { 789s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 789s 'Tfn' => sub { "DUMMY" }, 789s 'Tag' => 'test-dummy/2.0-1', 789s 'View' => 'maint', 789s 'TagFn' => sub { "DUMMY" }, 789s 'TfSuffix' => '-maintview' 789s } 789s ]; 789s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 789s => `1530000000 +0000' 789s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 789s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 789s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 789s => `adbae3209a0cc9d4d6b2014ffcd948304d7e48f9' 789s + git verify-tag adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s gpg: Signature made Mon Mar 31 12:31:23 2025 UTC 789s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 789s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 789s gpg: WARNING: This key is not certified with a trusted signature! 789s gpg: There is no indication that the signature belongs to the owner. 789s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 789s + git update-ref refs/tags/archive/test-dummy/2.0-1 adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 789s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 789s => `8fdac6501d4afa9739223c8a9dc1a838efb75d4d' 789s + git verify-tag 8fdac6501d4afa9739223c8a9dc1a838efb75d4d 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s gpg: Signature made Mon Mar 31 12:31:23 2025 UTC 789s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 789s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 789s gpg: WARNING: This key is not certified with a trusted signature! 789s gpg: There is no indication that the signature belongs to the owner. 789s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 789s + git update-ref refs/tags/test-dummy/2.0-1 8fdac6501d4afa9739223c8a9dc1a838efb75d4d 789s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 789s => `0' 789s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 789s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 789s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 789s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 789s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 789s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 789s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 789s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 789s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s 789s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 789s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 789s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 790s 790s Successfully signed dsc, changes files 790s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 790s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 790s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 790s D: Setting host argument. 790s Checking signature on .changes 790s Checking signature on .dsc 790s Uploading to test-dummy (via local to localhost): 790s Successfully uploaded packages. 790s dgit ok: pushed and uploaded 2.0-1 790s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 790s del_lrfetchrefs... 790s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 790s ' 790s + t-salsa-add-remote 790s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 790s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 790s + set -e 790s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 790s + git init --bare 790s hint: Using 'master' as the name for the initial branch. This default branch name 790s hint: is subject to change. To configure the initial branch name to use in all 790s hint: of your new repositories, which will suppress this warning, call: 790s hint: 790s hint: git config --global init.defaultBranch 790s hint: 790s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 790s hint: 'development'. The just-created branch can be renamed via this command: 790s hint: 790s hint: git branch -m 790s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 790s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 790s + git push --set-upstream origin master 790s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 790s * [new branch] master -> master 790s Branch 'master' set up to track remote branch 'master' from 'origin'. 790s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 790s + local 'mpat=E:identical in upstream files' 790s + shift 790s + set +o pipefail 790s + LC_MESSAGES=C 790s + LANGUAGE=C 790s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 790s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local gdr=git-debrebase 790s + : ' 790s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 790s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 790s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 790s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 790s docs/README | 1 + 790s 1 file changed, 1 insertion(+) 790s 790s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 790s git-debrebase: identical in upstream files. See diffstat above, or run 790s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 790s + local 'ps=255 0' 790s + set -o pipefail 790s + case $ps in 790s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local 'mpat=E:identical in upstream files' 790s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local grepper=fgrep 790s + case "$mpat" in 790s + case "$mpat" in 790s + grepper=egrep 790s + mpat='identical in upstream files' 790s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s git-debrebase: identical in upstream files. See diffstat above, or run 790s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 790s + local 'mpat=E:Unused patch file garbage will be discarded' 790s + shift 790s + set +o pipefail 790s + LC_MESSAGES=C 790s + LANGUAGE=C 790s + t-git-debrebase -fupstream-has-debian convert-from-gbp 790s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local gdr=git-debrebase 790s + : ' 790s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 790s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 790s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 790s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 790s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 790s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 790s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 790s $VAR2 = bless( do{\(my $o = { 790s 'fields' => { 790s 'Source' => 'example', 790s 'Version' => '2.0-1', 790s 'Distribution' => 'unstable', 790s 'Urgency' => 'medium', 790s 'Maintainer' => 'dgit test git user ', 790s 'Timestamp' => '1530000000', 790s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 790s 'Changes' => ' 790s example (2.0-1) unstable; urgency=medium 790s 790s [ Ian Jackson ] 790s * new upstream (did gbp import-orig)' 790s }, 790s 'allow_pgp' => 1, 790s 'drop_empty' => 0, 790s 'in_order' => [ 790s 'Source', 790s 'Version', 790s 'Distribution', 790s 'Urgency', 790s 'Maintainer', 790s 'Timestamp', 790s 'Date', 790s 'Changes' 790s ], 790s 'keep_duplicate' => 0, 790s 'is_pgp_signed' => 0, 790s 'name' => 'debian/changelog, entry no.1', 790s 'out_order' => [], 790s 'allow_duplicate' => 0 790s })}, 'Dpkg::Control::Hash' ); 790s last finished-looking changelog entry: (2.0-1) unstable 790s will stitch in dgit view, archive/test-dummy/2.0-1 790s git-debrebase: snags: 1 overriden by individual -f options 790s 790s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 790s + local 'ps=255 0' 790s + set -o pipefail 790s + case $ps in 790s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local 'mpat=E:Unused patch file garbage will be discarded' 790s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s + local grepper=fgrep 790s + case "$mpat" in 790s + case "$mpat" in 790s + grepper=egrep 790s + mpat='Unused patch file garbage will be discarded' 790s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 790s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 790s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 790s + local gdr=git-debrebase 790s + : ' 790s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 790s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 790s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 790s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 790s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 790s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 790s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 790s $VAR2 = bless( do{\(my $o = { 790s 'out_order' => [], 790s 'name' => 'debian/changelog, entry no.1', 790s 'fields' => { 790s 'Source' => 'example', 790s 'Version' => '2.0-1', 790s 'Distribution' => 'unstable', 790s 'Urgency' => 'medium', 790s 'Maintainer' => 'dgit test git user ', 790s 'Timestamp' => '1530000000', 790s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 790s 'Changes' => ' 790s example (2.0-1) unstable; urgency=medium 790s 790s [ Ian Jackson ] 790s * new upstream (did gbp import-orig)' 790s }, 790s 'in_order' => [ 790s 'Source', 790s 'Version', 790s 'Distribution', 790s 'Urgency', 790s 'Maintainer', 790s 'Timestamp', 790s 'Date', 790s 'Changes' 790s ], 790s 'allow_pgp' => 1, 790s 'is_pgp_signed' => 0, 790s 'keep_duplicate' => 0, 790s 'allow_duplicate' => 0, 790s 'drop_empty' => 0 790s })}, 'Dpkg::Control::Hash' ); 790s last finished-looking changelog entry: (2.0-1) unstable 790s will stitch in dgit view, archive/test-dummy/2.0-1 790s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 790s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 790s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 790s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 790s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 790s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 790s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 790s git-debrebase ffq check_specs * 790s git-debrebase ffq merge master 790s git-debrebase ffq check_remote origin remote fetch/merge branch 790s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 790s OK, you are ahead of refs/remotes/origin/master 790s git-debrebase ffq check_remote undef remote push branch 790s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 790s OK, you are ahead of refs/remotes/dgit/dgit/sid 790s git-debrebase: snags: 2 overriden by individual -f options 790s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 790s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 790s git-debrebase >$ 790s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 790s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 790s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 790s ' 790s + git branch converted-from-gbp 790s + v=2.0-2 790s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 790s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 790s + DEBEMAIL=dgit-tests@example.org 790s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 790s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 790s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 790s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 790s 1 file changed, 6 insertions(+) 790s + t-dch-commit-r 790s + t-dch-r-rune t-dch-commit 790s + local cmd=t-dch-commit 790s + shift 790s + local suite=unstable 790s + t-dch-commit -r -D unstable '' 790s + t-debchange -r -D unstable '' 790s + DEBEMAIL=dgit-tests@example.org 790s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 790s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 791s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 791s libdistro-info-perl is not installed, Debian release names are not known. 791s libdistro-info-perl is not installed, Ubuntu release names are not known. 791s + git commit -m 'dch -r -D unstable ' debian/changelog 791s [master 4af0243] dch -r -D unstable 791s 1 file changed, 1 insertion(+), 1 deletion(-) 791s + t-dgit -wgf push-source --new 791s + local dgit=dgit 791s + pwd 791s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 791s + : ' 791s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 791s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 791s | git rev-parse --show-toplevel 791s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 791s | git config -z --get-regexp --local '.*' 791s | git config -z --get-regexp --local '.*' 791s | git config -z --get-regexp --global '.*' 791s | git config -z --get-regexp --system '.*' 791s format 3.0 (quilt), quilt mode linear 791s Format `3.0 (quilt)', need to check/update patch stack 791s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 791s => `' 791s + git diff --quiet HEAD 791s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 791s canonical suite name for unstable is sid 791s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 791s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 791s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 791s | git rev-parse 'HEAD~0' 791s => `4af0243f9227b0d695fbff38df345aca23969e2e' 791s | git symbolic-ref -q HEAD 791s => `refs/heads/master' 791s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 791s CD work 791s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 791s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 791s examining quilt state (multiple patches, linear mode) 791s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 791s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 791s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 791s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 791s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 791s | git rev-parse 'HEAD~0' 791s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 791s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 791s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 791s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 791s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 791s CD fake 791s | find -name .git -prune -print0 791s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 791s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 791s + git add -Af . 791s | git write-tree 791s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 791s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 791s CD .. 791s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 791s CD ../fake 791s + git add -Af . 791s | git write-tree 791s => `607612c46d7ea5b66697b830f1a50f069061d460' 791s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 791s CD ../work 791s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 791s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 791s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 791s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 791s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 791s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 791s => `' 791s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 791s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 791s => `lib.c\x00new-upstream-file\x00src.c\x00' 791s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 791s differences @dl ## ## == == == ==. 791s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 791s dgit: quilt differences: src: ## orig ## gitignores: == orig == 791s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 791s starting quiltify (multiple patches, linear mode) 791s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 791s => `debian/control'... 791s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 791s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 791s => `' 791s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 791s search finished hooray! 791s quiltify linearisation planning successful, executing... 791s + git checkout -q master 791s | git status --ignored --porcelain 791s => `?? .pc/' 791s nothing quilty to commit, ok. 791s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 791s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 791s | git rev-parse 'HEAD~0' 791s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 791s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 791s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 791s CD work 791s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 791s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 791s CD .. 791s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 791s dpkg-source: info: using source format '3.0 (quilt)' 791s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 791s dpkg-source: info: using patch list from debian/patches/series 791s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 791s dpkg-source: info: building example in example_2.0-2.dsc 791s CD work 791s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 791s package seems new, not specifying -v 791s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 792s dpkg-genchanges: info: not including original source code in upload 792s CD .. 792s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 792s renaming (Files) example_2.0.orig.tar.gz 792s renaming (Files) example_2.0-2.debian.tar.xz 792s renaming (dsc) example_2.0-2.dsc 792s renaming (changes) example_2.0-2_source.changes 792s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 792s actually entering push 792s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 792s => `1' 792s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 792s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 792s git_lrfetch_sane iteration 0 792s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 792s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 792s => adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 refs/tags/archive/test-dummy/2.0-1 792s => 8fdac6501d4afa9739223c8a9dc1a838efb75d4d refs/tags/test-dummy/2.0-1 792s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 792s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 792s | git for-each-ref refs/dgit-fetch/test-dummy 792s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 792s |> adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 792s |> 8fdac6501d4afa9739223c8a9dc1a838efb75d4d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 792s git_lrfetch_sane: tidying any old suite lrfetchrefs 792s | git for-each-ref refs/dgit-fetch/sid 792s git_lrfetch_sane: git fetch --no-insane emulation complete 792s $VAR1 = { 792s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '8fdac6501d4afa9739223c8a9dc1a838efb75d4d', 792s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => 'adbae3209a0cc9d4d6b2014ffcd948304d7e48f9', 792s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9' 792s }; 792s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 792s |> adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 tag refs/tags/archive/test-dummy/2.0-1 792s currently refs/tags/archive/test-dummy/2.0-1=adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 792s |> 8fdac6501d4afa9739223c8a9dc1a838efb75d4d tag refs/tags/test-dummy/2.0-1 792s currently refs/tags/test-dummy/2.0-1=8fdac6501d4afa9739223c8a9dc1a838efb75d4d 792s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 792s |> adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 792s offered refs/tags/archive/test-dummy/2.0-1=adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 792s |> 8fdac6501d4afa9739223c8a9dc1a838efb75d4d tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 792s offered refs/tags/test-dummy/2.0-1=8fdac6501d4afa9739223c8a9dc1a838efb75d4d 792s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 792s get_archive_dsc: nothing in archive, returning undef 792s no version available from the archive 792s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 792s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 792s 792s Package not found in the archive, but has allegedly been pushed using dgit. 792s Perhaps the upload is stuck in incoming. Using the version from git. 792s 792s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s fetch mergeinfos: 792s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 792s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 792s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 792s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 792s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 792s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 792s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 792s + git check-ref-format archive/test-dummy/2.0-2 792s | git symbolic-ref -q HEAD 792s => `refs/heads/master' 792s | git rev-parse 'HEAD~0' 792s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 792s ffq_prev_branchinfo branch current refs/heads/master 792s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 792s => `' 792s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 792s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 792s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 792s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 792s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 792s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 792s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 792s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 792s | git status --ignored --porcelain 792s => `' 792s nothing quilty to commit, ok. 792s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 792s => `' 792s + git diff --quiet HEAD 792s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 792s => `45ea71a69fa522ce760afdab8a420200443753e9' 792s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 792s => `' 792s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 792s checking that example_2.0-2.dsc corresponds to HEAD 792s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 792s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 792s dpkg-source: info: extracting example in example-2.0 792s dpkg-source: info: unpacking example_2.0.orig.tar.gz 792s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 792s dpkg-source: info: using patch list from debian/patches/series 792s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 792s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 792s dpkg-source: info: applying subdir/addnewups 792s CD example-2.0 792s | find -name .git -prune -print0 792s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 792s + git add -Af . 792s | git write-tree 792s => `607612c46d7ea5b66697b830f1a50f069061d460' 792s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 792s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 792s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 792s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 792s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 792s files_compare_inputs example_2.0-2.dsc 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 792s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 792s files_compare_inputs example_2.0-2.dsc Files 792s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 792s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 792s files_compare_inputs example_2.0-2_source.changes 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 792s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 792s files_compare_inputs example_2.0-2_source.changes Files 792s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 792s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 792s checking origs needed (2.0)... 792s checking origs needed placement 'devel extra'... 792s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 792s origs example_2.0.orig.tar.gz is_orig 792s -| sh -ec 'cd "$1"; shift 792s 792s find -name "$1" -print0 | 792s xargs -0r sha256sum 792s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 792s origs example_2.0.orig.tar.gz $#$have=-1 792s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 792s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 792s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 792s push_tagwants: $VAR1 = [ 792s '2.0-2', 792s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 792s undef, 792s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 792s ]; 792s $VAR2 = [ 792s { 792s 'View' => 'dgit', 792s 'TfSuffix' => '', 792s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 792s 'Tfn' => sub { "DUMMY" }, 792s 'TagFn' => sub { "DUMMY" }, 792s 'Tag' => 'archive/test-dummy/2.0-2' 792s }, 792s { 792s 'Tfn' => sub { "DUMMY" }, 792s 'TagFn' => sub { "DUMMY" }, 792s 'Tag' => 'test-dummy/2.0-2', 792s 'View' => 'dgit', 792s 'TfSuffix' => '-dgit', 792s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 792s } 792s ]; 792s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 792s => `1530000000 +0000' 792s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 792s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 792s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 792s => `d2a348bc096dd78e6fa7a0914a0f2dc7d2630395' 792s + git verify-tag d2a348bc096dd78e6fa7a0914a0f2dc7d2630395 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s gpg: Signature made Mon Mar 31 12:31:26 2025 UTC 792s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 792s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 792s gpg: WARNING: This key is not certified with a trusted signature! 792s gpg: There is no indication that the signature belongs to the owner. 792s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 792s + git update-ref refs/tags/archive/test-dummy/2.0-2 d2a348bc096dd78e6fa7a0914a0f2dc7d2630395 792s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 792s => `65cdb80329a6643a2e1f3aab23e36859dc94c19b' 792s + git verify-tag 65cdb80329a6643a2e1f3aab23e36859dc94c19b 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s gpg: Signature made Mon Mar 31 12:31:26 2025 UTC 792s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 792s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 792s gpg: WARNING: This key is not certified with a trusted signature! 792s gpg: There is no indication that the signature belongs to the owner. 792s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 792s + git update-ref refs/tags/test-dummy/2.0-2 65cdb80329a6643a2e1f3aab23e36859dc94c19b 792s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 792s => `1' 792s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 792s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 792s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 792s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 792s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 792s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 792s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 792s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s 792s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 792s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 792s 792s Successfully signed dsc, changes files 792s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 792s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 792s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 792s D: Setting host argument. 792s Checking signature on .changes 792s Checking signature on .dsc 792s Package includes an .orig.tar.gz file although the debian revision suggests 792s that it might not be required. Multiple uploads of the .orig.tar.gz may be 792s rejected by the upload queue management software. 792s Uploading to test-dummy (via local to localhost): 792s Successfully uploaded packages. 792s dgit ok: pushed and uploaded 2.0-2 792s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 792s del_lrfetchrefs... 792s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 792s del_lrfetchrefs: adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 792s del_lrfetchrefs: 8fdac6501d4afa9739223c8a9dc1a838efb75d4d refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 792s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 792s ' 792s + git push 792s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 792s eb10718..6b22dd5 master -> master 792s + cd .. 792s + t-archive-process-incoming sid 792s + local suite=sid 792s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 792s + t-archive-query sid 792s + local suite=sid 792s + local dscf=main/example_2.0-2.dsc 792s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 792s + local suite=sid 792s + local p=example 792s + local v=2.0-2 792s + local dscf=main/example_2.0-2.dsc 792s + local sha 792s ++ sha256sum 792s + sha='98e8bcb541ef03cbd66ed204f1e3220c439674483f096cf7a46c9c790271dd70 -' 792s + echo '2.0-2 98e8bcb541ef03cbd66ed204f1e3220c439674483f096cf7a46c9c790271dd70 main/example_2.0-2.dsc' 792s + t-aq-archive-updated sid example 792s + local suite=sid 792s + local p=example 792s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 792s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 792s + perl -wne ' 792s use JSON; 792s use strict; 792s our @v; 792s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 792s push @v, { 792s "version" => "$1", 792s "sha256sum" => "$2", 792s "component" => "$3", 792s "filename" => "$4", 792s }; 792s END { 792s my $json = JSON->new->canonical(); 792s print $json->encode(\@v) or die $!; 792s } 792s ' 792s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 792s ++ echo git mirror aq 792s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 792s . $troot/lib-gdr 792s t-tstunt-parsechangelog 792s p=example 792s t-git-next-date 792s ' 792s + local savevars= 792s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 792s + local 'importeval= 792s . $troot/lib-gdr 792s t-tstunt-parsechangelog 792s p=example 792s t-git-next-date 792s ' 792s + local import=IMPORT.gdr-convert-gbp 792s + exec 792s + local vn 792s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 792s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 792s print STDERR "saving-exporting $vn\n"; 792s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 792s or die $!; 792s } 792s ' 792s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 792s saving-exporting DGIT_TEST_REAL_GPG_AGENT 792s saving-exporting DGIT_TEST_REAL_DEBCHANGE 792s saving-exporting DGIT_TEST_REAL_GPG 792s + set -e 792s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 792s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 792s + printf '\n%s\n' ' 792s . $troot/lib-gdr 792s t-tstunt-parsechangelog 792s p=example 792s t-git-next-date 792s ' 792s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 792s + rc=0 792s + set +x 792s + set +e 792s + pwd 792s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 792s + '[' x '!=' x ']' 792s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 792s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 792s + set -e 792s + test 0 = 0 792s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 792s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 792s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 792s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 792s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 792s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 792s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 792s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 792s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 792s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 792s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 792s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 792s +++ : -D 792s +++ export GDR_TEST_DEBUG 792s +++ t-tstunt debchange 792s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 792s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 792s +++ local var=PATH 792s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 792s +++ eval ' 792s case "$PATH" in 792s "$tstunt:"*) ;; 792s *":$tstunt:"*) ;; 792s "") PATH="$tstunt" ;; 792s *) PATH="$tstunt:$PATH" ;; 792s esac 792s export PATH 792s ' 792s ++++ case "$PATH" in 792s ++++ export PATH 792s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 792s +++ local var=PERLLIB 792s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 792s +++ eval ' 792s case "$PERLLIB" in 792s "$tstunt:"*) ;; 792s *":$tstunt:"*) ;; 792s "") PERLLIB="$tstunt" ;; 792s *) PERLLIB="$tstunt:$PERLLIB" ;; 792s esac 792s export PERLLIB 792s ' 792s ++++ case "$PERLLIB" in 792s ++++ export PERLLIB 792s +++ local f 792s +++ for f in "$@" 792s +++ t-tstunt--save-real debchange 792s +++ local f=debchange 792s +++ case "$f" in 792s +++ local rc 792s +++ local real 792s +++ set +e 792s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 792s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 792s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 792s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 792s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 792s ++++ type -p debchange 792s +++ real=/usr/bin/debchange 792s +++ rc=0 792s +++ set -e 792s +++ case $rc in 792s +++ local varname=debchange 792s +++ varname=DGIT_TEST_REAL_DEBCHANGE 792s +++ eval ' 792s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 792s export DGIT_TEST_REAL_DEBCHANGE 792s ' 792s ++++ : /usr/bin/debchange 792s ++++ export DGIT_TEST_REAL_DEBCHANGE 792s +++ f=./debchange 792s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 792s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 792s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 792s ++ t-tstunt-parsechangelog 792s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 793s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 793s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 793s ++ local var=PATH 793s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 793s ++ eval ' 793s case "$PATH" in 793s "$tstunt:"*) ;; 793s *":$tstunt:"*) ;; 793s "") PATH="$tstunt" ;; 793s *) PATH="$tstunt:$PATH" ;; 793s esac 793s export PATH 793s ' 793s +++ case "$PATH" in 793s +++ export PATH 793s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 793s ++ local var=PERLLIB 793s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 793s ++ eval ' 793s case "$PERLLIB" in 793s "$tstunt:"*) ;; 793s *":$tstunt:"*) ;; 793s "") PERLLIB="$tstunt" ;; 793s *) PERLLIB="$tstunt:$PERLLIB" ;; 793s esac 793s export PERLLIB 793s ' 793s +++ case "$PERLLIB" in 793s +++ export PERLLIB 793s ++ local f 793s ++ for f in "$@" 793s ++ t-tstunt--save-real dpkg-parsechangelog 793s ++ local f=dpkg-parsechangelog 793s ++ case "$f" in 793s ++ local rc 793s ++ local real 793s ++ set +e 793s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 793s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 793s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 793s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 793s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 793s +++ type -p dpkg-parsechangelog 793s ++ real=/usr/bin/dpkg-parsechangelog 793s ++ rc=0 793s ++ set -e 793s ++ case $rc in 793s ++ local varname=dpkg_parsechangelog 793s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 793s ++ eval ' 793s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 793s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 793s ' 793s +++ : /usr/bin/dpkg-parsechangelog 793s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 793s ++ f=./dpkg-parsechangelog 793s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 793s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 793s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 793s ++ for f in "$@" 793s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 793s ++ local f=Dpkg/Changelog/Parse.pm 793s ++ case "$f" in 793s ++ return 793s ++ f=./Dpkg/Changelog/Parse.pm 793s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 793s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 793s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 793s ++ p=example 793s ++ t-git-next-date 793s ++ GIT_COMMITTER_DATE='1530000001 +0100' 793s ++ GIT_AUTHOR_DATE='1530000001 +0100' 793s + cd example 793s + t-dgit setup-mergechangelogs 793s + local dgit=dgit 793s + pwd 793s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 793s + : ' 793s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 793s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 793s | git rev-parse --show-toplevel 793s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 793s | git config -z --get-regexp --local '.*' 793s | git config -z --get-regexp --local '.*' 793s | git config -z --get-regexp --global '.*' 793s | git config -z --get-regexp --system '.*' 793s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 793s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 793s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 793s ' 793s + git checkout -b raw-converted-from-gbp converted-from-gbp 793s Switched to a new branch 'raw-converted-from-gbp' 793s ++ git diff --stat 'HEAD^2' 793s + test ' debian/patches/0001-Add-a-new-upstream-file.patch | 16 ---------------- 793s debian/patches/0002-Edit-the-.c-file.patch | 15 --------------- 793s debian/patches/garbage | 1 - 793s debian/patches/series | 3 --- 793s debian/patches/subdir/addnewups | 16 ---------------- 793s 5 files changed, 51 deletions(-)' 793s + git diff --exit-code --stat 'HEAD^1' 793s + git reset --hard 'HEAD^1' 793s HEAD is now at 178896a Add another new upstream file 793s + git checkout -b stitched-laundered master 793s Switched to a new branch 'stitched-laundered' 793s + mix-it 793s + t-git-next-date 793s + GIT_COMMITTER_DATE='1530000002 +0100' 793s + GIT_AUTHOR_DATE='1530000002 +0100' 793s ++ git symbolic-ref HEAD 793s + local m=refs/heads/stitched-laundered 793s + t-some-changes 'subcommands refs/heads/stitched-laundered 1' 793s + local 'token=subcommands refs/heads/stitched-laundered 1' 793s + local which=dum 793s + local fsuffix= 793s + t-git-next-date 793s + GIT_COMMITTER_DATE='1530000003 +0100' 793s + GIT_AUTHOR_DATE='1530000003 +0100' 793s + case "$which" in 793s + echo '// debian subcommands refs/heads/stitched-laundered 1' 793s + git add debian/zorkmid 793s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)' 793s [stitched-laundered 5a67018] DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1) 793s 1 file changed, 1 insertion(+) 793s create mode 100644 debian/zorkmid 793s + case "$which" in 793s + echo '// upstream subcommands refs/heads/stitched-laundered 1' 793s + git add src.c 793s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)' 793s [stitched-laundered 088ca27] UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1) 793s 1 file changed, 1 insertion(+) 793s + case "$which" in 793s + for f in debian/zorkmid$fsuffix src$fsuffix.c 793s + echo '// both! subcommands refs/heads/stitched-laundered 1' 793s + git add debian/zorkmid 793s + for f in debian/zorkmid$fsuffix src$fsuffix.c 793s + echo '// both! subcommands refs/heads/stitched-laundered 1' 793s + git add src.c 793s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-laundered 1)' 793s [stitched-laundered 723bf8d] MIXED add both() (subcommands refs/heads/stitched-laundered 1) 793s 2 files changed, 2 insertions(+) 793s + t-git-next-date 793s + GIT_COMMITTER_DATE='1530000004 +0100' 793s + GIT_AUTHOR_DATE='1530000004 +0100' 793s + t-dgit --git-debrebase=true -wgf quilt-fixup 793s + local dgit=dgit 793s + pwd 793s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 793s + : ' 793s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 793s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 793s | git rev-parse --show-toplevel 793s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 793s | git config -z --get-regexp --local '.*' 793s | git config -z --get-regexp --local '.*' 793s | git config -z --get-regexp --global '.*' 793s | git config -z --get-regexp --system '.*' 793s format 3.0 (quilt), quilt mode linear 793s Format `3.0 (quilt)', need to check/update patch stack 793s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 793s => `' 793s + git diff --quiet HEAD 793s + git clean -xdff 793s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 793s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 793s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 793s | git rev-parse 'HEAD~0' 793s => `723bf8d3d175bfc9797521c3fa5d144421659ec9' 793s | git symbolic-ref -q HEAD 793s => `refs/heads/stitched-laundered' 793s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 793s CD work 793s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 793s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s examining quilt state (multiple patches, linear mode) 793s branch_is_gdr 723bf8d3d175bfc9797521c3fa5d144421659ec9... 793s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 793s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 793s | git rev-parse 'HEAD~0' 793s => `723bf8d3d175bfc9797521c3fa5d144421659ec9' 793s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 793s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 793s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 793s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 793s CD fake 793s | find -name .git -prune -print0 793s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 793s + git checkout -f 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian 793s + git add -Af . 793s | git write-tree 793s => `7cb057ef40ab83ab9ca6e93a95412d81c47fa615' 793s fake orig tree object 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 793s CD .. 793s + git reset -q --hard 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s CD ../fake 793s + git add -Af . 793s | git write-tree 793s => `988c74fadb9b5ae01c47c4c49cdbf578ce47a61a' 793s fake o+d/p tree object 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 793s CD ../work 793s | git ls-tree --name-only -z 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 793s | git diff-tree -z --no-renames -r 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 3a100904f78475be0a4bd5a14099ff17abd410ac M\x00src.c\x00' 793s quiltify_trees_differ 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 723bf8d3d175bfc9797521c3fa5d144421659ec9 => 1 793s | git diff-tree -z --no-renames --name-only -r 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 793s => `src.c\x00' 793s quiltify_trees_differ 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 793s | git diff-tree -z --no-renames --name-only -r 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 793s => `lib.c\x00new-upstream-file\x00src.c\x00' 793s quiltify_trees_differ 7cb057ef40ab83ab9ca6e93a95412d81c47fa615 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 793s differences @dl ## ## ## == == ==. 793s dgit: base trees orig=7cb057ef40ab83ab9ca6 o+d/p=988c74fadb9b5ae01c47 793s dgit: quilt differences: src: ## orig ## gitignores: == orig == 793s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 793s starting quiltify (multiple patches, linear mode) 793s | git ls-tree --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/rules debian/control 793s => `debian/control'... 793s quiltify investigate 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s | git diff-tree -z --no-renames --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 793s => `src.c\x00' 793s quiltify_trees_differ 723bf8d3d175bfc9797521c3fa5d144421659ec9 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 793s | git ls-tree --name-only 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/rules debian/control 793s => `debian/control'... 793s | git cat-file commit 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e'... 793s | git diff-tree -z --no-renames --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `debian\x00src.c\x00' 793s quiltify_trees_differ 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 => 1 793s considering C=723bf8d3d175bfc9797521c3fa5d144421659ec9 P=088ca2748c333245f8f3dc6482c25427680a4f37 793s | git diff-tree -r --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 723bf8d3d175bfc9797521c3fa5d144421659ec9 -- debian/patches .pc debian/source/format 793s => `' 793s search queue P=088ca2748c333245f8f3dc6482c25427680a4f37 NT 793s quiltify investigate 088ca2748c333245f8f3dc6482c25427680a4f37 793s | git diff-tree -z --no-renames --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 793s => `debian\x00src.c\x00' 793s quiltify_trees_differ 088ca2748c333245f8f3dc6482c25427680a4f37 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 1 793s | git ls-tree --name-only 088ca2748c333245f8f3dc6482c25427680a4f37 -- debian/rules debian/control 793s => `debian/control'... 793s | git cat-file commit 088ca2748c333245f8f3dc6482c25427680a4f37 793s => `tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6'... 793s | git diff-tree -z --no-renames --name-only 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 793s => `src.c\x00' 793s quiltify_trees_differ 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 => 1 793s considering C=088ca2748c333245f8f3dc6482c25427680a4f37 P=5a670186618804169c6ac55f3c296ebd370af060 793s | git diff-tree -r --name-only 5a670186618804169c6ac55f3c296ebd370af060 088ca2748c333245f8f3dc6482c25427680a4f37 -- debian/patches .pc debian/source/format 793s => `' 793s search queue P=5a670186618804169c6ac55f3c296ebd370af060 NT 793s quiltify investigate 5a670186618804169c6ac55f3c296ebd370af060 793s | git diff-tree -z --no-renames --name-only 5a670186618804169c6ac55f3c296ebd370af060 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a 793s => `debian\x00' 793s quiltify_trees_differ 5a670186618804169c6ac55f3c296ebd370af060 988c74fadb9b5ae01c47c4c49cdbf578ce47a61a => 0 793s search finished hooray! 793s quiltify linearisation planning successful, executing... 793s quiltify traverse 5a670186618804169c6ac55f3c296ebd370af060..088ca2748c333245f8f3dc6482c25427680a4f37 793s | git cat-file commit 088ca2748c333245f8f3dc6482c25427680a4f37 793s => `tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6'... 793s | git log -n1 '--pretty=format:%aD' 088ca2748c333245f8f3dc6482c25427680a4f37 793s => `Tue, 26 Jun 2018 09:00:03 +0100' 793s + git checkout -q 088ca2748c333245f8f3dc6482c25427680a4f37 793s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 793s | realpath -- /usr/bin/dgit 793s => `/usr/bin/dgit' 793s | realpath -- .git/dgit/quilt-description.tmp 793s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 793s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 793s dpkg-source: info: using patch list from debian/patches/series 793s dpkg-source: info: local changes detected, the modified files are: 793s work/src.c 793s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 793s + git checkout -q 088ca2748c333245f8f3dc6482c25427680a4f37 debian/changelog 793s quiltify traverse 088ca2748c333245f8f3dc6482c25427680a4f37..723bf8d3d175bfc9797521c3fa5d144421659ec9 793s | git cat-file commit 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e'... 793s | git log -n1 '--pretty=format:%aD' 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s => `Tue, 26 Jun 2018 09:00:03 +0100' 793s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 793s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 793s | realpath -- /usr/bin/dgit 793s => `/usr/bin/dgit' 793s | realpath -- .git/dgit/quilt-description.tmp 793s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 793s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsstit.patch 793s dpkg-source: info: using patch list from debian/patches/series 794s dpkg-source: info: local changes detected, the modified files are: 794s work/src.c 794s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 794s + git checkout -q 723bf8d3d175bfc9797521c3fa5d144421659ec9 debian/changelog 794s + git checkout -q master 794s | git status --ignored --porcelain 794s => ` M debian/patches/series'... 794s + git add -f debian/patches 794s Commit Debian 3.0 (quilt) metadata 794s 794s [dgit (9.15) quilt-fixup] 794s 794s + git commit -m 'Commit Debian 3.0 (quilt) metadata 794s 794s [dgit (9.15) quilt-fixup] 794s ' 794s [master 746c74f] Commit Debian 3.0 (quilt) metadata 794s 3 files changed, 29 insertions(+) 794s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 794s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 794s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 794s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 794s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 794s ' 794s + t-git-next-date 794s + GIT_COMMITTER_DATE='1530000005 +0100' 794s + GIT_AUTHOR_DATE='1530000005 +0100' 794s + t-some-changes 'subcommands refs/heads/stitched-laundered 2' 794s + local 'token=subcommands refs/heads/stitched-laundered 2' 794s + local which=dum 794s + local fsuffix= 794s + t-git-next-date 794s + GIT_COMMITTER_DATE='1530000006 +0100' 794s + GIT_AUTHOR_DATE='1530000006 +0100' 794s + case "$which" in 794s + echo '// debian subcommands refs/heads/stitched-laundered 2' 794s + git add debian/zorkmid 794s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)' 794s [stitched-laundered 883a23a] DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2) 794s 1 file changed, 1 insertion(+) 794s + case "$which" in 794s + echo '// upstream subcommands refs/heads/stitched-laundered 2' 794s + git add src.c 794s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)' 794s [stitched-laundered 18d7ec4] UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2) 794s 1 file changed, 1 insertion(+) 794s + case "$which" in 794s + for f in debian/zorkmid$fsuffix src$fsuffix.c 794s + echo '// both! subcommands refs/heads/stitched-laundered 2' 794s + git add debian/zorkmid 794s + for f in debian/zorkmid$fsuffix src$fsuffix.c 794s + echo '// both! subcommands refs/heads/stitched-laundered 2' 794s + git add src.c 794s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-laundered 2)' 794s [stitched-laundered 9d6d227] MIXED add both() (subcommands refs/heads/stitched-laundered 2) 794s 2 files changed, 2 insertions(+) 794s + t-git-next-date 794s + GIT_COMMITTER_DATE='1530000007 +0100' 794s + GIT_AUTHOR_DATE='1530000007 +0100' 794s + t-git-next-date 794s + GIT_COMMITTER_DATE='1530000008 +0100' 794s + GIT_AUTHOR_DATE='1530000008 +0100' 794s + t-git-debrebase quick 794s + local gdr=git-debrebase 794s + : ' 794s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 794s + git-debrebase --dgit=dgit -D quick 794s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 794s git-debrebase ffq check_specs * 794s git-debrebase *** WALK 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 0 - 794s git-debrebase get_differs 18d7ec4a5706a591911fe795625a08874b135559 7fd71e34f90a1fbc62937d605009df6c8192ba92 = 0x22 794s git-debrebase classify 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 $t=7fd71e34f90a1fbc62937d605009df6c8192ba92 @p 18d7ec4a5706a591911fe795625a08874b135559/0x22 794s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Mixed","CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Parents" => [{"CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Differs" => 34,"Ix" => 0}],"Tree" => "7fd71e34f90a1fbc62937d605009df6c8192ba92","Hdr" => "tree 7fd71e34f90a1fbc62937d605009df6c8192ba92\nparent 18d7ec4a5706a591911fe795625a08874b135559\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 794s git-debrebase get_differs 883a23a0f780f81e548aa5a710758628d9635e4c a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 = 0x2 794s git-debrebase classify 18d7ec4a5706a591911fe795625a08874b135559 $t=a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 @p 883a23a0f780f81e548aa5a710758628d9635e4c/0x2 794s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c"}],"Type" => "Upstream","CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Hdr" => "tree a33aa1dcb8b303bef3362e948b79ba4086ff1ed7\nparent 883a23a0f780f81e548aa5a710758628d9635e4c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "a33aa1dcb8b303bef3362e948b79ba4086ff1ed7"} 794s git-debrebase get_differs 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 55acecd5e355512d4905bedf0f53a6eb06feb860 = 0x20 794s git-debrebase classify 883a23a0f780f81e548aa5a710758628d9635e4c $t=55acecd5e355512d4905bedf0f53a6eb06feb860 @p 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8/0x20 794s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8"}],"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Hdr" => "tree 55acecd5e355512d4905bedf0f53a6eb06feb860\nparent 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Tree" => "55acecd5e355512d4905bedf0f53a6eb06feb860"} 794s git-debrebase get_differs 723bf8d3d175bfc9797521c3fa5d144421659ec9 270decbd8d0524e44c0e8a7e159283a5e00a92d3 = 0x4 794s git-debrebase classify 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 $t=270decbd8d0524e44c0e8a7e159283a5e00a92d3 @p 723bf8d3d175bfc9797521c3fa5d144421659ec9/0x4 794s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9"}],"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Type" => "AddPatches","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Hdr" => "tree 270decbd8d0524e44c0e8a7e159283a5e00a92d3\nparent 723bf8d3d175bfc9797521c3fa5d144421659ec9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Tree" => "270decbd8d0524e44c0e8a7e159283a5e00a92d3"} 794s git-debrebase get_differs 088ca2748c333245f8f3dc6482c25427680a4f37 d8756ce5963485dffef0f9a43abc1ec0129d6c1e = 0x22 794s git-debrebase classify 723bf8d3d175bfc9797521c3fa5d144421659ec9 $t=d8756ce5963485dffef0f9a43abc1ec0129d6c1e @p 088ca2748c333245f8f3dc6482c25427680a4f37/0x22 794s git-debrebase = Mixed {"Hdr" => "tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e\nparent 088ca2748c333245f8f3dc6482c25427680a4f37\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d8756ce5963485dffef0f9a43abc1ec0129d6c1e","Parents" => [{"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37","Differs" => 34,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Type" => "Mixed"} 794s git-debrebase get_differs 5a670186618804169c6ac55f3c296ebd370af060 a448632c39f18e3867a3c19a5cf796f2c50ae2f6 = 0x2 794s git-debrebase classify 088ca2748c333245f8f3dc6482c25427680a4f37 $t=a448632c39f18e3867a3c19a5cf796f2c50ae2f6 @p 5a670186618804169c6ac55f3c296ebd370af060/0x2 794s git-debrebase = Upstream {"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Ix" => 0,"Differs" => 2}],"Tree" => "a448632c39f18e3867a3c19a5cf796f2c50ae2f6","Hdr" => "tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6\nparent 5a670186618804169c6ac55f3c296ebd370af060\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 794s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f = 0x20 794s git-debrebase classify 5a670186618804169c6ac55f3c296ebd370af060 $t=7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 794s git-debrebase = Packaging {"Hdr" => "tree 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging","CommitId" => "5a670186618804169c6ac55f3c296ebd370af060"} 794s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 794s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 794s git-debrebase = AddPatches {"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 794s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 794s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 794s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}]} 794s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 794s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 794s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db"} 794s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 794s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 794s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 794s git-debrebase = Pseudomerge {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},$VAR1->{"Overwritten"}[0]],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"} 794s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 794s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 794s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 794s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 794s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 794s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 794s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 794s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 794s git-debrebase = Upstream {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 794s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 794s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 794s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 794s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 794s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 794s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 794s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 794s git-debrebase WALK REWRITING NOW cl=HASH(0x5645f2a4e060) procd=HASH(0x5645f2a58b30) 794s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 794s git-debrebase WALK BUILD 5a670186618804169c6ac55f3c296ebd370af060 Debian (rewriting=1) 794s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 794s git-debrebase WALK BUILD 723bf8d3d175bfc9797521c3fa5d144421659ec9 Debian (rewriting=1) 794s git-debrebase WALK BUILD 883a23a0f780f81e548aa5a710758628d9635e4c Debian (rewriting=1) 794s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 794s git-debrebase WALK BUILD 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 Debian (rewriting=1) 794s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 794s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 794s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 794s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 794s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 794s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 794s git-debrebase WALK BUILD 088ca2748c333245f8f3dc6482c25427680a4f37 Upstream (rewriting=1) 794s git-debrebase WALK BUILD 723bf8d3d175bfc9797521c3fa5d144421659ec9 Upstream (rewriting=1) 794s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 794s git-debrebase WALK BUILD 18d7ec4a5706a591911fe795625a08874b135559 Upstream (rewriting=1) 794s git-debrebase WALK BUILD 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 Upstream (rewriting=1) 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 794s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 = 0x4 794s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 794s git-debrebase: laundered (head was 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9) 794s git-debrebase >= update refs/ffq-prev/heads/stitched-laundered 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 0000000000000000000000000000000000000000 794s git-debrebase >= delete refs/debrebase-last/heads/stitched-laundered 794s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 794s git-debrebase >$ 794s Recorded previous head for preservation 794s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 794s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 794s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 794s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 794s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 794s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 794s git-debrebase = Upstream {"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"Differs" => 2}]} 794s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 794s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 794s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"Type" => "Upstream","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 794s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 794s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 794s git-debrebase = Upstream {"Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"}]} 794s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 794s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 794s git-debrebase = Upstream {"Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream"} 794s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 794s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 794s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Type" => "Upstream","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0,"Differs" => 2}]} 794s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 794s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 794s git-debrebase = Upstream {"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"} 794s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 794s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 794s git-debrebase = Packaging {"Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}]} 794s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 794s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 794s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 794s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 794s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 794s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 794s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 794s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 794s git-debrebase = Packaging {"Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0,"Differs" => 32}]} 794s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 794s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 794s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 794s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 794s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 794s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 794s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 794s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 794s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 794s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 794s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 794s git-debrebase >= delete refs/ffq-prev/heads/stitched-laundered 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 794s git-debrebase >= update refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 794s git-debrebase >= update HEAD 64d2fdf7628f675981360f0dce3aaaa227b0676a dab3cc0fcfead932f6714305cfb670067c157804 794s git-debrebase >$ 794s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 794s ' 794s + t-gdr-good stitched HEAD 794s + local state=stitched 794s + local beforetag=HEAD 794s + case $state in 794s + git diff --quiet HEAD -- :. ':!debian/patches' 794s + LC_MESSAGES=C 794s + t-git-debrebase status 794s + local gdr=git-debrebase 794s + : ' 794s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 794s + git-debrebase --dgit=dgit -D status 794s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 794s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 794s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 794s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [{"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Differs" => 0,"Ix" => 0},{"Ix" => 1,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Differs" => 8}],"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a"} 794s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 794s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 794s git-debrebase = Upstream {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 794s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 794s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 794s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2}],"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Upstream","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"} 794s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 794s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 794s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Differs" => 2}],"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"} 794s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 794s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 794s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"} 794s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 794s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 794s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}],"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"} 794s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 794s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 794s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2}],"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 794s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 794s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 794s git-debrebase = Upstream {"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0}],"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 794s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 794s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 794s git-debrebase = Packaging {"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"} 794s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 794s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 794s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n"} 794s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 794s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 794s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0}],"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"} 794s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 794s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 794s git-debrebase = Packaging {"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n"} 794s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 794s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 794s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"} 794s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 794s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 794s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"} 794s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 794s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 794s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 794s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 794s git-debrebase ffq_prev_branchinfo branch current refs/heads/stitched-laundered 794s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 794s ' 794s + case $state in 794s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 794s branch contains furniture (not laundered) 794s + egrep '^ stitched$' ../status.check 794s stitched 794s + t-gdr-good-analyse HEAD stitched 794s + local head=HEAD 794s + local state=stitched 794s + local wsfx= 794s + local etypes bwtip 794s + case $state in 794s + etypes=Pseudomerge-Upstream 794s + anal=../anal 794s + t-git-debrebase analyse HEAD 794s + local gdr=git-debrebase 794s + : ' 794s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 794s + git-debrebase --dgit=dgit -D analyse HEAD 795s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 1 *main::STDOUT 795s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 795s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 795s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 795s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Pseudomerge","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"},{"Ix" => 1,"Differs" => 8,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9"}],"Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]]} 795s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 795s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 795s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0,"Differs" => 2}]} 795s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 795s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 795s git-debrebase = Upstream {"Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n"} 795s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 795s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 795s git-debrebase = Upstream {"Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Type" => "Upstream"} 795s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 795s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 795s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"}]} 795s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 795s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 795s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 795s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 795s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 795s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Type" => "Upstream","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"}]} 795s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 795s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 795s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0,"Differs" => 2}],"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n"} 795s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 795s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 795s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"}]} 795s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 795s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 795s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 795s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 795s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 795s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Type" => "Packaging"} 795s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 795s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 795s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}],"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging"} 795s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 795s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 795s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16,"Ix" => 0}]} 795s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 795s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 795s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 795s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 795s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 795s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 795s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 795s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 795s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 795s ' 795s ++ git rev-parse HEAD 795s + expect=64d2fdf7628f675981360f0dce3aaaa227b0676a 795s + exec 795s + local cid ctype info nparents 795s + read cid ctype info 795s + : ===== 64d2fdf7628f675981360f0dce3aaaa227b0676a Pseudomerge Contributor=dab3cc0fcfead932f6714305cfb670067c157804 ===== 795s + test 64d2fdf7628f675981360f0dce3aaaa227b0676a = 64d2fdf7628f675981360f0dce3aaaa227b0676a 795s + local cetype=Pseudomerge 795s + '[' xPseudomerge = xPseudomerge ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 64d2fdf7628f675981360f0dce3aaaa227b0676a 795s + local 'parents=dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 795s + expect='dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 795s + enparents=1 795s + : Pseudomerge/SAME 'dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + expect=dab3cc0fcfead932f6714305cfb670067c157804 795s + expect=dab3cc0fcfead932f6714305cfb670067c157804 795s + enparents=2 795s + git diff --quiet dab3cc0fcfead932f6714305cfb670067c157804..64d2fdf7628f675981360f0dce3aaaa227b0676a 795s + etypes=Upstream 795s + : 'reject pointless pseudomerges' 795s + local 'overwritten= 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 795s + overwritten=9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 795s + t-git-debrebase analyse 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 795s + local gdr=git-debrebase 795s + : ' 795s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 795s + git-debrebase --dgit=dgit -D analyse 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 795s git-debrebase *** WALK 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 1 *main::STDOUT 795s git-debrebase get_differs 18d7ec4a5706a591911fe795625a08874b135559 7fd71e34f90a1fbc62937d605009df6c8192ba92 = 0x22 795s git-debrebase classify 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 $t=7fd71e34f90a1fbc62937d605009df6c8192ba92 @p 18d7ec4a5706a591911fe795625a08874b135559/0x22 795s git-debrebase = Mixed {"Parents" => [{"CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Ix" => 0,"Differs" => 34}],"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "7fd71e34f90a1fbc62937d605009df6c8192ba92","Hdr" => "tree 7fd71e34f90a1fbc62937d605009df6c8192ba92\nparent 18d7ec4a5706a591911fe795625a08874b135559\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n"} 795s git-debrebase get_differs 883a23a0f780f81e548aa5a710758628d9635e4c a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 = 0x2 795s git-debrebase classify 18d7ec4a5706a591911fe795625a08874b135559 $t=a33aa1dcb8b303bef3362e948b79ba4086ff1ed7 @p 883a23a0f780f81e548aa5a710758628d9635e4c/0x2 795s git-debrebase = Upstream {"Tree" => "a33aa1dcb8b303bef3362e948b79ba4086ff1ed7","Hdr" => "tree a33aa1dcb8b303bef3362e948b79ba4086ff1ed7\nparent 883a23a0f780f81e548aa5a710758628d9635e4c\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Upstream","CommitId" => "18d7ec4a5706a591911fe795625a08874b135559","Parents" => [{"Ix" => 0,"CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Differs" => 2}]} 795s git-debrebase get_differs 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 55acecd5e355512d4905bedf0f53a6eb06feb860 = 0x20 795s git-debrebase classify 883a23a0f780f81e548aa5a710758628d9635e4c $t=55acecd5e355512d4905bedf0f53a6eb06feb860 @p 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8/0x20 795s git-debrebase = Packaging {"Tree" => "55acecd5e355512d4905bedf0f53a6eb06feb860","Hdr" => "tree 55acecd5e355512d4905bedf0f53a6eb06feb860\nparent 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000006 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","CommitId" => "883a23a0f780f81e548aa5a710758628d9635e4c","Parents" => [{"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 795s git-debrebase get_differs 723bf8d3d175bfc9797521c3fa5d144421659ec9 270decbd8d0524e44c0e8a7e159283a5e00a92d3 = 0x4 795s git-debrebase classify 746c74f56cca2e6f50c892fb87a9ec15ecf2bde8 $t=270decbd8d0524e44c0e8a7e159283a5e00a92d3 @p 723bf8d3d175bfc9797521c3fa5d144421659ec9/0x4 795s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Differs" => 4}],"CommitId" => "746c74f56cca2e6f50c892fb87a9ec15ecf2bde8","Tree" => "270decbd8d0524e44c0e8a7e159283a5e00a92d3","Hdr" => "tree 270decbd8d0524e44c0e8a7e159283a5e00a92d3\nparent 723bf8d3d175bfc9797521c3fa5d144421659ec9\nauthor dgit test git user 1530000004 +0100\ncommitter dgit test git user 1530000004 +0100\n","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n"} 795s git-debrebase get_differs 088ca2748c333245f8f3dc6482c25427680a4f37 d8756ce5963485dffef0f9a43abc1ec0129d6c1e = 0x22 795s git-debrebase classify 723bf8d3d175bfc9797521c3fa5d144421659ec9 $t=d8756ce5963485dffef0f9a43abc1ec0129d6c1e @p 088ca2748c333245f8f3dc6482c25427680a4f37/0x22 795s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n","Hdr" => "tree d8756ce5963485dffef0f9a43abc1ec0129d6c1e\nparent 088ca2748c333245f8f3dc6482c25427680a4f37\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d8756ce5963485dffef0f9a43abc1ec0129d6c1e","CommitId" => "723bf8d3d175bfc9797521c3fa5d144421659ec9","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37"}],"Type" => "Mixed"} 795s git-debrebase get_differs 5a670186618804169c6ac55f3c296ebd370af060 a448632c39f18e3867a3c19a5cf796f2c50ae2f6 = 0x2 795s git-debrebase classify 088ca2748c333245f8f3dc6482c25427680a4f37 $t=a448632c39f18e3867a3c19a5cf796f2c50ae2f6 @p 5a670186618804169c6ac55f3c296ebd370af060/0x2 795s git-debrebase = Upstream {"Hdr" => "tree a448632c39f18e3867a3c19a5cf796f2c50ae2f6\nparent 5a670186618804169c6ac55f3c296ebd370af060\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "a448632c39f18e3867a3c19a5cf796f2c50ae2f6","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream","Parents" => [{"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Ix" => 0,"Differs" => 2}],"CommitId" => "088ca2748c333245f8f3dc6482c25427680a4f37"} 795s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f = 0x20 795s git-debrebase classify 5a670186618804169c6ac55f3c296ebd370af060 $t=7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 795s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0}],"CommitId" => "5a670186618804169c6ac55f3c296ebd370af060","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f","Hdr" => "tree 7c7a178ca883ab3d7840e9dce996fb6ad8e3e61f\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 795s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 795s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 795s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 795s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 795s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 795s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n"} 795s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 795s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 795s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Ix" => 0}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Type" => "Changelog"} 795s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 795s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 795s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 795s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},{"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Ix" => 1}],"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n"} 795s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 795s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 795s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 795s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 795s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 795s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 795s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 795s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 795s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 795s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 795s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 795s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 795s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 795s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 795s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 795s ' 795s + local ocid otype oinfo 795s + read ocid otype oinfo 795s + case "$otype" in 795s ++ printf %s 'dab3cc0fcfead932f6714305cfb670067c157804 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9' 795s ++ wc -w 795s + local cnparents=2 795s + test 2 = 2 795s ++ for f in $parents 795s ++ echo dab3cc0fcfead932f6714305cfb670067c157804 795s ++ for f in $parents 795s ++ wc -w 795s ++ echo 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=2 795s + test 2 = 2 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== dab3cc0fcfead932f6714305cfb670067c157804 Upstream ===== 795s + test dab3cc0fcfead932f6714305cfb670067c157804 = dab3cc0fcfead932f6714305cfb670067c157804 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P dab3cc0fcfead932f6714305cfb670067c157804 795s + local parents=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s + expect=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s + enparents=1 795s + : Upstream/SAME 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream ===== 795s + test 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 = 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 795s + local parents=3025551c1e030f25c60bdabaab789745e585f391 795s + expect=3025551c1e030f25c60bdabaab789745e585f391 795s + enparents=1 795s + : Upstream/SAME 3025551c1e030f25c60bdabaab789745e585f391 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s 3025551c1e030f25c60bdabaab789745e585f391 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 3025551c1e030f25c60bdabaab789745e585f391 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 3025551c1e030f25c60bdabaab789745e585f391 Upstream ===== 795s + test 3025551c1e030f25c60bdabaab789745e585f391 = 3025551c1e030f25c60bdabaab789745e585f391 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 3025551c1e030f25c60bdabaab789745e585f391 795s + local parents=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s + expect=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s + enparents=1 795s + : Upstream/SAME cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream ===== 795s + test cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 = cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 795s + local parents=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s + expect=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s + enparents=1 795s + : Upstream/SAME 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream ===== 795s + test 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 = 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 795s + local parents=b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s + expect=b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s + enparents=1 795s + : Upstream/SAME b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream ===== 795s + test b0291461cc529ff9fa4060b3e41ebff6cb563c49 = b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P b0291461cc529ff9fa4060b3e41ebff6cb563c49 795s + local parents=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s + expect=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s + enparents=1 795s + : Upstream/SAME 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream ===== 795s + test 64efa6cded3fc4da385f8ed4bd8c72164c1c914d = 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s + local cetype=Upstream 795s + '[' xUpstream = xUpstream ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 795s + local parents=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s + expect=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s + enparents=1 795s + : Upstream/SAME 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s ++ printf %s 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Packaging ===== 795s + test 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s + local cetype=Upstream 795s + '[' xPackaging = xUpstream ']' 795s ++ git log -n1 --pretty=format:%P 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 795s + local parents=420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s + expect=420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s + enparents=1 795s + : Packaging/Upstream 420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + '[' x '!=' x ']' 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :. ':!debian' 795s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :debian/patches 795s + etypes=Packaging 795s ++ printf %s 420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Packaging ===== 795s + test 420fa3b34303353709bcfbcf88ccc4e272f5ee48 = 420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s + local cetype=Packaging 795s + '[' xPackaging = xPackaging ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 420fa3b34303353709bcfbcf88ccc4e272f5ee48 795s + local parents=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s + expect=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s + enparents=1 795s + : Packaging/SAME 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :. ':!debian' 795s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :debian/patches 795s + etypes=Packaging 795s ++ printf %s 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Packaging ===== 795s + test 4926fc77fd0b974ce5a2892ad46669ed4ec14edb = 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s + local cetype=Packaging 795s + '[' xPackaging = xPackaging ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 795s + local parents=6184b930def645d1f8da8cb6a91475445cbb817d 795s + expect=6184b930def645d1f8da8cb6a91475445cbb817d 795s + enparents=1 795s + : Packaging/SAME 6184b930def645d1f8da8cb6a91475445cbb817d 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :. ':!debian' 795s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :debian/patches 795s + etypes=Packaging 795s ++ printf %s 6184b930def645d1f8da8cb6a91475445cbb817d 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 6184b930def645d1f8da8cb6a91475445cbb817d 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 6184b930def645d1f8da8cb6a91475445cbb817d Packaging ===== 795s + test 6184b930def645d1f8da8cb6a91475445cbb817d = 6184b930def645d1f8da8cb6a91475445cbb817d 795s + local cetype=Packaging 795s + '[' xPackaging = xPackaging ']' 795s + cetype=SAME 795s ++ git log -n1 --pretty=format:%P 6184b930def645d1f8da8cb6a91475445cbb817d 795s + local parents=6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s + expect=6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s + enparents=1 795s + : Packaging/SAME 6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :. ':!debian' 795s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :debian/patches 795s + etypes=Packaging 795s ++ printf %s 6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Changelog ===== 795s + test 6b98ac2fc854dc69f9cabc904a8e43328f649f41 = 6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s + local cetype=Packaging 795s + '[' xChangelog = xPackaging ']' 795s ++ git log -n1 --pretty=format:%P 6b98ac2fc854dc69f9cabc904a8e43328f649f41 795s + local parents=bef5ccd302033398655e3e4e8896fba41691d0b2 795s + expect=bef5ccd302033398655e3e4e8896fba41691d0b2 795s + enparents=1 795s + : Changelog/Packaging bef5ccd302033398655e3e4e8896fba41691d0b2 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet bef5ccd302033398655e3e4e8896fba41691d0b2..6b98ac2fc854dc69f9cabc904a8e43328f649f41 -- :. ':!debian/changelog' 795s + etypes=Packaging 795s ++ printf %s bef5ccd302033398655e3e4e8896fba41691d0b2 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo bef5ccd302033398655e3e4e8896fba41691d0b2 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== bef5ccd302033398655e3e4e8896fba41691d0b2 Changelog ===== 795s + test bef5ccd302033398655e3e4e8896fba41691d0b2 = bef5ccd302033398655e3e4e8896fba41691d0b2 795s + local cetype=Packaging 795s + '[' xChangelog = xPackaging ']' 795s ++ git log -n1 --pretty=format:%P bef5ccd302033398655e3e4e8896fba41691d0b2 795s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s + enparents=1 795s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..bef5ccd302033398655e3e4e8896fba41691d0b2 -- :. ':!debian/changelog' 795s + etypes=Packaging 795s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s ++ wc -w 795s + local cnparents=1 795s + test 1 = 1 795s ++ for f in $parents 795s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s ++ wc -w 795s ++ t-sort -u 795s ++ LC_COLLATE=C 795s ++ sort -u 795s + local cndparents=1 795s + test 1 = 1 795s + case "$parents" in 795s + case "$ctype" in 795s + read cid ctype info 795s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 795s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s + local cetype=Packaging 795s + '[' xAnchor = xPackaging ']' 795s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 795s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 795s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 795s + enparents=1 795s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 795s + case "$ctype/$cetype" in 795s + case "$ctype/$etypes" in 795s + case "$cetype" in 795s + case "$ctype" in 795s + break 795s + git checkout -b stitched-mixed master 795s Switched to a new branch 'stitched-mixed' 795s + mix-it 795s + t-git-next-date 795s + GIT_COMMITTER_DATE='1530000009 +0100' 795s + GIT_AUTHOR_DATE='1530000009 +0100' 795s ++ git symbolic-ref HEAD 795s + local m=refs/heads/stitched-mixed 795s + t-some-changes 'subcommands refs/heads/stitched-mixed 1' 795s + local 'token=subcommands refs/heads/stitched-mixed 1' 795s + local which=dum 795s + local fsuffix= 795s + t-git-next-date 795s + GIT_COMMITTER_DATE='1530000010 +0100' 795s + GIT_AUTHOR_DATE='1530000010 +0100' 795s + case "$which" in 795s + echo '// debian subcommands refs/heads/stitched-mixed 1' 795s + git add debian/zorkmid 795s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)' 795s [stitched-mixed 772b2a1] DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1) 795s 1 file changed, 1 insertion(+) 795s create mode 100644 debian/zorkmid 795s + case "$which" in 795s + echo '// upstream subcommands refs/heads/stitched-mixed 1' 795s + git add src.c 795s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)' 795s [stitched-mixed c848bc7] UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1) 795s 1 file changed, 1 insertion(+) 795s + case "$which" in 795s + for f in debian/zorkmid$fsuffix src$fsuffix.c 795s + echo '// both! subcommands refs/heads/stitched-mixed 1' 795s + git add debian/zorkmid 795s + for f in debian/zorkmid$fsuffix src$fsuffix.c 795s + echo '// both! subcommands refs/heads/stitched-mixed 1' 795s + git add src.c 795s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-mixed 1)' 795s [stitched-mixed 0a3febb] MIXED add both() (subcommands refs/heads/stitched-mixed 1) 795s 2 files changed, 2 insertions(+) 795s + t-git-next-date 795s + GIT_COMMITTER_DATE='1530000011 +0100' 795s + GIT_AUTHOR_DATE='1530000011 +0100' 795s + t-dgit --git-debrebase=true -wgf quilt-fixup 795s + local dgit=dgit 795s + pwd 795s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 795s + : ' 795s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 795s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 795s | git rev-parse --show-toplevel 795s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 795s | git config -z --get-regexp --local '.*' 795s | git config -z --get-regexp --local '.*' 795s | git config -z --get-regexp --global '.*' 795s | git config -z --get-regexp --system '.*' 795s format 3.0 (quilt), quilt mode linear 795s Format `3.0 (quilt)', need to check/update patch stack 795s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 795s => `' 795s + git diff --quiet HEAD 795s + git clean -xdff 795s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 795s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 795s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 795s | git rev-parse 'HEAD~0' 795s => `0a3febb41892833b131ed8ca6958d68efc7f925f' 795s | git symbolic-ref -q HEAD 795s => `refs/heads/stitched-mixed' 795s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 795s CD work 795s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 795s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 795s examining quilt state (multiple patches, linear mode) 795s branch_is_gdr 0a3febb41892833b131ed8ca6958d68efc7f925f... 795s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 795s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 795s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 795s | git rev-parse 'HEAD~0' 795s => `0a3febb41892833b131ed8ca6958d68efc7f925f' 795s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 795s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 795s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 795s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 795s CD fake 795s | find -name .git -prune -print0 795s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 795s + git checkout -f 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian 795s + git add -Af . 795s | git write-tree 795s => `950c91fd34627527a1a98b70074264de9d8186a0' 795s fake orig tree object 950c91fd34627527a1a98b70074264de9d8186a0 795s CD .. 795s + git reset -q --hard 0a3febb41892833b131ed8ca6958d68efc7f925f 795s CD ../fake 795s + git add -Af . 795s | git write-tree 795s => `8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4' 795s fake o+d/p tree object 950c91fd34627527a1a98b70074264de9d8186a0 795s CD ../work 795s | git ls-tree --name-only -z 0a3febb41892833b131ed8ca6958d68efc7f925f 795s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 795s | git diff-tree -z --no-renames -r 950c91fd34627527a1a98b70074264de9d8186a0 0a3febb41892833b131ed8ca6958d68efc7f925f 795s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc c10cee24b21f67e1424f5c557b26d5b56aa28ac0 M\x00src.c\x00' 795s quiltify_trees_differ 950c91fd34627527a1a98b70074264de9d8186a0 0a3febb41892833b131ed8ca6958d68efc7f925f => 1 795s | git diff-tree -z --no-renames --name-only -r 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 795s => `src.c\x00' 795s quiltify_trees_differ 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 795s | git diff-tree -z --no-renames --name-only -r 950c91fd34627527a1a98b70074264de9d8186a0 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 795s => `lib.c\x00new-upstream-file\x00src.c\x00' 795s quiltify_trees_differ 950c91fd34627527a1a98b70074264de9d8186a0 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 795s differences @dl ## ## ## == == ==. 795s dgit: base trees orig=950c91fd34627527a1a9 o+d/p=8177bf2df97565c3d3ff 795s dgit: quilt differences: src: ## orig ## gitignores: == orig == 795s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 795s starting quiltify (multiple patches, linear mode) 795s | git ls-tree --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/rules debian/control 795s => `debian/control'... 795s quiltify investigate 0a3febb41892833b131ed8ca6958d68efc7f925f 795s | git diff-tree -z --no-renames --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 795s => `src.c\x00' 795s quiltify_trees_differ 0a3febb41892833b131ed8ca6958d68efc7f925f 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 795s | git ls-tree --name-only 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/rules debian/control 795s => `debian/control'... 795s | git cat-file commit 0a3febb41892833b131ed8ca6958d68efc7f925f 795s => `tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691'... 795s | git diff-tree -z --no-renames --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f 795s => `debian\x00src.c\x00' 795s quiltify_trees_differ c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f => 1 795s considering C=0a3febb41892833b131ed8ca6958d68efc7f925f P=c848bc784454d4635b6a71ea59b65b373615e8e4 795s | git diff-tree -r --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 0a3febb41892833b131ed8ca6958d68efc7f925f -- debian/patches .pc debian/source/format 795s => `' 795s search queue P=c848bc784454d4635b6a71ea59b65b373615e8e4 NT 795s quiltify investigate c848bc784454d4635b6a71ea59b65b373615e8e4 795s | git diff-tree -z --no-renames --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 795s => `debian\x00src.c\x00' 795s quiltify_trees_differ c848bc784454d4635b6a71ea59b65b373615e8e4 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 1 795s | git ls-tree --name-only c848bc784454d4635b6a71ea59b65b373615e8e4 -- debian/rules debian/control 795s => `debian/control'... 795s | git cat-file commit c848bc784454d4635b6a71ea59b65b373615e8e4 795s => `tree af40286d15dcd54aed3b8586be973b89dfad2ee8'... 795s | git diff-tree -z --no-renames --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 795s => `src.c\x00' 795s quiltify_trees_differ 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 => 1 795s considering C=c848bc784454d4635b6a71ea59b65b373615e8e4 P=772b2a1d3dacffb5498a61b7c9518d57d439e1ca 795s | git diff-tree -r --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca c848bc784454d4635b6a71ea59b65b373615e8e4 -- debian/patches .pc debian/source/format 795s => `' 795s search queue P=772b2a1d3dacffb5498a61b7c9518d57d439e1ca NT 795s quiltify investigate 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 795s | git diff-tree -z --no-renames --name-only 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 795s => `debian\x00' 795s quiltify_trees_differ 772b2a1d3dacffb5498a61b7c9518d57d439e1ca 8177bf2df97565c3d3ffb5b810f70e5bcfe7ebe4 => 0 795s search finished hooray! 795s quiltify linearisation planning successful, executing... 795s quiltify traverse 772b2a1d3dacffb5498a61b7c9518d57d439e1ca..c848bc784454d4635b6a71ea59b65b373615e8e4 795s | git cat-file commit c848bc784454d4635b6a71ea59b65b373615e8e4 795s => `tree af40286d15dcd54aed3b8586be973b89dfad2ee8'... 795s | git log -n1 '--pretty=format:%aD' c848bc784454d4635b6a71ea59b65b373615e8e4 795s => `Tue, 26 Jun 2018 09:00:10 +0100' 795s + git checkout -q c848bc784454d4635b6a71ea59b65b373615e8e4 795s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 795s | realpath -- /usr/bin/dgit 795s => `/usr/bin/dgit' 795s | realpath -- .git/dgit/quilt-description.tmp 795s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 795s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 796s dpkg-source: info: using patch list from debian/patches/series 796s dpkg-source: info: local changes detected, the modified files are: 796s work/src.c 796s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 796s + git checkout -q c848bc784454d4635b6a71ea59b65b373615e8e4 debian/changelog 796s quiltify traverse c848bc784454d4635b6a71ea59b65b373615e8e4..0a3febb41892833b131ed8ca6958d68efc7f925f 796s | git cat-file commit 0a3febb41892833b131ed8ca6958d68efc7f925f 796s => `tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691'... 796s | git log -n1 '--pretty=format:%aD' 0a3febb41892833b131ed8ca6958d68efc7f925f 796s => `Tue, 26 Jun 2018 09:00:10 +0100' 796s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f 796s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 796s | realpath -- /usr/bin/dgit 796s => `/usr/bin/dgit' 796s | realpath -- .git/dgit/quilt-description.tmp 796s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 796s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsstit.patch 796s dpkg-source: info: using patch list from debian/patches/series 796s dpkg-source: info: local changes detected, the modified files are: 796s work/src.c 796s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 796s + git checkout -q 0a3febb41892833b131ed8ca6958d68efc7f925f debian/changelog 796s + git checkout -q master 796s | git status --ignored --porcelain 796s => ` M debian/patches/series'... 796s + git add -f debian/patches 796s Commit Debian 3.0 (quilt) metadata 796s 796s [dgit (9.15) quilt-fixup] 796s 796s + git commit -m 'Commit Debian 3.0 (quilt) metadata 796s 796s [dgit (9.15) quilt-fixup] 796s ' 796s [master a5e2aaa] Commit Debian 3.0 (quilt) metadata 796s 3 files changed, 29 insertions(+) 796s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsstit.patch 796s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 796s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 796s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 796s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 796s ' 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000012 +0100' 796s + GIT_AUTHOR_DATE='1530000012 +0100' 796s + t-some-changes 'subcommands refs/heads/stitched-mixed 2' 796s + local 'token=subcommands refs/heads/stitched-mixed 2' 796s + local which=dum 796s + local fsuffix= 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000013 +0100' 796s + GIT_AUTHOR_DATE='1530000013 +0100' 796s + case "$which" in 796s + echo '// debian subcommands refs/heads/stitched-mixed 2' 796s + git add debian/zorkmid 796s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)' 796s [stitched-mixed 8240b51] DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2) 796s 1 file changed, 1 insertion(+) 796s + case "$which" in 796s + echo '// upstream subcommands refs/heads/stitched-mixed 2' 796s + git add src.c 796s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)' 796s [stitched-mixed 7091ade] UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2) 796s 1 file changed, 1 insertion(+) 796s + case "$which" in 796s + for f in debian/zorkmid$fsuffix src$fsuffix.c 796s + echo '// both! subcommands refs/heads/stitched-mixed 2' 796s + git add debian/zorkmid 796s + for f in debian/zorkmid$fsuffix src$fsuffix.c 796s + echo '// both! subcommands refs/heads/stitched-mixed 2' 796s + git add src.c 796s + git commit -m 'MIXED add both() (subcommands refs/heads/stitched-mixed 2)' 796s [stitched-mixed 5e0bf3c] MIXED add both() (subcommands refs/heads/stitched-mixed 2) 796s 2 files changed, 2 insertions(+) 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000014 +0100' 796s + GIT_AUTHOR_DATE='1530000014 +0100' 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000015 +0100' 796s + GIT_AUTHOR_DATE='1530000015 +0100' 796s + git checkout -b unstitched-laundered master 796s Switched to a new branch 'unstitched-laundered' 796s + mix-it 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000016 +0100' 796s + GIT_AUTHOR_DATE='1530000016 +0100' 796s ++ git symbolic-ref HEAD 796s + local m=refs/heads/unstitched-laundered 796s + t-some-changes 'subcommands refs/heads/unstitched-laundered 1' 796s + local 'token=subcommands refs/heads/unstitched-laundered 1' 796s + local which=dum 796s + local fsuffix= 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000017 +0100' 796s + GIT_AUTHOR_DATE='1530000017 +0100' 796s + case "$which" in 796s + echo '// debian subcommands refs/heads/unstitched-laundered 1' 796s + git add debian/zorkmid 796s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)' 796s [unstitched-laundered d21d62b] DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1) 796s 1 file changed, 1 insertion(+) 796s create mode 100644 debian/zorkmid 796s + case "$which" in 796s + echo '// upstream subcommands refs/heads/unstitched-laundered 1' 796s + git add src.c 796s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)' 796s [unstitched-laundered 6e9f712] UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 796s 1 file changed, 1 insertion(+) 796s + case "$which" in 796s + for f in debian/zorkmid$fsuffix src$fsuffix.c 796s + echo '// both! subcommands refs/heads/unstitched-laundered 1' 796s + git add debian/zorkmid 796s + for f in debian/zorkmid$fsuffix src$fsuffix.c 796s + echo '// both! subcommands refs/heads/unstitched-laundered 1' 796s + git add src.c 796s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-laundered 1)' 796s [unstitched-laundered 85e8a38] MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 796s 2 files changed, 2 insertions(+) 796s + t-git-next-date 796s + GIT_COMMITTER_DATE='1530000018 +0100' 796s + GIT_AUTHOR_DATE='1530000018 +0100' 796s + t-dgit --git-debrebase=true -wgf quilt-fixup 796s + local dgit=dgit 796s + pwd 796s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 796s + : ' 796s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 796s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 796s | git rev-parse --show-toplevel 796s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 796s | git config -z --get-regexp --local '.*' 796s | git config -z --get-regexp --local '.*' 796s | git config -z --get-regexp --global '.*' 796s | git config -z --get-regexp --system '.*' 796s format 3.0 (quilt), quilt mode linear 796s Format `3.0 (quilt)', need to check/update patch stack 796s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 796s => `' 796s + git diff --quiet HEAD 796s + git clean -xdff 796s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 796s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 796s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 796s | git rev-parse 'HEAD~0' 796s => `85e8a3829c886a9d45de8e3ffb9a234849b63e04' 796s | git symbolic-ref -q HEAD 796s => `refs/heads/unstitched-laundered' 796s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 796s CD work 796s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 796s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 796s examining quilt state (multiple patches, linear mode) 796s branch_is_gdr 85e8a3829c886a9d45de8e3ffb9a234849b63e04... 796s branch_is_gdr 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf gdr make-patches YES 796s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 796s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 796s | git rev-parse 'HEAD~0' 796s => `85e8a3829c886a9d45de8e3ffb9a234849b63e04' 796s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 796s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 796s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 796s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 796s CD fake 796s | find -name .git -prune -print0 796s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 796s + git checkout -f 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian 796s + git add -Af . 796s | git write-tree 796s => `49edf6484b13cb12c56a1dd6bf7fdee14eef8a10' 796s fake orig tree object 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 797s CD .. 797s + git reset -q --hard 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s CD ../fake 797s + git add -Af . 797s | git write-tree 797s => `ce93180215d1bdeb6ffe0e3ea156cbec27668884' 797s fake o+d/p tree object 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 797s CD ../work 797s | git ls-tree --name-only -z 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 797s | git diff-tree -z --no-renames -r 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 501347a1b4eef3bf8d1311744c3c1de4dc1e7b6c M\x00src.c\x00' 797s quiltify_trees_differ 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 85e8a3829c886a9d45de8e3ffb9a234849b63e04 => 1 797s | git diff-tree -z --no-renames --name-only -r 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 797s => `src.c\x00' 797s quiltify_trees_differ 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 797s | git diff-tree -z --no-renames --name-only -r 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 ce93180215d1bdeb6ffe0e3ea156cbec27668884 797s => `lib.c\x00new-upstream-file\x00src.c\x00' 797s quiltify_trees_differ 49edf6484b13cb12c56a1dd6bf7fdee14eef8a10 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 797s differences @dl ## ## ## == == ==. 797s dgit: base trees orig=49edf6484b13cb12c56a o+d/p=ce93180215d1bdeb6ffe 797s dgit: quilt differences: src: ## orig ## gitignores: == orig == 797s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 797s starting quiltify (multiple patches, linear mode) 797s | git ls-tree --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/rules debian/control 797s => `debian/control'... 797s quiltify investigate 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s | git diff-tree -z --no-renames --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 797s => `src.c\x00' 797s quiltify_trees_differ 85e8a3829c886a9d45de8e3ffb9a234849b63e04 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 797s | git ls-tree --name-only 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/rules debian/control 797s => `debian/control'... 797s | git cat-file commit 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `tree e52bfe26cab82358d9166d4626737511a9ad43e0'... 797s | git diff-tree -z --no-renames --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `debian\x00src.c\x00' 797s quiltify_trees_differ 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 => 1 797s considering C=85e8a3829c886a9d45de8e3ffb9a234849b63e04 P=6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s | git diff-tree -r --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 85e8a3829c886a9d45de8e3ffb9a234849b63e04 -- debian/patches .pc debian/source/format 797s => `' 797s search queue P=6e9f7126541b0e82b28210a152f4f3ef82c8b51c NT 797s quiltify investigate 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s | git diff-tree -z --no-renames --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c ce93180215d1bdeb6ffe0e3ea156cbec27668884 797s => `debian\x00src.c\x00' 797s quiltify_trees_differ 6e9f7126541b0e82b28210a152f4f3ef82c8b51c ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 1 797s | git ls-tree --name-only 6e9f7126541b0e82b28210a152f4f3ef82c8b51c -- debian/rules debian/control 797s => `debian/control'... 797s | git cat-file commit 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s => `tree 531dd9092765b0ad96064ac44739912e46bdaa5a'... 797s | git diff-tree -z --no-renames --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s => `src.c\x00' 797s quiltify_trees_differ d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c => 1 797s considering C=6e9f7126541b0e82b28210a152f4f3ef82c8b51c P=d21d62b6ddb3e581d7b5b2079aed326347f2d928 797s | git diff-tree -r --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 6e9f7126541b0e82b28210a152f4f3ef82c8b51c -- debian/patches .pc debian/source/format 797s => `' 797s search queue P=d21d62b6ddb3e581d7b5b2079aed326347f2d928 NT 797s quiltify investigate d21d62b6ddb3e581d7b5b2079aed326347f2d928 797s | git diff-tree -z --no-renames --name-only d21d62b6ddb3e581d7b5b2079aed326347f2d928 ce93180215d1bdeb6ffe0e3ea156cbec27668884 797s => `debian\x00' 797s quiltify_trees_differ d21d62b6ddb3e581d7b5b2079aed326347f2d928 ce93180215d1bdeb6ffe0e3ea156cbec27668884 => 0 797s search finished hooray! 797s quiltify linearisation planning successful, executing... 797s quiltify traverse d21d62b6ddb3e581d7b5b2079aed326347f2d928..6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s | git cat-file commit 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s => `tree 531dd9092765b0ad96064ac44739912e46bdaa5a'... 797s | git log -n1 '--pretty=format:%aD' 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s => `Tue, 26 Jun 2018 09:00:17 +0100' 797s + git checkout -q 6e9f7126541b0e82b28210a152f4f3ef82c8b51c 797s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 797s | realpath -- /usr/bin/dgit 797s => `/usr/bin/dgit' 797s | realpath -- .git/dgit/quilt-description.tmp 797s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 797s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 797s dpkg-source: info: using patch list from debian/patches/series 797s dpkg-source: info: local changes detected, the modified files are: 797s work/src.c 797s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 797s + git checkout -q 6e9f7126541b0e82b28210a152f4f3ef82c8b51c debian/changelog 797s quiltify traverse 6e9f7126541b0e82b28210a152f4f3ef82c8b51c..85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s | git cat-file commit 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `tree e52bfe26cab82358d9166d4626737511a9ad43e0'... 797s | git log -n1 '--pretty=format:%aD' 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s => `Tue, 26 Jun 2018 09:00:17 +0100' 797s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 797s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 797s | realpath -- /usr/bin/dgit 797s => `/usr/bin/dgit' 797s | realpath -- .git/dgit/quilt-description.tmp 797s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 797s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsunst.patch 797s dpkg-source: info: using patch list from debian/patches/series 797s dpkg-source: info: local changes detected, the modified files are: 797s work/src.c 797s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 797s + git checkout -q 85e8a3829c886a9d45de8e3ffb9a234849b63e04 debian/changelog 797s + git checkout -q master 797s | git status --ignored --porcelain 797s => ` M debian/patches/series'... 797s + git add -f debian/patches 797s Commit Debian 3.0 (quilt) metadata 797s 797s [dgit (9.15) quilt-fixup] 797s 797s + git commit -m 'Commit Debian 3.0 (quilt) metadata 797s 797s [dgit (9.15) quilt-fixup] 797s ' 797s [master f210833] Commit Debian 3.0 (quilt) metadata 797s 3 files changed, 29 insertions(+) 797s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 797s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 797s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 797s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 797s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 797s ' 797s + t-git-next-date 797s + GIT_COMMITTER_DATE='1530000019 +0100' 797s + GIT_AUTHOR_DATE='1530000019 +0100' 797s + t-some-changes 'subcommands refs/heads/unstitched-laundered 2' 797s + local 'token=subcommands refs/heads/unstitched-laundered 2' 797s + local which=dum 797s + local fsuffix= 797s + t-git-next-date 797s + GIT_COMMITTER_DATE='1530000020 +0100' 797s + GIT_AUTHOR_DATE='1530000020 +0100' 797s + case "$which" in 797s + echo '// debian subcommands refs/heads/unstitched-laundered 2' 797s + git add debian/zorkmid 797s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)' 797s [unstitched-laundered 54e4f98] DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2) 797s 1 file changed, 1 insertion(+) 797s + case "$which" in 797s + echo '// upstream subcommands refs/heads/unstitched-laundered 2' 797s + git add src.c 797s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)' 797s [unstitched-laundered 15b5786] UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2) 797s 1 file changed, 1 insertion(+) 797s + case "$which" in 797s + for f in debian/zorkmid$fsuffix src$fsuffix.c 797s + echo '// both! subcommands refs/heads/unstitched-laundered 2' 797s + git add debian/zorkmid 797s + for f in debian/zorkmid$fsuffix src$fsuffix.c 797s + echo '// both! subcommands refs/heads/unstitched-laundered 2' 797s + git add src.c 797s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-laundered 2)' 797s [unstitched-laundered 5c6280b] MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 797s 2 files changed, 2 insertions(+) 797s + t-git-next-date 797s + GIT_COMMITTER_DATE='1530000021 +0100' 797s + GIT_AUTHOR_DATE='1530000021 +0100' 797s + t-git-next-date 797s + GIT_COMMITTER_DATE='1530000022 +0100' 797s + GIT_AUTHOR_DATE='1530000022 +0100' 797s + git branch before-unstitch/unstitched-laundered 797s + t-git-debrebase 797s + local gdr=git-debrebase 797s + : ' 797s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 797s + git-debrebase --dgit=dgit -D 797s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-laundered 797s git-debrebase ffq check_specs * 797s git-debrebase *** WALK 5c6280b3d52c002248dd7f608e1adb63f1295538 0 - 797s git-debrebase get_differs 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 adfbc3faf90eab62de4813f7716481d852717bf2 = 0x22 797s git-debrebase classify 5c6280b3d52c002248dd7f608e1adb63f1295538 $t=adfbc3faf90eab62de4813f7716481d852717bf2 @p 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4/0x22 797s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "adfbc3faf90eab62de4813f7716481d852717bf2","CommitId" => "5c6280b3d52c002248dd7f608e1adb63f1295538","Hdr" => "tree adfbc3faf90eab62de4813f7716481d852717bf2\nparent 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Type" => "Mixed","Parents" => [{"Differs" => 34,"CommitId" => "15b5786e8aa3b0253deec7a36f5926d7e5c2aab4","Ix" => 0}]} 797s git-debrebase get_differs 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 f2c3fb1bbf83b614cb648bf9ac9bedd675316021 = 0x2 797s git-debrebase classify 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 $t=f2c3fb1bbf83b614cb648bf9ac9bedd675316021 @p 54e4f9870a939a8eb9f5f0db7bec775d11bf4306/0x2 797s git-debrebase = Upstream {"Tree" => "f2c3fb1bbf83b614cb648bf9ac9bedd675316021","Hdr" => "tree f2c3fb1bbf83b614cb648bf9ac9bedd675316021\nparent 54e4f9870a939a8eb9f5f0db7bec775d11bf4306\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Type" => "Upstream","CommitId" => "15b5786e8aa3b0253deec7a36f5926d7e5c2aab4","Parents" => [{"CommitId" => "54e4f9870a939a8eb9f5f0db7bec775d11bf4306","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 797s git-debrebase get_differs f210833dc45e533c145be531241b38c24ea3dd34 70700ae84a26e2c017102a14db0dd8dba67bed70 = 0x20 797s git-debrebase classify 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 $t=70700ae84a26e2c017102a14db0dd8dba67bed70 @p f210833dc45e533c145be531241b38c24ea3dd34/0x20 797s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f210833dc45e533c145be531241b38c24ea3dd34"}],"Tree" => "70700ae84a26e2c017102a14db0dd8dba67bed70","Hdr" => "tree 70700ae84a26e2c017102a14db0dd8dba67bed70\nparent f210833dc45e533c145be531241b38c24ea3dd34\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000020 +0100\n","Type" => "Packaging","CommitId" => "54e4f9870a939a8eb9f5f0db7bec775d11bf4306","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 797s git-debrebase get_differs 85e8a3829c886a9d45de8e3ffb9a234849b63e04 360c14201905457ce0dfedc4f4ce34364ae63a68 = 0x4 797s git-debrebase classify f210833dc45e533c145be531241b38c24ea3dd34 $t=360c14201905457ce0dfedc4f4ce34364ae63a68 @p 85e8a3829c886a9d45de8e3ffb9a234849b63e04/0x4 797s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"Ix" => 0,"CommitId" => "85e8a3829c886a9d45de8e3ffb9a234849b63e04","Differs" => 4}],"Tree" => "360c14201905457ce0dfedc4f4ce34364ae63a68","CommitId" => "f210833dc45e533c145be531241b38c24ea3dd34","Type" => "AddPatches","Hdr" => "tree 360c14201905457ce0dfedc4f4ce34364ae63a68\nparent 85e8a3829c886a9d45de8e3ffb9a234849b63e04\nauthor dgit test git user 1530000018 +0100\ncommitter dgit test git user 1530000018 +0100\n"} 797s git-debrebase get_differs 6e9f7126541b0e82b28210a152f4f3ef82c8b51c e52bfe26cab82358d9166d4626737511a9ad43e0 = 0x22 797s git-debrebase classify 85e8a3829c886a9d45de8e3ffb9a234849b63e04 $t=e52bfe26cab82358d9166d4626737511a9ad43e0 @p 6e9f7126541b0e82b28210a152f4f3ef82c8b51c/0x22 797s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "6e9f7126541b0e82b28210a152f4f3ef82c8b51c"}],"Tree" => "e52bfe26cab82358d9166d4626737511a9ad43e0","CommitId" => "85e8a3829c886a9d45de8e3ffb9a234849b63e04","Type" => "Mixed","Hdr" => "tree e52bfe26cab82358d9166d4626737511a9ad43e0\nparent 6e9f7126541b0e82b28210a152f4f3ef82c8b51c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n"} 797s git-debrebase get_differs d21d62b6ddb3e581d7b5b2079aed326347f2d928 531dd9092765b0ad96064ac44739912e46bdaa5a = 0x2 797s git-debrebase classify 6e9f7126541b0e82b28210a152f4f3ef82c8b51c $t=531dd9092765b0ad96064ac44739912e46bdaa5a @p d21d62b6ddb3e581d7b5b2079aed326347f2d928/0x2 797s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "d21d62b6ddb3e581d7b5b2079aed326347f2d928","Differs" => 2}],"Tree" => "531dd9092765b0ad96064ac44739912e46bdaa5a","CommitId" => "6e9f7126541b0e82b28210a152f4f3ef82c8b51c","Hdr" => "tree 531dd9092765b0ad96064ac44739912e46bdaa5a\nparent d21d62b6ddb3e581d7b5b2079aed326347f2d928\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 797s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 2c5286e4af2cdee0857ef37f95d3f8193bd91e00 = 0x20 797s git-debrebase classify d21d62b6ddb3e581d7b5b2079aed326347f2d928 $t=2c5286e4af2cdee0857ef37f95d3f8193bd91e00 @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 797s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"Hdr" => "tree 2c5286e4af2cdee0857ef37f95d3f8193bd91e00\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000017 +0100\n","Type" => "Packaging","CommitId" => "d21d62b6ddb3e581d7b5b2079aed326347f2d928","Tree" => "2c5286e4af2cdee0857ef37f95d3f8193bd91e00"} 797s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 797s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 797s git-debrebase = AddPatches {"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "AddPatches","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Parents" => [{"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4}],"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 797s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 797s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 797s git-debrebase = Changelog {"Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Differs" => 16,"Ix" => 0}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n"} 797s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 797s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 797s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 797s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 797s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 797s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 797s git-debrebase = Pseudomerge {"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Contributor" => {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8,"Ix" => 1}],"Overwritten" => [$VAR1->{"Parents"}[1]]} 797s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 797s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 797s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 797s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 797s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 797s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 797s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 797s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 797s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 797s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 797s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 797s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 797s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 797s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 797s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 797s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 797s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 797s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 797s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 797s git-debrebase WALK REWRITING NOW cl=HASH(0x563cc39fe398) procd=HASH(0x563cc3a07688) 797s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 797s git-debrebase WALK BUILD d21d62b6ddb3e581d7b5b2079aed326347f2d928 Debian (rewriting=1) 797s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 797s git-debrebase WALK BUILD 85e8a3829c886a9d45de8e3ffb9a234849b63e04 Debian (rewriting=1) 797s git-debrebase WALK BUILD 54e4f9870a939a8eb9f5f0db7bec775d11bf4306 Debian (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase WALK BUILD 5c6280b3d52c002248dd7f608e1adb63f1295538 Debian (rewriting=1) 798s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 798s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 798s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 798s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase WALK BUILD 6e9f7126541b0e82b28210a152f4f3ef82c8b51c Upstream (rewriting=1) 798s git-debrebase WALK BUILD 85e8a3829c886a9d45de8e3ffb9a234849b63e04 Upstream (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase WALK BUILD 15b5786e8aa3b0253deec7a36f5926d7e5c2aab4 Upstream (rewriting=1) 798s git-debrebase WALK BUILD 5c6280b3d52c002248dd7f608e1adb63f1295538 Upstream (rewriting=1) 798s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 798s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5c6280b3d52c002248dd7f608e1adb63f1295538 = 0x4 798s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s git-debrebase: laundered (head was 5c6280b3d52c002248dd7f608e1adb63f1295538) 798s git-debrebase >= update refs/ffq-prev/heads/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 0000000000000000000000000000000000000000 798s git-debrebase >= delete refs/debrebase-last/heads/unstitched-laundered 798s git-debrebase >= update HEAD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5c6280b3d52c002248dd7f608e1adb63f1295538 798s git-debrebase >$ 798s Recorded previous head for preservation 798s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 798s ' 798s + t-gdr-good laundered 798s + local state=laundered 798s + local beforetag= 798s + case $state in 798s + git diff --quiet -- :. ':!debian/patches' 798s + LC_MESSAGES=C 798s + t-git-debrebase status 798s + local gdr=git-debrebase 798s + : ' 798s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 798s + git-debrebase --dgit=dgit -D status 798s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 798s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 798s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}]} 798s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 798s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 798s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 798s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 798s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 798s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 798s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}]} 798s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 798s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 798s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}],"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 798s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 798s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 798s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 798s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 798s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 798s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 798s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 798s git-debrebase = Packaging {"Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 798s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 798s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 798s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging"} 798s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 798s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 798s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 798s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 798s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 798s git-debrebase = Packaging {"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 798s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 798s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 798s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog"} 798s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 798s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 798s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 798s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 798s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 798s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 798s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-laundered 798s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 798s ' 798s + case $state in 798s + egrep '^ *branch is laundered' ../status.check 798s branch is laundered 798s + t-gdr-good-analyse HEAD laundered 798s + local head=HEAD 798s + local state=laundered 798s + local wsfx= 798s + local etypes bwtip 798s + case $state in 798s + etypes=Upstream 798s ++ t-git-debrebase breakwater 798s ++ local gdr=git-debrebase 798s ++ : ' 798s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 798s ++ git-debrebase --dgit=dgit -D breakwater 798s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 798s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 798s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 798s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 798s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 798s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 798s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 798s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 798s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 798s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 798s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 798s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 798s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 798s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 798s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 798s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 798s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 798s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 798s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 798s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 798s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 798s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 798s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 798s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging"} 798s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 798s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 798s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 798s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 798s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 798s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}]} 798s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 798s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 798s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 798s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 798s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 798s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 798s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 798s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 798s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 798s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 798s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 798s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor"} 798s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 798s ' 798s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 798s + anal=../anal 798s + t-git-debrebase analyse HEAD 798s + local gdr=git-debrebase 798s + : ' 798s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 798s + git-debrebase --dgit=dgit -D analyse HEAD 798s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 798s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 798s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 798s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 798s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 798s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 798s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"} 798s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 798s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 798s git-debrebase = Upstream {"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}]} 798s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 798s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 798s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d"} 798s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 798s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 798s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 798s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 798s git-debrebase = Upstream {"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Type" => "Upstream"} 798s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 798s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 798s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Type" => "Upstream"} 798s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 798s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 798s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}]} 798s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 798s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 798s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}]} 798s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 798s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 798s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 798s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 798s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 798s git-debrebase = Packaging {"Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 798s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 798s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 798s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 798s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 798s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 798s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 798s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 798s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 798s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 798s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 798s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 798s ' 798s ++ git rev-parse HEAD 798s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 798s + exec 798s + local cid ctype info nparents 798s + read cid ctype info 798s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 798s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 798s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s + enparents=1 798s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 798s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 798s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s + enparents=1 798s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 798s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 798s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 798s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 798s + enparents=1 798s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 798s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 798s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 798s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 798s + enparents=1 798s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 798s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 798s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s + enparents=1 798s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 798s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 798s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s + enparents=1 798s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 798s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s + local cetype=Upstream 798s + '[' xUpstream = xUpstream ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 798s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 798s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 798s + enparents=1 798s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 798s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 798s + local cetype=Upstream 798s + '[' xPackaging = xUpstream ']' 798s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 798s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s + enparents=1 798s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 798s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 798s + bwtip= 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 798s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 798s + etypes=Packaging 798s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 798s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s + local cetype=Packaging 798s + '[' xPackaging = xPackaging ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 798s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s + enparents=1 798s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 798s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 798s + etypes=Packaging 798s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 798s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s + local cetype=Packaging 798s + '[' xPackaging = xPackaging ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 798s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 798s + expect=515e62b8d591fcc68597383b955d898db71abc6c 798s + enparents=1 798s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 798s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 798s + etypes=Packaging 798s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 798s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 798s + local cetype=Packaging 798s + '[' xPackaging = xPackaging ']' 798s + cetype=SAME 798s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 798s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 798s + expect=809643e5389def220ea36d61f2d3dd504603e95a 798s + enparents=1 798s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 798s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 798s + etypes=Packaging 798s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 798s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 798s + local cetype=Packaging 798s + '[' xChangelog = xPackaging ']' 798s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 798s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 798s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 798s + enparents=1 798s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 798s + etypes=Packaging 798s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 798s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 798s + local cetype=Packaging 798s + '[' xChangelog = xPackaging ']' 798s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 798s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s + enparents=1 798s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 798s + etypes=Packaging 798s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s ++ wc -w 798s + local cnparents=1 798s + test 1 = 1 798s ++ for f in $parents 798s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s ++ wc -w 798s ++ t-sort -u 798s ++ LC_COLLATE=C 798s ++ sort -u 798s + local cndparents=1 798s + test 1 = 1 798s + case "$parents" in 798s + case "$ctype" in 798s + read cid ctype info 798s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 798s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s + local cetype=Packaging 798s + '[' xAnchor = xPackaging ']' 798s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 798s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 798s + enparents=1 798s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 798s + case "$ctype/$cetype" in 798s + case "$ctype/$etypes" in 798s + case "$cetype" in 798s + case "$ctype" in 798s + break 798s + git checkout -b unstitched-mixed master 798s Switched to a new branch 'unstitched-mixed' 798s + git branch before-unstitch/unstitched-mixed 798s + t-git-debrebase 798s + local gdr=git-debrebase 798s + : ' 798s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 798s + git-debrebase --dgit=dgit -D 798s git-debrebase ffq_prev_branchinfo branch current refs/heads/unstitched-mixed 798s git-debrebase ffq check_specs * 798s git-debrebase *** WALK 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0 - 798s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 798s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 798s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n"} 798s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 798s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 798s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}]} 798s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 798s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 798s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"} 798s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 798s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 798s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 798s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Overwritten" => [{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n"} 798s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 798s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 798s git-debrebase = Upstream {"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0,"Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 798s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 798s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 798s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 798s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 798s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 798s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2,"Ix" => 0}]} 798s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 798s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 798s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 798s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 798s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 1 upp 4 proc 9 pm 0 798s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 798s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 798s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 10 798s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 798s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 798s git-debrebase WALK REWRITING NOW cl=HASH(0x56528d0c2340) procd=HASH(0x56528d144e18) 798s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 798s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 798s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 798s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 798s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 798s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 798s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf = 0x4 798s git-debrebase *** WALK RETURN 9f40936eece8f6452df026cc64200db82005a166 809643e5389def220ea36d61f2d3dd504603e95a 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 798s git-debrebase: laundered (head was 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf) 798s git-debrebase >= update refs/ffq-prev/heads/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 798s git-debrebase >= delete refs/debrebase-last/heads/unstitched-mixed 798s git-debrebase >= update HEAD 9f40936eece8f6452df026cc64200db82005a166 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 798s git-debrebase >$ 798s Recorded previous head for preservation 798s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 798s ' 798s + mix-it 798s + t-git-next-date 798s + GIT_COMMITTER_DATE='1530000023 +0100' 798s + GIT_AUTHOR_DATE='1530000023 +0100' 798s ++ git symbolic-ref HEAD 798s + local m=refs/heads/unstitched-mixed 798s + t-some-changes 'subcommands refs/heads/unstitched-mixed 1' 798s + local 'token=subcommands refs/heads/unstitched-mixed 1' 798s + local which=dum 798s + local fsuffix= 798s + t-git-next-date 798s + GIT_COMMITTER_DATE='1530000024 +0100' 798s + GIT_AUTHOR_DATE='1530000024 +0100' 798s + case "$which" in 798s + echo '// debian subcommands refs/heads/unstitched-mixed 1' 798s + git add debian/zorkmid 798s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)' 798s [unstitched-mixed a4efcc9] DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1) 798s 1 file changed, 1 insertion(+) 798s create mode 100644 debian/zorkmid 798s + case "$which" in 798s + echo '// upstream subcommands refs/heads/unstitched-mixed 1' 798s + git add src.c 798s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)' 798s [unstitched-mixed 5138bd8] UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 798s 1 file changed, 1 insertion(+) 798s + case "$which" in 798s + for f in debian/zorkmid$fsuffix src$fsuffix.c 798s + echo '// both! subcommands refs/heads/unstitched-mixed 1' 798s + git add debian/zorkmid 798s + for f in debian/zorkmid$fsuffix src$fsuffix.c 798s + echo '// both! subcommands refs/heads/unstitched-mixed 1' 798s + git add src.c 798s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-mixed 1)' 798s [unstitched-mixed 6e00b9c] MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 798s 2 files changed, 2 insertions(+) 798s + t-git-next-date 798s + GIT_COMMITTER_DATE='1530000025 +0100' 798s + GIT_AUTHOR_DATE='1530000025 +0100' 798s + t-dgit --git-debrebase=true -wgf quilt-fixup 798s + local dgit=dgit 798s + pwd 798s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 798s + : ' 798s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 798s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --git-debrebase=true -wgf quilt-fixup 798s | git rev-parse --show-toplevel 798s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 798s | git config -z --get-regexp --local '.*' 798s | git config -z --get-regexp --local '.*' 798s | git config -z --get-regexp --global '.*' 798s | git config -z --get-regexp --system '.*' 799s format 3.0 (quilt), quilt mode linear 799s Format `3.0 (quilt)', need to check/update patch stack 799s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 799s => `' 799s + git diff --quiet HEAD 799s + git clean -xdff 799s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 799s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 799s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 799s | git rev-parse 'HEAD~0' 799s => `6e00b9cbfb2ac78131496aadb210310e5b4b6a84' 799s | git symbolic-ref -q HEAD 799s => `refs/heads/unstitched-mixed' 799s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 799s CD work 799s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 799s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s examining quilt state (multiple patches, linear mode) 799s branch_is_gdr 6e00b9cbfb2ac78131496aadb210310e5b4b6a84... 799s branch_is_gdr 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 gdr anchor YES 799s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s + true --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 799s | git rev-parse 'HEAD~0' 799s => `6e00b9cbfb2ac78131496aadb210310e5b4b6a84' 799s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 799s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 799s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 799s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 799s CD fake 799s | find -name .git -prune -print0 799s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 799s + git checkout -f 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian 799s + git add -Af . 799s | git write-tree 799s => `17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71' 799s fake orig tree object 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s CD .. 799s + git reset -q --hard 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s CD ../fake 799s + git add -Af . 799s | git write-tree 799s => `17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71' 799s fake o+d/p tree object 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s CD ../work 799s | git ls-tree --name-only -z 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 799s | git diff-tree -z --no-renames -r 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 2d7c2e150169453d19bc891b9bc052c11c2ba9c6 M\x00src.c\x00' 799s quiltify_trees_differ 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 => 1 799s | git diff-tree -z --no-renames --name-only -r 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `lib.c\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git diff-tree -z --no-renames --name-only -r 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `' 799s quiltify_trees_differ 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 0 799s differences @dl ## == ## == == ==. 799s dgit: base trees orig=17884f4e2f6a0b8bf92b o+d/p=17884f4e2f6a0b8bf92b 799s dgit: quilt differences: src: ## orig == gitignores: == orig == 799s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 799s starting quiltify (multiple patches, linear mode) 799s | git ls-tree --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/rules debian/control 799s => `debian/control'... 799s quiltify investigate 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s | git diff-tree -z --no-renames --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `lib.c\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s => `tree 4d870e59c3a21c2e6202b59474df673e46ef6449'... 799s | git diff-tree -z --no-renames --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 799s => `debian\x00src.c\x00' 799s quiltify_trees_differ 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 => 1 799s considering C=6e00b9cbfb2ac78131496aadb210310e5b4b6a84 P=5138bd8205d6eeb162d87a2d085746c0c305261c 799s | git diff-tree -r --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=5138bd8205d6eeb162d87a2d085746c0c305261c NT 799s quiltify investigate 5138bd8205d6eeb162d87a2d085746c0c305261c 799s | git diff-tree -z --no-renames --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ 5138bd8205d6eeb162d87a2d085746c0c305261c 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only 5138bd8205d6eeb162d87a2d085746c0c305261c -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit 5138bd8205d6eeb162d87a2d085746c0c305261c 799s => `tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f'... 799s | git diff-tree -z --no-renames --name-only a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c 799s => `src.c\x00' 799s quiltify_trees_differ a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c => 1 799s considering C=5138bd8205d6eeb162d87a2d085746c0c305261c P=a4efcc9f58a06f20c5de1258de24211048e99433 799s | git diff-tree -r --name-only a4efcc9f58a06f20c5de1258de24211048e99433 5138bd8205d6eeb162d87a2d085746c0c305261c -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=a4efcc9f58a06f20c5de1258de24211048e99433 NT 799s quiltify investigate a4efcc9f58a06f20c5de1258de24211048e99433 799s | git diff-tree -z --no-renames --name-only a4efcc9f58a06f20c5de1258de24211048e99433 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ a4efcc9f58a06f20c5de1258de24211048e99433 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only a4efcc9f58a06f20c5de1258de24211048e99433 -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit a4efcc9f58a06f20c5de1258de24211048e99433 799s => `tree 1b9dba384382fd10423f44e82b75e4a495de36dc'... 799s | git diff-tree -z --no-renames --name-only 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 799s => `debian\x00' 799s quiltify_trees_differ 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 => 0 799s considering C=a4efcc9f58a06f20c5de1258de24211048e99433 P=9f40936eece8f6452df026cc64200db82005a166 799s | git diff-tree -r --name-only 9f40936eece8f6452df026cc64200db82005a166 a4efcc9f58a06f20c5de1258de24211048e99433 -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=9f40936eece8f6452df026cc64200db82005a166 triv 799s quiltify investigate 9f40936eece8f6452df026cc64200db82005a166 799s | git diff-tree -z --no-renames --name-only 9f40936eece8f6452df026cc64200db82005a166 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00lib.c\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ 9f40936eece8f6452df026cc64200db82005a166 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only 9f40936eece8f6452df026cc64200db82005a166 -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit 9f40936eece8f6452df026cc64200db82005a166 799s => `tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d'... 799s | git diff-tree -z --no-renames --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 799s => `lib.c\x00' 799s quiltify_trees_differ ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 => 1 799s considering C=9f40936eece8f6452df026cc64200db82005a166 P=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s | git diff-tree -r --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 9f40936eece8f6452df026cc64200db82005a166 -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b NT 799s quiltify investigate ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s | git diff-tree -z --no-renames --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00new-upstream-file\x00src.c\x00' 799s quiltify_trees_differ ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s => `tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56'... 799s | git diff-tree -z --no-renames --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s => `src.c\x00' 799s quiltify_trees_differ eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b => 1 799s considering C=ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b P=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s | git diff-tree -r --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 NT 799s quiltify investigate eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s | git diff-tree -z --no-renames --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00new-upstream-file\x00' 799s quiltify_trees_differ eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 1 799s | git ls-tree --name-only eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 -- debian/rules debian/control 799s => `debian/control'... 799s | git cat-file commit eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s => `tree 0163f07d35eebcd058425aa0dd1766b7d27d207c'... 799s | git diff-tree -z --no-renames --name-only 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s => `new-upstream-file\x00' 799s quiltify_trees_differ 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 => 1 799s considering C=eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 P=809643e5389def220ea36d61f2d3dd504603e95a 799s | git diff-tree -r --name-only 809643e5389def220ea36d61f2d3dd504603e95a eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 -- debian/patches .pc debian/source/format 799s => `' 799s search queue P=809643e5389def220ea36d61f2d3dd504603e95a NT 799s quiltify investigate 809643e5389def220ea36d61f2d3dd504603e95a 799s | git diff-tree -z --no-renames --name-only 809643e5389def220ea36d61f2d3dd504603e95a 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 799s => `debian\x00' 799s quiltify_trees_differ 809643e5389def220ea36d61f2d3dd504603e95a 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 => 0 799s search finished hooray! 799s quiltify linearisation planning successful, executing... 799s quiltify traverse 809643e5389def220ea36d61f2d3dd504603e95a..eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s | git cat-file commit eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s => `tree 0163f07d35eebcd058425aa0dd1766b7d27d207c'... 799s | git log -n1 '--pretty=format:%aD' eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s => `Sun, 6 Dec 2015 23:50:08 +0000' 799s + git checkout -q eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 799s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 799s | realpath -- /usr/bin/dgit 799s => `/usr/bin/dgit' 799s | realpath -- .git/dgit/quilt-description.tmp 799s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 799s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0001-Add-a-new-upstream-file.patch 799s dpkg-source: info: local changes detected, the modified files are: 799s work/new-upstream-file 799s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0001-Add-a-new-upstream-file.patch 799s + git checkout -q eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 debian/changelog 799s quiltify traverse eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2..ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s | git cat-file commit ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s => `tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56'... 799s | git log -n1 '--pretty=format:%aD' ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s => `Sun, 6 Dec 2015 23:50:39 +0000' 799s + git checkout -q ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b 799s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 799s | realpath -- /usr/bin/dgit 799s => `/usr/bin/dgit' 799s | realpath -- .git/dgit/quilt-description.tmp 799s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 799s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . 0002-Edit-the-.c-file.patch 799s dpkg-source: info: using patch list from debian/patches/series 799s dpkg-source: info: local changes detected, the modified files are: 799s work/src.c 799s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/0002-Edit-the-.c-file.patch 799s + git checkout -q ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b debian/changelog 799s quiltify traverse ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b..9f40936eece8f6452df026cc64200db82005a166 799s | git cat-file commit 9f40936eece8f6452df026cc64200db82005a166 799s => `tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d'... 799s | git log -n1 '--pretty=format:%aD' 9f40936eece8f6452df026cc64200db82005a166 799s => `Sat, 4 Jun 2016 22:09:32 +0100' 799s + git checkout -q 9f40936eece8f6452df026cc64200db82005a166 799s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 799s | realpath -- /usr/bin/dgit 799s => `/usr/bin/dgit' 799s | realpath -- .git/dgit/quilt-description.tmp 799s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 799s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . subdir/addnewups 800s dpkg-source: info: using patch list from debian/patches/series 800s dpkg-source: info: local changes detected, the modified files are: 800s work/lib.c 800s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/subdir/addnewups 800s + git checkout -q 9f40936eece8f6452df026cc64200db82005a166 debian/changelog 800s quiltify traverse 9f40936eece8f6452df026cc64200db82005a166..a4efcc9f58a06f20c5de1258de24211048e99433 800s quiltify traverse a4efcc9f58a06f20c5de1258de24211048e99433..5138bd8205d6eeb162d87a2d085746c0c305261c 800s | git cat-file commit 5138bd8205d6eeb162d87a2d085746c0c305261c 800s => `tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f'... 800s | git log -n1 '--pretty=format:%aD' 5138bd8205d6eeb162d87a2d085746c0c305261c 800s => `Tue, 26 Jun 2018 09:00:24 +0100' 800s + git checkout -q 5138bd8205d6eeb162d87a2d085746c0c305261c 800s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 800s | realpath -- /usr/bin/dgit 800s => `/usr/bin/dgit' 800s | realpath -- .git/dgit/quilt-description.tmp 800s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 800s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . upstream-edit-src.c-subcommands-refshead.patch 800s dpkg-source: info: using patch list from debian/patches/series 800s dpkg-source: info: local changes detected, the modified files are: 800s work/src.c 800s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/upstream-edit-src.c-subcommands-refshead.patch 800s + git checkout -q 5138bd8205d6eeb162d87a2d085746c0c305261c debian/changelog 800s quiltify traverse 5138bd8205d6eeb162d87a2d085746c0c305261c..6e00b9cbfb2ac78131496aadb210310e5b4b6a84 800s | git cat-file commit 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 800s => `tree 4d870e59c3a21c2e6202b59474df673e46ef6449'... 800s | git log -n1 '--pretty=format:%aD' 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 800s => `Tue, 26 Jun 2018 09:00:24 +0100' 800s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 800s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 800s | realpath -- /usr/bin/dgit 800s => `/usr/bin/dgit' 800s | realpath -- .git/dgit/quilt-description.tmp 800s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work/.git/dgit/quilt-description.tmp' 800s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git --commit --include-removal . mixed-add-both-subcommands-refsheadsunst.patch 800s dpkg-source: info: using patch list from debian/patches/series 800s dpkg-source: info: local changes detected, the modified files are: 800s work/src.c 800s dpkg-source: info: local changes have been recorded in a new patch: work/debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 800s + git checkout -q 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 debian/changelog 800s + git checkout -q master 800s | git status --ignored --porcelain 800s => `?? .pc/'... 800s + git add -f debian/patches 800s Commit Debian 3.0 (quilt) metadata 800s 800s [dgit (9.15) quilt-fixup] 800s 800s + git commit -m 'Commit Debian 3.0 (quilt) metadata 800s 800s [dgit (9.15) quilt-fixup] 800s ' 800s [master d525d15] Commit Debian 3.0 (quilt) metadata 800s 6 files changed, 69 insertions(+) 800s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 800s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 800s create mode 100644 debian/patches/mixed-add-both-subcommands-refsheadsunst.patch 800s create mode 100644 debian/patches/series 800s create mode 100644 debian/patches/subdir/addnewups 800s create mode 100644 debian/patches/upstream-edit-src.c-subcommands-refshead.patch 800s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 800s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 800s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 800s ' 800s + t-git-next-date 800s + GIT_COMMITTER_DATE='1530000026 +0100' 800s + GIT_AUTHOR_DATE='1530000026 +0100' 800s + t-some-changes 'subcommands refs/heads/unstitched-mixed 2' 800s + local 'token=subcommands refs/heads/unstitched-mixed 2' 800s + local which=dum 800s + local fsuffix= 800s + t-git-next-date 800s + GIT_COMMITTER_DATE='1530000027 +0100' 800s + GIT_AUTHOR_DATE='1530000027 +0100' 800s + case "$which" in 800s + echo '// debian subcommands refs/heads/unstitched-mixed 2' 800s + git add debian/zorkmid 800s + git commit -m 'DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)' 800s [unstitched-mixed 5360dd2] DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2) 800s 1 file changed, 1 insertion(+) 800s + case "$which" in 800s + echo '// upstream subcommands refs/heads/unstitched-mixed 2' 800s + git add src.c 800s + git commit -m 'UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)' 800s [unstitched-mixed 5668ce4] UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2) 800s 1 file changed, 1 insertion(+) 800s + case "$which" in 800s + for f in debian/zorkmid$fsuffix src$fsuffix.c 800s + echo '// both! subcommands refs/heads/unstitched-mixed 2' 800s + git add debian/zorkmid 800s + for f in debian/zorkmid$fsuffix src$fsuffix.c 800s + echo '// both! subcommands refs/heads/unstitched-mixed 2' 800s + git add src.c 800s + git commit -m 'MIXED add both() (subcommands refs/heads/unstitched-mixed 2)' 800s [unstitched-mixed 9b56b9c] MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 800s 2 files changed, 2 insertions(+) 800s + t-git-next-date 800s + GIT_COMMITTER_DATE='1530000028 +0100' 800s + GIT_AUTHOR_DATE='1530000028 +0100' 800s + t-git-next-date 800s + GIT_COMMITTER_DATE='1530000029 +0100' 800s + GIT_AUTHOR_DATE='1530000029 +0100' 800s + t-git-next-date 800s + GIT_COMMITTER_DATE='1530000030 +0100' 800s + GIT_AUTHOR_DATE='1530000030 +0100' 800s + git show-ref 800s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b refs/debrebase-last/heads/master 800s 64d2fdf7628f675981360f0dce3aaaa227b0676a refs/debrebase-last/heads/stitched-laundered 800s 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-intern/quilt-cache 800s 5c6280b3d52c002248dd7f608e1adb63f1295538 refs/ffq-prev/heads/unstitched-laundered 800s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/ffq-prev/heads/unstitched-mixed 800s 5c6280b3d52c002248dd7f608e1adb63f1295538 refs/heads/before-unstitch/unstitched-laundered 800s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/heads/before-unstitch/unstitched-mixed 800s 0bcedd364c245298b6ec08d8f29abf69e34b6e5b refs/heads/converted-from-gbp 800s de5adc8d36110abf62d562d9a1985a4796748ece refs/heads/gdr-unprocessable/merge 800s 3bc5395fa4571258183be3d3f389950314c53d4e refs/heads/gdr-unprocessable/origin 800s 4db56a8b17bbf91452b3242af0628eb6790a7c6a refs/heads/make-upstream 800s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/heads/master 800s 178896af44c5b02e05a3442df6c33233b6acb807 refs/heads/raw-converted-from-gbp 800s 64d2fdf7628f675981360f0dce3aaaa227b0676a refs/heads/stitched-laundered 800s 5e0bf3cea3c715230b96aca41156852390014b98 refs/heads/stitched-mixed 800s 5472c89e9f96508ec91185b6f57e8a1875ea7a4f refs/heads/unstitched-laundered 800s 9b56b9c2600dc10b9eec97d535d89870476de971 refs/heads/unstitched-mixed 800s 923df13cd47c1ac87a6a0646124ace159c3d8291 refs/heads/upstream 800s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/remotes/dgit/dgit/sid 800s 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf refs/remotes/origin/master 800s adbae3209a0cc9d4d6b2014ffcd948304d7e48f9 refs/tags/archive/test-dummy/2.0-1 800s d2a348bc096dd78e6fa7a0914a0f2dc7d2630395 refs/tags/archive/test-dummy/2.0-2 800s 8fdac6501d4afa9739223c8a9dc1a838efb75d4d refs/tags/test-dummy/2.0-1 800s 65cdb80329a6643a2e1f3aab23e36859dc94c19b refs/tags/test-dummy/2.0-2 800s 36aaf480de3774b593cb7e92a69d85ac0f3c6748 refs/tags/upstream/2.0 800s a8b25984b338928272b3ddd50dd036d6db8f83d2 refs/tags/v1.0 800s + Ec='F:No ongoing git-debrebase session' 800s + Ep='F:Patch export produced patch amendments' 800s + subcmd '' Ult Ull Vlt Vl nU 800s + local subcmd= 800s + shift 800s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 800s + work=work--stitched-laundered 800s + : '---------- stitched-laundered ----------' 800s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 800s + git update-ref --stdin 800s + sed s/stitched-laundered/work--stitched-laundered/ 800s + git checkout work--stitched-laundered 800s Switched to branch 'work--stitched-laundered' 800s + checkletters=Ult 800s + shift 800s + before=before-work--stitched-laundered 800s + git branch before-work--stitched-laundered 800s + local xopts= 800s + case "$checkletters" in 800s + case "$checkletters" in 800s + case "$checkletters" in 800s + case "$checkletters" in 800s + t-git-debrebase 800s + local gdr=git-debrebase 800s + : ' 800s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 800s + git-debrebase --dgit=dgit -D 800s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--stitched-laundered 800s git-debrebase ffq check_specs * 800s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 800s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 800s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 800s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 800s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Differs" => 8,"Ix" => 1}],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"},"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a"} 800s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 800s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 800s git-debrebase = Upstream {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"Type" => "Upstream","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804"} 800s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 800s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 800s git-debrebase = Upstream {"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf"} 800s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 800s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 800s git-debrebase = Upstream {"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555"} 800s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 800s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 800s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2,"Ix" => 0}],"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 800s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 800s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 800s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Type" => "Upstream","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"} 800s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 800s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 800s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"}],"Type" => "Upstream","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 800s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 800s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 800s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 800s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 800s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 800s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 800s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 800s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 800s git-debrebase = Packaging {"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Parents" => [{"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n"} 800s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 800s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 800s git-debrebase = Packaging {"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472"} 800s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 800s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 800s git-debrebase = Packaging {"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}],"Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n"} 800s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 800s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 800s git-debrebase = Changelog {"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "dch -r -D unstable\n"} 800s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 800s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 800s git-debrebase = Changelog {"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 800s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 800s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 800s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 800s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 800s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 800s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 800s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 800s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 800s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 800s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 800s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 800s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 800s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 800s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 800s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 800s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 800s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 800s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 800s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 800s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 800s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 800s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 800s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 801s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 801s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 801s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s git-debrebase: laundered (head was 64d2fdf7628f675981360f0dce3aaaa227b0676a) 801s git-debrebase >= update refs/ffq-prev/heads/work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 801s git-debrebase >= delete refs/debrebase-last/heads/work--stitched-laundered 801s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a 801s git-debrebase >$ 801s Recorded previous head for preservation 801s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 801s ' 801s + peel=peel--stitched-laundered 801s + git checkout -b peel--stitched-laundered 801s Switched to a new branch 'peel--stitched-laundered' 801s + t-clean-on-branch peel--stitched-laundered 801s + t-output '## peel--stitched-laundered' git status -b --porcelain 801s + printf '%s\n' '## peel--stitched-laundered' 801s + shift 801s + git status -b --porcelain 801s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 801s + : '---------- stitched-laundered Ult ----------' 801s + '[' xUlt '!=' x ']' 801s + : '---- stitched-laundered ...Ult ----' 801s + make_check Ult 801s + case "$1" in 801s + t-refs-same-start 801s + unset t_ref_val 801s + t_ref_names=() 801s + t-refs-same refs/heads/before-work--stitched-laundered refs/ffq-prev/heads/work--stitched-laundered 801s + local g 801s + for g in $* 801s + t-ref-same refs/heads/before-work--stitched-laundered 801s + local name=refs/heads/before-work--stitched-laundered 801s + local val 801s ++ t-git-get-ref refs/heads/before-work--stitched-laundered 801s ++ local ref=refs/heads/before-work--stitched-laundered 801s ++ case "$ref" in 801s ++ git show-ref -d refs/heads/before-work--stitched-laundered 801s ++ perl -ne ' 801s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--stitched-laundered\E(?:\^\{\})?$#; 801s END { print "$x\n" if length $x; } 801s ' 801s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + t-ref-same-val refs/heads/before-work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + local name=refs/heads/before-work--stitched-laundered 801s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + case "${t_ref_val-unset}" in 801s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + t_ref_names+=("$name") 801s + for g in $* 801s + t-ref-same refs/ffq-prev/heads/work--stitched-laundered 801s + local name=refs/ffq-prev/heads/work--stitched-laundered 801s + local val 801s ++ t-git-get-ref refs/ffq-prev/heads/work--stitched-laundered 801s ++ local ref=refs/ffq-prev/heads/work--stitched-laundered 801s ++ case "$ref" in 801s ++ git show-ref -d refs/ffq-prev/heads/work--stitched-laundered 801s ++ perl -ne ' 801s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-laundered\E(?:\^\{\})?$#; 801s END { print "$x\n" if length $x; } 801s ' 801s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + t-ref-same-val refs/ffq-prev/heads/work--stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + local name=refs/ffq-prev/heads/work--stitched-laundered 801s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + case "${t_ref_val-unset}" in 801s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + t_ref_names+=("$name") 801s + make_check u 801s + case "$1" in 801s + t-git-get-ref refs/ffq-prev/heads/work--stitched-laundered 801s + local ref=refs/ffq-prev/heads/work--stitched-laundered 801s + case "$ref" in 801s + git show-ref -d refs/ffq-prev/heads/work--stitched-laundered 801s + perl -ne ' 801s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-laundered\E(?:\^\{\})?$#; 801s END { print "$x\n" if length $x; } 801s ' 801s 64d2fdf7628f675981360f0dce3aaaa227b0676a 801s + t-refs-notexist refs/debrebase-last/heads/work--stitched-laundered 801s + local val 801s + for g in $* 801s ++ t-git-get-ref refs/debrebase-last/heads/work--stitched-laundered 801s ++ local ref=refs/debrebase-last/heads/work--stitched-laundered 801s ++ case "$ref" in 801s ++ git show-ref -d refs/debrebase-last/heads/work--stitched-laundered 801s ++ perl -ne ' 801s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--stitched-laundered\E(?:\^\{\})?$#; 801s END { print "$x\n" if length $x; } 801s ' 801s ++ test 1 = 1 801s + val= 801s + '[' x '!=' x ']' 801s + checkletters=lt 801s + '[' xlt '!=' x ']' 801s + : '---- stitched-laundered ...lt ----' 801s + make_check lt 801s + case "$1" in 801s + git diff --quiet HEAD refs/heads/before-work--stitched-laundered -- :. ':!debian/patches' 801s + t-gdr-good laundered 801s + local state=laundered 801s + local beforetag= 801s + case $state in 801s + git diff --quiet -- :. ':!debian/patches' 801s + LC_MESSAGES=C 801s + t-git-debrebase status 801s + local gdr=git-debrebase 801s + : ' 801s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 801s + git-debrebase --dgit=dgit -D status 801s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 801s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 801s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2}],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Type" => "Upstream"} 801s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 801s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 801s git-debrebase = Upstream {"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Parents" => [{"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2}],"Type" => "Upstream","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n"} 801s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 801s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 801s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}],"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Type" => "Upstream"} 801s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 801s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 801s git-debrebase = Upstream {"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Parents" => [{"Differs" => 2,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0}]} 801s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 801s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 801s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Differs" => 2,"Ix" => 0}],"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9"} 801s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 801s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 801s git-debrebase = Upstream {"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 801s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 801s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 801s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656"} 801s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 801s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 801s git-debrebase = Packaging {"Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Parents" => [{"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32,"Ix" => 0}],"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 801s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 801s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 801s git-debrebase = Packaging {"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 801s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 801s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 801s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0}],"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"} 801s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 801s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 801s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Parents" => [{"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0}],"Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e"} 801s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 801s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 801s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16}],"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 801s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 801s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 801s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Type" => "Changelog"} 801s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 801s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 801s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 801s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor"} 801s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-laundered 801s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 801s ' 801s + case $state in 801s + egrep '^ *branch is laundered' ../status.check 801s branch is laundered 801s + t-gdr-good-analyse HEAD laundered 801s + local head=HEAD 801s + local state=laundered 801s + local wsfx= 801s + local etypes bwtip 801s + case $state in 801s + etypes=Upstream 801s ++ t-git-debrebase breakwater 801s ++ local gdr=git-debrebase 801s ++ : ' 801s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 801s ++ git-debrebase --dgit=dgit -D breakwater 801s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 801s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 801s git-debrebase = Upstream {"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Parents" => [{"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Type" => "Upstream"} 801s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 801s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 801s git-debrebase = Upstream {"Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"Differs" => 2}],"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream"} 801s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 801s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 801s git-debrebase = Upstream {"Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Type" => "Upstream"} 801s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 801s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 801s git-debrebase = Upstream {"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Type" => "Upstream","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0,"Differs" => 2}]} 801s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 801s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 801s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 801s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 801s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 801s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f"} 801s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 801s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 801s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d"} 801s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 801s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 801s git-debrebase = Packaging {"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Ix" => 0}]} 801s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 801s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 801s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb"}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Type" => "Packaging","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"} 801s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 801s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 801s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472"} 801s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 801s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 801s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Type" => "Packaging","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"} 801s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 801s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 801s git-debrebase = Changelog {"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"}],"Msg" => "dch -r -D unstable\n"} 801s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 801s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 801s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Type" => "Changelog"} 801s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 801s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 801s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 801s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 801s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 801s ' 801s + bwtip=Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + anal=../anal 801s + t-git-debrebase analyse HEAD 801s + local gdr=git-debrebase 801s + : ' 801s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 801s + git-debrebase --dgit=dgit -D analyse HEAD 801s git-debrebase *** WALK dab3cc0fcfead932f6714305cfb670067c157804 1 *main::STDOUT 801s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 801s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 801s git-debrebase = Upstream {"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"Type" => "Upstream"} 801s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 801s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 801s git-debrebase = Upstream {"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Parents" => [{"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 801s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 801s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 801s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}],"Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream"} 801s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 801s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 801s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}]} 801s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 801s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 801s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Parents" => [{"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0}]} 801s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 801s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 801s git-debrebase = Upstream {"Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0,"Differs" => 2}],"Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Upstream"} 801s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 801s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 801s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0}],"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Type" => "Upstream"} 801s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 801s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 801s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"}],"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Type" => "Packaging"} 801s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 801s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 801s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Parents" => [{"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0,"Differs" => 32}]} 801s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 801s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 801s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Parents" => [{"Ix" => 0,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Differs" => 32}],"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 801s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 801s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 801s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0}],"Type" => "Packaging"} 801s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 801s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 801s git-debrebase = Changelog {"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0,"Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 801s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 801s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 801s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog"} 801s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 801s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 801s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 801s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 801s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 801s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 801s ' 801s ++ git rev-parse HEAD 801s + expect=dab3cc0fcfead932f6714305cfb670067c157804 801s + exec 801s + local cid ctype info nparents 801s + read cid ctype info 801s + : ===== dab3cc0fcfead932f6714305cfb670067c157804 Upstream ===== 801s + test dab3cc0fcfead932f6714305cfb670067c157804 = dab3cc0fcfead932f6714305cfb670067c157804 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P dab3cc0fcfead932f6714305cfb670067c157804 801s + local parents=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s + expect=6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s + enparents=1 801s + : Upstream/SAME 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream ===== 801s + test 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 = 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 801s + local parents=3025551c1e030f25c60bdabaab789745e585f391 801s + expect=3025551c1e030f25c60bdabaab789745e585f391 801s + enparents=1 801s + : Upstream/SAME 3025551c1e030f25c60bdabaab789745e585f391 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s 3025551c1e030f25c60bdabaab789745e585f391 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 3025551c1e030f25c60bdabaab789745e585f391 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 3025551c1e030f25c60bdabaab789745e585f391 Upstream ===== 801s + test 3025551c1e030f25c60bdabaab789745e585f391 = 3025551c1e030f25c60bdabaab789745e585f391 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 3025551c1e030f25c60bdabaab789745e585f391 801s + local parents=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s + expect=cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s + enparents=1 801s + : Upstream/SAME cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream ===== 801s + test cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 = cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 801s + local parents=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s + expect=302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s + enparents=1 801s + : Upstream/SAME 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream ===== 801s + test 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 = 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 801s + local parents=b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s + expect=b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s + enparents=1 801s + : Upstream/SAME b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream ===== 801s + test b0291461cc529ff9fa4060b3e41ebff6cb563c49 = b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P b0291461cc529ff9fa4060b3e41ebff6cb563c49 801s + local parents=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s + expect=64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s + enparents=1 801s + : Upstream/SAME 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream ===== 801s + test 64efa6cded3fc4da385f8ed4bd8c72164c1c914d = 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s + local cetype=Upstream 801s + '[' xUpstream = xUpstream ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 801s + local parents=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + expect=5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + enparents=1 801s + : Upstream/SAME 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s ++ printf %s 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Packaging ===== 801s + test 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + local cetype=Upstream 801s + '[' xPackaging = xUpstream ']' 801s ++ git log -n1 --pretty=format:%P 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + local parents=420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s + expect=420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s + enparents=1 801s + : Packaging/Upstream 420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + '[' xY:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 '!=' x ']' 801s + test Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 = Y:5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 801s + bwtip= 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :. ':!debian' 801s + git diff --quiet 420fa3b34303353709bcfbcf88ccc4e272f5ee48..5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 -- :debian/patches 801s + etypes=Packaging 801s ++ printf %s 420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Packaging ===== 801s + test 420fa3b34303353709bcfbcf88ccc4e272f5ee48 = 420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s + local cetype=Packaging 801s + '[' xPackaging = xPackaging ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 420fa3b34303353709bcfbcf88ccc4e272f5ee48 801s + local parents=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s + expect=4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s + enparents=1 801s + : Packaging/SAME 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :. ':!debian' 801s + git diff --quiet 4926fc77fd0b974ce5a2892ad46669ed4ec14edb..420fa3b34303353709bcfbcf88ccc4e272f5ee48 -- :debian/patches 801s + etypes=Packaging 801s ++ printf %s 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Packaging ===== 801s + test 4926fc77fd0b974ce5a2892ad46669ed4ec14edb = 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s + local cetype=Packaging 801s + '[' xPackaging = xPackaging ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 801s + local parents=6184b930def645d1f8da8cb6a91475445cbb817d 801s + expect=6184b930def645d1f8da8cb6a91475445cbb817d 801s + enparents=1 801s + : Packaging/SAME 6184b930def645d1f8da8cb6a91475445cbb817d 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :. ':!debian' 801s + git diff --quiet 6184b930def645d1f8da8cb6a91475445cbb817d..4926fc77fd0b974ce5a2892ad46669ed4ec14edb -- :debian/patches 801s + etypes=Packaging 801s ++ printf %s 6184b930def645d1f8da8cb6a91475445cbb817d 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 6184b930def645d1f8da8cb6a91475445cbb817d 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 6184b930def645d1f8da8cb6a91475445cbb817d Packaging ===== 801s + test 6184b930def645d1f8da8cb6a91475445cbb817d = 6184b930def645d1f8da8cb6a91475445cbb817d 801s + local cetype=Packaging 801s + '[' xPackaging = xPackaging ']' 801s + cetype=SAME 801s ++ git log -n1 --pretty=format:%P 6184b930def645d1f8da8cb6a91475445cbb817d 801s + local parents=6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s + expect=6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s + enparents=1 801s + : Packaging/SAME 6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :. ':!debian' 801s + git diff --quiet 6b98ac2fc854dc69f9cabc904a8e43328f649f41..6184b930def645d1f8da8cb6a91475445cbb817d -- :debian/patches 801s + etypes=Packaging 801s ++ printf %s 6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Changelog ===== 801s + test 6b98ac2fc854dc69f9cabc904a8e43328f649f41 = 6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s + local cetype=Packaging 801s + '[' xChangelog = xPackaging ']' 801s ++ git log -n1 --pretty=format:%P 6b98ac2fc854dc69f9cabc904a8e43328f649f41 801s + local parents=bef5ccd302033398655e3e4e8896fba41691d0b2 801s + expect=bef5ccd302033398655e3e4e8896fba41691d0b2 801s + enparents=1 801s + : Changelog/Packaging bef5ccd302033398655e3e4e8896fba41691d0b2 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet bef5ccd302033398655e3e4e8896fba41691d0b2..6b98ac2fc854dc69f9cabc904a8e43328f649f41 -- :. ':!debian/changelog' 801s + etypes=Packaging 801s ++ printf %s bef5ccd302033398655e3e4e8896fba41691d0b2 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo bef5ccd302033398655e3e4e8896fba41691d0b2 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== bef5ccd302033398655e3e4e8896fba41691d0b2 Changelog ===== 801s + test bef5ccd302033398655e3e4e8896fba41691d0b2 = bef5ccd302033398655e3e4e8896fba41691d0b2 801s + local cetype=Packaging 801s + '[' xChangelog = xPackaging ']' 801s ++ git log -n1 --pretty=format:%P bef5ccd302033398655e3e4e8896fba41691d0b2 801s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s + enparents=1 801s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..bef5ccd302033398655e3e4e8896fba41691d0b2 -- :. ':!debian/changelog' 801s + etypes=Packaging 801s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s ++ wc -w 801s + local cnparents=1 801s + test 1 = 1 801s ++ for f in $parents 801s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s ++ wc -w 801s ++ t-sort -u 801s ++ LC_COLLATE=C 801s ++ sort -u 801s + local cndparents=1 801s + test 1 = 1 801s + case "$parents" in 801s + case "$ctype" in 801s + read cid ctype info 801s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 801s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s + local cetype=Packaging 801s + '[' xAnchor = xPackaging ']' 801s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 801s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 801s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 801s + enparents=1 801s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 801s + case "$ctype/$cetype" in 801s + case "$ctype/$etypes" in 801s + case "$cetype" in 801s + case "$ctype" in 801s + break 801s + checkletters=t 801s + '[' xt '!=' x ']' 801s + : '---- stitched-laundered ...t ----' 801s + make_check t 801s + case "$1" in 801s + git diff --quiet HEAD refs/heads/before-work--stitched-laundered 801s + checkletters= 801s + '[' x '!=' x ']' 801s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 801s + work=work--stitched-mixed 801s + : '---------- stitched-mixed ----------' 801s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 801s + git update-ref --stdin 801s + sed s/stitched-mixed/work--stitched-mixed/ 801s + git checkout work--stitched-mixed 801s Switched to branch 'work--stitched-mixed' 801s + checkletters=Ull 801s + shift 801s + before=before-work--stitched-mixed 801s + git branch before-work--stitched-mixed 801s + local xopts= 801s + case "$checkletters" in 801s + case "$checkletters" in 801s + case "$checkletters" in 801s + case "$checkletters" in 801s + t-git-debrebase 801s + local gdr=git-debrebase 801s + : ' 801s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 801s + git-debrebase --dgit=dgit -D 801s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--stitched-mixed 801s git-debrebase ffq check_specs * 801s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 801s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 801s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 801s git-debrebase = Mixed {"Type" => "Mixed","Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504","CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "7091adece516711371505e702f87d9973010f25b"}]} 801s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 801s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 801s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6066466a7bfccd9539954883312605a59c5b4502","Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","CommitId" => "7091adece516711371505e702f87d9973010f25b","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"}]} 801s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 801s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 801s git-debrebase = Packaging {"Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 801s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 801s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 801s git-debrebase = AddPatches {"Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"Ix" => 0,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Differs" => 4}],"Type" => "AddPatches","Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3"} 801s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 801s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 801s git-debrebase = Mixed {"Parents" => [{"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Ix" => 0,"Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","Type" => "Mixed"} 801s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 801s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 801s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Differs" => 2,"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Ix" => 0}],"Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","Type" => "Upstream"} 801s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 801s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 801s git-debrebase = Packaging {"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b"} 801s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 801s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 801s git-debrebase = AddPatches {"Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Parents" => [{"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Ix" => 0}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches"} 801s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 801s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 801s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0,"Differs" => 16}],"Msg" => "dch -r -D unstable\n"} 801s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 801s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 801s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16}]} 801s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 801s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 801s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 801s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Contributor" => {"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},"Overwritten" => [{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n"} 801s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 801s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 801s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 801s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 801s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 801s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 801s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 801s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 801s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream"} 801s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 801s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 801s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 801s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 801s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 801s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 801s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 801s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 801s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 801s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 801s git-debrebase WALK REWRITING NOW cl=HASH(0x55f21fa66c68) procd=HASH(0x55f21fa734f8) 801s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 801s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 801s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 801s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 801s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 801s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 801s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 801s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 801s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 801s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 801s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 801s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 801s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 802s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 802s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 802s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 802s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s git-debrebase: laundered (head was 5e0bf3cea3c715230b96aca41156852390014b98) 802s git-debrebase >= update refs/ffq-prev/heads/work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 0000000000000000000000000000000000000000 802s git-debrebase >= delete refs/debrebase-last/heads/work--stitched-mixed 802s git-debrebase >= update HEAD 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 802s git-debrebase >$ 802s Recorded previous head for preservation 802s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s + peel=peel--stitched-mixed 802s + git checkout -b peel--stitched-mixed 802s Switched to a new branch 'peel--stitched-mixed' 802s + t-clean-on-branch peel--stitched-mixed 802s + t-output '## peel--stitched-mixed' git status -b --porcelain 802s + printf '%s\n' '## peel--stitched-mixed' 802s + shift 802s + git status -b --porcelain 802s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 802s + : '---------- stitched-mixed Ull ----------' 802s + '[' xUll '!=' x ']' 802s + : '---- stitched-mixed ...Ull ----' 802s + make_check Ull 802s + case "$1" in 802s + t-refs-same-start 802s + unset t_ref_val 802s + t_ref_names=() 802s + t-refs-same refs/heads/before-work--stitched-mixed refs/ffq-prev/heads/work--stitched-mixed 802s + local g 802s + for g in $* 802s + t-ref-same refs/heads/before-work--stitched-mixed 802s + local name=refs/heads/before-work--stitched-mixed 802s + local val 802s ++ t-git-get-ref refs/heads/before-work--stitched-mixed 802s ++ local ref=refs/heads/before-work--stitched-mixed 802s ++ case "$ref" in 802s ++ git show-ref -d refs/heads/before-work--stitched-mixed 802s ++ perl -ne ' 802s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--stitched-mixed\E(?:\^\{\})?$#; 802s END { print "$x\n" if length $x; } 802s ' 802s + val=5e0bf3cea3c715230b96aca41156852390014b98 802s + t-ref-same-val refs/heads/before-work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 802s + local name=refs/heads/before-work--stitched-mixed 802s + local val=5e0bf3cea3c715230b96aca41156852390014b98 802s + case "${t_ref_val-unset}" in 802s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 802s + t_ref_names+=("$name") 802s + for g in $* 802s + t-ref-same refs/ffq-prev/heads/work--stitched-mixed 802s + local name=refs/ffq-prev/heads/work--stitched-mixed 802s + local val 802s ++ t-git-get-ref refs/ffq-prev/heads/work--stitched-mixed 802s ++ local ref=refs/ffq-prev/heads/work--stitched-mixed 802s ++ case "$ref" in 802s ++ git show-ref -d refs/ffq-prev/heads/work--stitched-mixed 802s ++ perl -ne ' 802s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-mixed\E(?:\^\{\})?$#; 802s END { print "$x\n" if length $x; } 802s ' 802s + val=5e0bf3cea3c715230b96aca41156852390014b98 802s + t-ref-same-val refs/ffq-prev/heads/work--stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 802s + local name=refs/ffq-prev/heads/work--stitched-mixed 802s + local val=5e0bf3cea3c715230b96aca41156852390014b98 802s + case "${t_ref_val-unset}" in 802s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 802s + t_ref_names+=("$name") 802s + make_check u 802s + case "$1" in 802s + t-git-get-ref refs/ffq-prev/heads/work--stitched-mixed 802s + local ref=refs/ffq-prev/heads/work--stitched-mixed 802s + case "$ref" in 802s + git show-ref -d refs/ffq-prev/heads/work--stitched-mixed 802s + perl -ne ' 802s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--stitched-mixed\E(?:\^\{\})?$#; 802s END { print "$x\n" if length $x; } 802s ' 802s 5e0bf3cea3c715230b96aca41156852390014b98 802s + t-refs-notexist refs/debrebase-last/heads/work--stitched-mixed 802s + local val 802s + for g in $* 802s ++ t-git-get-ref refs/debrebase-last/heads/work--stitched-mixed 802s ++ local ref=refs/debrebase-last/heads/work--stitched-mixed 802s ++ case "$ref" in 802s ++ git show-ref -d refs/debrebase-last/heads/work--stitched-mixed 802s ++ perl -ne ' 802s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--stitched-mixed\E(?:\^\{\})?$#; 802s END { print "$x\n" if length $x; } 802s ' 802s ++ test 1 = 1 802s + val= 802s + '[' x '!=' x ']' 802s + checkletters=ll 802s + '[' xll '!=' x ']' 802s + : '---- stitched-mixed ...ll ----' 802s + make_check ll 802s + case "$1" in 802s + git diff --quiet HEAD refs/heads/before-work--stitched-mixed -- :. ':!debian/patches' 802s + t-gdr-good laundered 802s + local state=laundered 802s + local beforetag= 802s + case $state in 802s + git diff --quiet -- :. ':!debian/patches' 802s + LC_MESSAGES=C 802s + t-git-debrebase status 802s + local gdr=git-debrebase 802s + : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s + git-debrebase --dgit=dgit -D status 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}]} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Parents" => [{"Differs" => 2,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2,"Ix" => 0}],"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2}],"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Parents" => [{"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0}],"Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}]} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Parents" => [{"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"} 802s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 802s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 802s git-debrebase = Packaging {"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 802s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 802s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 802s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Differs" => 32}],"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Type" => "Packaging","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3"} 802s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 802s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 802s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"} 802s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 802s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 802s git-debrebase = Changelog {"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 802s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 802s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 802s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 802s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 802s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-mixed 802s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s + case $state in 802s + egrep '^ *branch is laundered' ../status.check 802s branch is laundered 802s + t-gdr-good-analyse HEAD laundered 802s + local head=HEAD 802s + local state=laundered 802s + local wsfx= 802s + local etypes bwtip 802s + case $state in 802s + etypes=Upstream 802s ++ t-git-debrebase breakwater 802s ++ local gdr=git-debrebase 802s ++ : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s ++ git-debrebase --dgit=dgit -D breakwater 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Differs" => 2,"Ix" => 0}],"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"Parents" => [{"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Differs" => 2,"Ix" => 0}],"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0}],"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Upstream"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Parents" => [{"Differs" => 2,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Parents" => [{"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Differs" => 2,"Ix" => 0}],"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32}],"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"} 802s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 802s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 802s git-debrebase = Packaging {"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Parents" => [{"Differs" => 32,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 802s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 802s git-debrebase = Packaging {"Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Parents" => [{"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0}]} 802s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 802s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 802s git-debrebase = Changelog {"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Parents" => [{"Differs" => 16,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 802s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 802s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 802s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"} 802s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 802s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 802s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 802s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 802s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + anal=../anal 802s + t-git-debrebase analyse HEAD 802s + local gdr=git-debrebase 802s + : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s + git-debrebase --dgit=dgit -D analyse HEAD 802s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0}],"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d"} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"Differs" => 2,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0}],"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Parents" => [{"Differs" => 2,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0}],"Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2}],"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Parents" => [{"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2}],"Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588"}],"Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging"} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32,"Ix" => 0}],"Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5"} 802s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 802s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 802s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Parents" => [{"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"} 802s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 802s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 802s git-debrebase = Packaging {"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Type" => "Packaging","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 802s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 802s git-debrebase = Changelog {"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 802s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 802s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 802s git-debrebase = Changelog {"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 802s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 802s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 802s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 802s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 802s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 802s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s ++ git rev-parse HEAD 802s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 802s + exec 802s + local cid ctype info nparents 802s + read cid ctype info 802s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 802s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 802s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 802s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 802s + enparents=1 802s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 802s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 802s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 802s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 802s + enparents=1 802s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 802s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 802s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 802s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 802s + enparents=1 802s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 802s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 802s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s + enparents=1 802s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 802s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 802s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s + enparents=1 802s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 802s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 802s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s + enparents=1 802s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 802s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s + local cetype=Upstream 802s + '[' xUpstream = xUpstream ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 802s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + enparents=1 802s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 802s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + local cetype=Upstream 802s + '[' xPackaging = xUpstream ']' 802s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s + enparents=1 802s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 802s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + bwtip= 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 802s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 802s + etypes=Packaging 802s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 802s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s + local cetype=Packaging 802s + '[' xPackaging = xPackaging ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 802s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 802s + expect=906c70d0be27939a63e478000e80b0914705ad3a 802s + enparents=1 802s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 802s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 802s + etypes=Packaging 802s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 802s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 802s + local cetype=Packaging 802s + '[' xPackaging = xPackaging ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 802s + local parents=5052af319e257b8c20174a42da76f055391029f3 802s + expect=5052af319e257b8c20174a42da76f055391029f3 802s + enparents=1 802s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 802s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 802s + etypes=Packaging 802s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ wc -w 802s ++ echo 5052af319e257b8c20174a42da76f055391029f3 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 802s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 802s + local cetype=Packaging 802s + '[' xPackaging = xPackaging ']' 802s + cetype=SAME 802s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 802s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 802s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 802s + enparents=1 802s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 802s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 802s + etypes=Packaging 802s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 802s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 802s + local cetype=Packaging 802s + '[' xChangelog = xPackaging ']' 802s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 802s + local parents=60728ea4003218c146a7f595c4ff746760566965 802s + expect=60728ea4003218c146a7f595c4ff746760566965 802s + enparents=1 802s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 802s + etypes=Packaging 802s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 60728ea4003218c146a7f595c4ff746760566965 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 802s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 802s + local cetype=Packaging 802s + '[' xChangelog = xPackaging ']' 802s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 802s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s + enparents=1 802s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 802s + etypes=Packaging 802s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s ++ wc -w 802s + local cnparents=1 802s + test 1 = 1 802s ++ for f in $parents 802s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s ++ wc -w 802s ++ t-sort -u 802s ++ LC_COLLATE=C 802s ++ sort -u 802s + local cndparents=1 802s + test 1 = 1 802s + case "$parents" in 802s + case "$ctype" in 802s + read cid ctype info 802s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 802s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s + local cetype=Packaging 802s + '[' xAnchor = xPackaging ']' 802s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 802s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 802s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 802s + enparents=1 802s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 802s + case "$ctype/$cetype" in 802s + case "$ctype/$etypes" in 802s + case "$cetype" in 802s + case "$ctype" in 802s + break 802s + checkletters=l 802s + '[' xl '!=' x ']' 802s + : '---- stitched-mixed ...l ----' 802s + make_check l 802s + case "$1" in 802s + git diff --quiet HEAD refs/heads/before-work--stitched-mixed -- :. ':!debian/patches' 802s + t-gdr-good laundered 802s + local state=laundered 802s + local beforetag= 802s + case $state in 802s + git diff --quiet -- :. ':!debian/patches' 802s + LC_MESSAGES=C 802s + t-git-debrebase status 802s + local gdr=git-debrebase 802s + : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s + git-debrebase --dgit=dgit -D status 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Type" => "Upstream","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0,"Differs" => 2}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Type" => "Upstream","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Type" => "Upstream","Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0,"Differs" => 2}],"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Type" => "Upstream","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0}],"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Type" => "Upstream","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Differs" => 32}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Type" => "Packaging","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"}],"Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Type" => "Packaging","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n"} 802s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 802s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 802s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}],"Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 802s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 802s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 802s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}]} 802s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 802s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 802s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 802s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 802s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 802s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 802s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 802s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 802s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--stitched-mixed 802s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s + case $state in 802s + egrep '^ *branch is laundered' ../status.check 802s branch is laundered 802s + t-gdr-good-analyse HEAD laundered 802s + local head=HEAD 802s + local state=laundered 802s + local wsfx= 802s + local etypes bwtip 802s + case $state in 802s + etypes=Upstream 802s ++ t-git-debrebase breakwater 802s ++ local gdr=git-debrebase 802s ++ : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s ++ git-debrebase --dgit=dgit -D breakwater 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d"} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Type" => "Upstream","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a"}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"}],"Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}],"Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"}]} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588"}],"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"}],"Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"}]} 802s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 802s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 802s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"} 802s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 802s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 802s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","CommitId" => "5052af319e257b8c20174a42da76f055391029f3"} 802s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 802s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 802s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "dch -r -D unstable\n"} 802s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 802s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 802s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Changelog","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 802s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 802s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 802s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 802s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 802s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 802s ' 802s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 802s + anal=../anal 802s + t-git-debrebase analyse HEAD 802s + local gdr=git-debrebase 802s + : ' 802s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 802s + git-debrebase --dgit=dgit -D analyse HEAD 802s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 802s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 802s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 802s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}],"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Type" => "Upstream","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 802s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 802s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 802s git-debrebase = Upstream {"Parents" => [{"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Ix" => 0,"Differs" => 2}],"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 802s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 802s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a"}],"Type" => "Upstream"} 802s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 802s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 802s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0,"Differs" => 2}],"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Type" => "Upstream"} 802s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 802s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 802s git-debrebase = Upstream {"Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Ix" => 0,"Differs" => 2}],"Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Type" => "Upstream"} 802s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 802s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 802s git-debrebase = Upstream {"Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Differs" => 2,"Ix" => 0}],"Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 802s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 802s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 802s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0,"Differs" => 2}],"Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 802s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 802s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 802s git-debrebase = Packaging {"Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Differs" => 32,"Ix" => 0}],"Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Type" => "Packaging"} 802s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 802s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 802s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 803s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 803s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 803s git-debrebase = Packaging {"Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 803s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 803s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 803s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Type" => "Packaging","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Parents" => [{"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0,"Differs" => 32}]} 803s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 803s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 803s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Type" => "Changelog","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 803s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 803s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 803s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 803s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 803s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 803s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 803s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]]} 803s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 803s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 803s ' 803s ++ git rev-parse HEAD 803s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 803s + exec 803s + local cid ctype info nparents 803s + read cid ctype info 803s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 803s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 803s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 803s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 803s + enparents=1 803s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 803s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 803s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 803s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 803s + enparents=1 803s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 803s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 803s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 803s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 803s + enparents=1 803s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 803s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 803s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s + enparents=1 803s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 803s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 803s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s + enparents=1 803s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 803s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 803s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s + enparents=1 803s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 803s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 803s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + enparents=1 803s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 803s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + local cetype=Upstream 803s + '[' xPackaging = xUpstream ']' 803s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s + enparents=1 803s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 803s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 803s + bwtip= 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 803s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ wc -w 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 803s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 803s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 803s + expect=906c70d0be27939a63e478000e80b0914705ad3a 803s + enparents=1 803s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 803s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 803s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 803s + local parents=5052af319e257b8c20174a42da76f055391029f3 803s + expect=5052af319e257b8c20174a42da76f055391029f3 803s + enparents=1 803s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 803s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 5052af319e257b8c20174a42da76f055391029f3 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 803s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 803s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 803s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 803s + enparents=1 803s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 803s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 803s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 803s + local cetype=Packaging 803s + '[' xChangelog = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 803s + local parents=60728ea4003218c146a7f595c4ff746760566965 803s + expect=60728ea4003218c146a7f595c4ff746760566965 803s + enparents=1 803s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 803s + etypes=Packaging 803s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 60728ea4003218c146a7f595c4ff746760566965 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 803s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 803s + local cetype=Packaging 803s + '[' xChangelog = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 803s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + enparents=1 803s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 803s + etypes=Packaging 803s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 803s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + local cetype=Packaging 803s + '[' xAnchor = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + enparents=1 803s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + break 803s + checkletters= 803s + '[' x '!=' x ']' 803s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 803s + work=work--unstitched-laundered 803s + : '---------- unstitched-laundered ----------' 803s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 803s + git update-ref --stdin 803s + sed s/unstitched-laundered/work--unstitched-laundered/ 803s + git checkout work--unstitched-laundered 803s Switched to branch 'work--unstitched-laundered' 803s + checkletters=Vlt 803s + shift 803s + before=before-work--unstitched-laundered 803s + git branch before-work--unstitched-laundered 803s + local xopts= 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + t-git-debrebase 803s + local gdr=git-debrebase 803s + : ' 803s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 803s + git-debrebase --dgit=dgit -D 803s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--unstitched-laundered 803s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 803s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 803s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 803s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 803s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 803s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream"} 803s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 803s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 803s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 803s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 803s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 803s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 803s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Type" => "Upstream","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 803s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 803s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 803s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 803s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 803s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 803s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}]} 803s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 803s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 803s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"} 803s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 803s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 803s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 803s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 803s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 803s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 803s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 803s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 803s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 803s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 803s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 803s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 803s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 803s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 803s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 803s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 803s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 803s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 803s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 803s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 803s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 803s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 803s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 803s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 803s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 803s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 803s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 803s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 803s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 803s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 803s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 803s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 803s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 803s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 803s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 803s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 803s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 803s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 803s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 803s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 803s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 803s ' 803s + peel=peel--unstitched-laundered 803s + git checkout -b peel--unstitched-laundered 803s Switched to a new branch 'peel--unstitched-laundered' 803s + t-clean-on-branch peel--unstitched-laundered 803s + t-output '## peel--unstitched-laundered' git status -b --porcelain 803s + printf '%s\n' '## peel--unstitched-laundered' 803s + shift 803s + git status -b --porcelain 803s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 803s + : '---------- unstitched-laundered Vlt ----------' 803s + '[' xVlt '!=' x ']' 803s + : '---- unstitched-laundered ...Vlt ----' 803s + make_check Vlt 803s + case "$1" in 803s + t-refs-same-start 803s + unset t_ref_val 803s + t_ref_names=() 803s + t-refs-same refs/ffq-prev/heads/work--unstitched-laundered refs/ffq-prev/heads/unstitched-laundered 803s + local g 803s + for g in $* 803s + t-ref-same refs/ffq-prev/heads/work--unstitched-laundered 803s + local name=refs/ffq-prev/heads/work--unstitched-laundered 803s + local val 803s ++ t-git-get-ref refs/ffq-prev/heads/work--unstitched-laundered 803s ++ local ref=refs/ffq-prev/heads/work--unstitched-laundered 803s ++ case "$ref" in 803s ++ git show-ref -d refs/ffq-prev/heads/work--unstitched-laundered 803s ++ perl -ne ' 803s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--unstitched-laundered\E(?:\^\{\})?$#; 803s END { print "$x\n" if length $x; } 803s ' 803s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + t-ref-same-val refs/ffq-prev/heads/work--unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 803s + local name=refs/ffq-prev/heads/work--unstitched-laundered 803s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + case "${t_ref_val-unset}" in 803s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + t_ref_names+=("$name") 803s + for g in $* 803s + t-ref-same refs/ffq-prev/heads/unstitched-laundered 803s + local name=refs/ffq-prev/heads/unstitched-laundered 803s + local val 803s ++ t-git-get-ref refs/ffq-prev/heads/unstitched-laundered 803s ++ local ref=refs/ffq-prev/heads/unstitched-laundered 803s ++ case "$ref" in 803s ++ git show-ref -d refs/ffq-prev/heads/unstitched-laundered 803s ++ perl -ne ' 803s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/unstitched-laundered\E(?:\^\{\})?$#; 803s END { print "$x\n" if length $x; } 803s ' 803s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + t-ref-same-val refs/ffq-prev/heads/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 803s + local name=refs/ffq-prev/heads/unstitched-laundered 803s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + case "${t_ref_val-unset}" in 803s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 803s + t_ref_names+=("$name") 803s + t-refs-notexist refs/debrebase-last/heads/work--unstitched-laundered 803s + local val 803s + for g in $* 803s ++ t-git-get-ref refs/debrebase-last/heads/work--unstitched-laundered 803s ++ local ref=refs/debrebase-last/heads/work--unstitched-laundered 803s ++ case "$ref" in 803s ++ git show-ref -d refs/debrebase-last/heads/work--unstitched-laundered 803s ++ perl -ne ' 803s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--unstitched-laundered\E(?:\^\{\})?$#; 803s END { print "$x\n" if length $x; } 803s ' 803s ++ test 1 = 1 803s + val= 803s + '[' x '!=' x ']' 803s + checkletters=lt 803s + '[' xlt '!=' x ']' 803s + : '---- unstitched-laundered ...lt ----' 803s + make_check lt 803s + case "$1" in 803s + git diff --quiet HEAD refs/heads/before-work--unstitched-laundered -- :. ':!debian/patches' 803s + t-gdr-good laundered 803s + local state=laundered 803s + local beforetag= 803s + case $state in 803s + git diff --quiet -- :. ':!debian/patches' 803s + LC_MESSAGES=C 803s + t-git-debrebase status 803s + local gdr=git-debrebase 803s + : ' 803s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 803s + git-debrebase --dgit=dgit -D status 803s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 803s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 803s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 803s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 803s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 803s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da"} 803s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 803s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 803s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 803s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 803s git-debrebase = Upstream {"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 803s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 803s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}]} 803s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 803s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 803s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 803s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 803s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 803s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 803s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 803s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 803s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 803s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 803s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 803s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 803s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 803s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 803s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 803s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 803s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 803s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 803s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 803s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Type" => "Changelog"} 803s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 803s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 803s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Type" => "Changelog"} 803s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 803s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 803s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 803s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 803s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--unstitched-laundered 803s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 803s ' 803s + case $state in 803s + egrep '^ *branch is laundered' ../status.check 803s branch is laundered 803s + t-gdr-good-analyse HEAD laundered 803s + local head=HEAD 803s + local state=laundered 803s + local wsfx= 803s + local etypes bwtip 803s + case $state in 803s + etypes=Upstream 803s ++ t-git-debrebase breakwater 803s ++ local gdr=git-debrebase 803s ++ : ' 803s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 803s ++ git-debrebase --dgit=dgit -D breakwater 803s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 803s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 803s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 803s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 803s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 803s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 803s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 803s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 803s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 803s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 803s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 803s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 803s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}],"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 803s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 803s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 803s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 803s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 803s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 803s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 803s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"} 803s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 803s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 803s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 803s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 803s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 803s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 803s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 803s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}]} 803s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 803s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 803s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Msg" => "dch -r -D unstable\n"} 803s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 803s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 803s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog"} 803s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 803s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 803s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 803s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 803s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 803s ' 803s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 803s + anal=../anal 803s + t-git-debrebase analyse HEAD 803s + local gdr=git-debrebase 803s + : ' 803s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 803s + git-debrebase --dgit=dgit -D analyse HEAD 803s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 803s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 803s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 803s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 803s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 803s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 803s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 803s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 803s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 803s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0,"Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 803s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 803s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 803s git-debrebase = Upstream {"Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 803s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 803s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 803s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 803s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 803s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 803s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 803s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 803s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 803s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 803s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 803s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 803s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 803s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 803s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 803s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}]} 803s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 803s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 803s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 803s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 803s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 803s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 803s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 803s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 803s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 803s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 803s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 803s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 803s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 803s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 803s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 803s ' 803s ++ git rev-parse HEAD 803s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 803s + exec 803s + local cid ctype info nparents 803s + read cid ctype info 803s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 803s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 803s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s + enparents=1 803s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 803s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 803s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s + enparents=1 803s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 803s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 803s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 803s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 803s + enparents=1 803s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 803s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 803s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 803s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 803s + enparents=1 803s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 803s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 803s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s + enparents=1 803s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 803s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 803s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s + enparents=1 803s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 803s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s + local cetype=Upstream 803s + '[' xUpstream = xUpstream ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 803s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 803s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 803s + enparents=1 803s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 803s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 803s + local cetype=Upstream 803s + '[' xPackaging = xUpstream ']' 803s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 803s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s + enparents=1 803s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 803s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 803s + bwtip= 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 803s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 803s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 803s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s + enparents=1 803s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 803s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 803s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 803s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 803s + expect=515e62b8d591fcc68597383b955d898db71abc6c 803s + enparents=1 803s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 803s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 803s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 803s + local cetype=Packaging 803s + '[' xPackaging = xPackaging ']' 803s + cetype=SAME 803s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 803s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 803s + expect=809643e5389def220ea36d61f2d3dd504603e95a 803s + enparents=1 803s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 803s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 803s + etypes=Packaging 803s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s ++ wc -w 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 803s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 803s + local cetype=Packaging 803s + '[' xChangelog = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 803s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 803s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 803s + enparents=1 803s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 803s + etypes=Packaging 803s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 803s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 803s + local cetype=Packaging 803s + '[' xChangelog = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 803s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + enparents=1 803s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 803s + etypes=Packaging 803s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s ++ wc -w 803s + local cnparents=1 803s + test 1 = 1 803s ++ for f in $parents 803s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s ++ wc -w 803s ++ t-sort -u 803s ++ LC_COLLATE=C 803s ++ sort -u 803s + local cndparents=1 803s + test 1 = 1 803s + case "$parents" in 803s + case "$ctype" in 803s + read cid ctype info 803s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 803s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + local cetype=Packaging 803s + '[' xAnchor = xPackaging ']' 803s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 803s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + enparents=1 803s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 803s + case "$ctype/$cetype" in 803s + case "$ctype/$etypes" in 803s + case "$cetype" in 803s + case "$ctype" in 803s + break 803s + checkletters=t 803s + '[' xt '!=' x ']' 803s + : '---- unstitched-laundered ...t ----' 803s + make_check t 803s + case "$1" in 803s + git diff --quiet HEAD refs/heads/before-work--unstitched-laundered 803s + checkletters= 803s + '[' x '!=' x ']' 803s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 803s + work=work--unstitched-mixed 803s + : '---------- unstitched-mixed ----------' 803s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 803s + git update-ref --stdin 803s + sed s/unstitched-mixed/work--unstitched-mixed/ 803s + git checkout work--unstitched-mixed 803s Switched to branch 'work--unstitched-mixed' 803s + checkletters=Vl 803s + shift 803s + before=before-work--unstitched-mixed 803s + git branch before-work--unstitched-mixed 803s + local xopts= 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + case "$checkletters" in 803s + t-git-debrebase 803s + local gdr=git-debrebase 803s + : ' 803s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 803s + git-debrebase --dgit=dgit -D 803s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--unstitched-mixed 803s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 803s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 803s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 803s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Mixed","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367"}]} 803s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 803s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 803s git-debrebase = Upstream {"Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Upstream","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0,"Differs" => 2}]} 803s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 803s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 803s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32}],"Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "Packaging","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n"} 803s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 803s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 803s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84"}],"Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n"} 803s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 803s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 803s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"}],"Type" => "Mixed","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n"} 803s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 803s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 803s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2}],"Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Type" => "Upstream","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n"} 803s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 803s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 803s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32}],"Type" => "Packaging","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n"} 803s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 803s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 803s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 804s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 804s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 804s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"} 804s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 804s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 804s git-debrebase = Upstream {"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Type" => "Upstream","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}]} 804s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 804s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 804s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}]} 804s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 804s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 804s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}]} 804s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 804s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 804s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 804s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 804s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 804s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 804s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 804s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 804s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 804s git-debrebase WALK REWRITING NOW cl=HASH(0x5644af073848) procd=HASH(0x5644af075a10) 804s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 804s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 804s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 804s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 804s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 804s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 804s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 804s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 804s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 804s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 804s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 804s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 804s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 804s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 804s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 804s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 804s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 804s git-debrebase >$ 804s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 804s ' 804s + peel=peel--unstitched-mixed 804s + git checkout -b peel--unstitched-mixed 804s Switched to a new branch 'peel--unstitched-mixed' 804s + t-clean-on-branch peel--unstitched-mixed 804s + t-output '## peel--unstitched-mixed' git status -b --porcelain 804s + printf '%s\n' '## peel--unstitched-mixed' 804s + shift 804s + git status -b --porcelain 804s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 804s + : '---------- unstitched-mixed Vl ----------' 804s + '[' xVl '!=' x ']' 804s + : '---- unstitched-mixed ...Vl ----' 804s + make_check Vl 804s + case "$1" in 804s + t-refs-same-start 804s + unset t_ref_val 804s + t_ref_names=() 804s + t-refs-same refs/ffq-prev/heads/work--unstitched-mixed refs/ffq-prev/heads/unstitched-mixed 804s + local g 804s + for g in $* 804s + t-ref-same refs/ffq-prev/heads/work--unstitched-mixed 804s + local name=refs/ffq-prev/heads/work--unstitched-mixed 804s + local val 804s ++ t-git-get-ref refs/ffq-prev/heads/work--unstitched-mixed 804s ++ local ref=refs/ffq-prev/heads/work--unstitched-mixed 804s ++ case "$ref" in 804s ++ git show-ref -d refs/ffq-prev/heads/work--unstitched-mixed 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--unstitched-mixed\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + t-ref-same-val refs/ffq-prev/heads/work--unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + local name=refs/ffq-prev/heads/work--unstitched-mixed 804s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + t_ref_names+=("$name") 804s + for g in $* 804s + t-ref-same refs/ffq-prev/heads/unstitched-mixed 804s + local name=refs/ffq-prev/heads/unstitched-mixed 804s + local val 804s ++ t-git-get-ref refs/ffq-prev/heads/unstitched-mixed 804s ++ local ref=refs/ffq-prev/heads/unstitched-mixed 804s ++ case "$ref" in 804s ++ git show-ref -d refs/ffq-prev/heads/unstitched-mixed 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/unstitched-mixed\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + t-ref-same-val refs/ffq-prev/heads/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + local name=refs/ffq-prev/heads/unstitched-mixed 804s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 804s + t_ref_names+=("$name") 804s + t-refs-notexist refs/debrebase-last/heads/work--unstitched-mixed 804s + local val 804s + for g in $* 804s ++ t-git-get-ref refs/debrebase-last/heads/work--unstitched-mixed 804s ++ local ref=refs/debrebase-last/heads/work--unstitched-mixed 804s ++ case "$ref" in 804s ++ git show-ref -d refs/debrebase-last/heads/work--unstitched-mixed 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--unstitched-mixed\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s ++ test 1 = 1 804s + val= 804s + '[' x '!=' x ']' 804s + checkletters=l 804s + '[' xl '!=' x ']' 804s + : '---- unstitched-mixed ...l ----' 804s + make_check l 804s + case "$1" in 804s + git diff --quiet HEAD refs/heads/before-work--unstitched-mixed -- :. ':!debian/patches' 804s + t-gdr-good laundered 804s + local state=laundered 804s + local beforetag= 804s + case $state in 804s + git diff --quiet -- :. ':!debian/patches' 804s + LC_MESSAGES=C 804s + t-git-debrebase status 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D status 804s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 804s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 804s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Type" => "Upstream","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 804s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 804s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 804s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 804s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}]} 804s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 804s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 804s git-debrebase = Upstream {"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0,"Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n"} 804s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 804s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 804s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"} 804s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 804s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 804s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 804s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 804s git-debrebase = Upstream {"Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"} 804s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 804s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 804s git-debrebase = Packaging {"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"Type" => "Packaging"} 804s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 804s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 804s git-debrebase = Packaging {"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n"} 804s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 804s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 804s git-debrebase = Packaging {"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 804s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 804s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 804s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169"} 804s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 804s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 804s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}]} 804s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 804s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 804s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 804s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 804s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 804s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 804s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor"} 804s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel--unstitched-mixed 804s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 804s ' 804s + case $state in 804s + egrep '^ *branch is laundered' ../status.check 804s branch is laundered 804s + t-gdr-good-analyse HEAD laundered 804s + local head=HEAD 804s + local state=laundered 804s + local wsfx= 804s + local etypes bwtip 804s + case $state in 804s + etypes=Upstream 804s ++ t-git-debrebase breakwater 804s ++ local gdr=git-debrebase 804s ++ : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s ++ git-debrebase --dgit=dgit -D breakwater 804s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 804s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 804s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Ix" => 0}],"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb"} 804s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 804s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0,"Differs" => 2}]} 804s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 804s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0}],"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec"} 804s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 804s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 804s git-debrebase = Upstream {"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Parents" => [{"Ix" => 0,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Type" => "Upstream","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 804s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Parents" => [{"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3"} 804s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 804s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 804s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}]} 804s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 804s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 804s git-debrebase = Upstream {"Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Parents" => [{"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b"} 804s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 804s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 804s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 804s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 804s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 804s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}],"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"} 804s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 804s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 804s git-debrebase = Packaging {"Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71"} 804s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 804s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 804s git-debrebase = Packaging {"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Type" => "Packaging","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 804s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 804s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog"} 804s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 804s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 804s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 804s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 804s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 804s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 804s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 804s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 804s ' 804s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + anal=../anal 804s + t-git-debrebase analyse HEAD 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D analyse HEAD 804s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 804s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 804s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 804s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2}],"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 804s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 804s git-debrebase = Upstream {"Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0,"Differs" => 2}],"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 804s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 804s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 804s git-debrebase = Upstream {"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Type" => "Upstream","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"Ix" => 0,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 804s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 804s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 804s git-debrebase = Upstream {"Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Type" => "Upstream"} 804s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 804s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 804s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Parents" => [{"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2}]} 804s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 804s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 804s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8"} 804s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 804s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 804s git-debrebase = Upstream {"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 804s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 804s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}]} 804s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 804s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 804s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 804s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 804s git-debrebase = Packaging {"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}],"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 804s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 804s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 804s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Type" => "Packaging"} 804s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 804s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 804s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog"} 804s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 804s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 804s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}]} 804s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 804s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 804s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 804s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]]} 804s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 804s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 804s ' 804s ++ git rev-parse HEAD 804s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 804s + exec 804s + local cid ctype info nparents 804s + read cid ctype info 804s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 804s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 804s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s + enparents=1 804s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 804s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 804s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 804s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 804s + enparents=1 804s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 804s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 804s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s + enparents=1 804s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 804s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 804s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s + enparents=1 804s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 804s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 804s + local parents=e143304e38e5e9a822f93056dad834788c62e198 804s + expect=e143304e38e5e9a822f93056dad834788c62e198 804s + enparents=1 804s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo e143304e38e5e9a822f93056dad834788c62e198 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 804s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 804s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 804s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 804s + enparents=1 804s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 804s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 804s + local cetype=Upstream 804s + '[' xUpstream = xUpstream ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 804s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + enparents=1 804s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 804s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + local cetype=Upstream 804s + '[' xPackaging = xUpstream ']' 804s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s + enparents=1 804s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 804s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 804s + bwtip= 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 804s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 804s + etypes=Packaging 804s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 804s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s + local cetype=Packaging 804s + '[' xPackaging = xPackaging ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 804s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s + enparents=1 804s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 804s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 804s + etypes=Packaging 804s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 804s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s + local cetype=Packaging 804s + '[' xPackaging = xPackaging ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 804s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s + enparents=1 804s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 804s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 804s + etypes=Packaging 804s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 804s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s + local cetype=Packaging 804s + '[' xPackaging = xPackaging ']' 804s + cetype=SAME 804s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 804s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 804s + expect=809643e5389def220ea36d61f2d3dd504603e95a 804s + enparents=1 804s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 804s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 804s + etypes=Packaging 804s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 804s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 804s + local cetype=Packaging 804s + '[' xChangelog = xPackaging ']' 804s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 804s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 804s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 804s + enparents=1 804s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 804s + etypes=Packaging 804s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 804s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 804s + local cetype=Packaging 804s + '[' xChangelog = xPackaging ']' 804s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 804s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s + enparents=1 804s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 804s + etypes=Packaging 804s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s ++ wc -w 804s + local cnparents=1 804s + test 1 = 1 804s ++ for f in $parents 804s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s ++ wc -w 804s ++ t-sort -u 804s ++ LC_COLLATE=C 804s ++ sort -u 804s + local cndparents=1 804s + test 1 = 1 804s + case "$parents" in 804s + case "$ctype" in 804s + read cid ctype info 804s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 804s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s + local cetype=Packaging 804s + '[' xAnchor = xPackaging ']' 804s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 804s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 804s + enparents=1 804s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 804s + case "$ctype/$cetype" in 804s + case "$ctype/$etypes" in 804s + case "$cetype" in 804s + case "$ctype" in 804s + break 804s + checkletters= 804s + '[' x '!=' x ']' 804s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 804s + work=work--raw-converted-from-gbp 804s + : '---------- raw-converted-from-gbp ----------' 804s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 804s + git update-ref --stdin 804s + sed s/raw-converted-from-gbp/work--raw-converted-from-gbp/ 804s + git checkout work--raw-converted-from-gbp 804s Switched to branch 'work--raw-converted-from-gbp' 804s + checkletters=nU 804s + shift 804s + before=before-work--raw-converted-from-gbp 804s + git branch before-work--raw-converted-from-gbp 804s + local xopts= 804s + case "$checkletters" in 804s + case "$checkletters" in 804s + case "$checkletters" in 804s + case "$checkletters" in 804s + t-git-debrebase 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D 804s git-debrebase ffq_prev_branchinfo branch current refs/heads/work--raw-converted-from-gbp 804s git-debrebase ffq check_specs * 804s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 804s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 804s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 804s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}]} 804s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 804s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 804s git-debrebase = Upstream {"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 804s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 804s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 804s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 804s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 804s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 804s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 804s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 804s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 804s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 804s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 804s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 804s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 804s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 804s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 804s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 804s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 804s git-debrebase: laundered (head was 178896af44c5b02e05a3442df6c33233b6acb807) 804s git-debrebase >= update refs/ffq-prev/heads/work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 804s git-debrebase >= delete refs/debrebase-last/heads/work--raw-converted-from-gbp 804s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 804s git-debrebase >$ 804s Recorded previous head for preservation 804s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 804s ' 804s + peel=peel--raw-converted-from-gbp 804s + git checkout -b peel--raw-converted-from-gbp 804s Switched to a new branch 'peel--raw-converted-from-gbp' 804s + t-clean-on-branch peel--raw-converted-from-gbp 804s + t-output '## peel--raw-converted-from-gbp' git status -b --porcelain 804s + printf '%s\n' '## peel--raw-converted-from-gbp' 804s + shift 804s + git status -b --porcelain 804s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 804s + : '---------- raw-converted-from-gbp nU ----------' 804s + '[' xnU '!=' x ']' 804s + : '---- raw-converted-from-gbp ...nU ----' 804s + make_check nU 804s + case "$1" in 804s + t-refs-same-start 804s + unset t_ref_val 804s + t_ref_names=() 804s + t-refs-same refs/heads/before-work--raw-converted-from-gbp refs/heads/peel--raw-converted-from-gbp 804s + local g 804s + for g in $* 804s + t-ref-same refs/heads/before-work--raw-converted-from-gbp 804s + local name=refs/heads/before-work--raw-converted-from-gbp 804s + local val 804s ++ t-git-get-ref refs/heads/before-work--raw-converted-from-gbp 804s ++ local ref=refs/heads/before-work--raw-converted-from-gbp 804s ++ case "$ref" in 804s ++ git show-ref -d refs/heads/before-work--raw-converted-from-gbp 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t-ref-same-val refs/heads/before-work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 804s + local name=refs/heads/before-work--raw-converted-from-gbp 804s + local val=178896af44c5b02e05a3442df6c33233b6acb807 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t_ref_names+=("$name") 804s + for g in $* 804s + t-ref-same refs/heads/peel--raw-converted-from-gbp 804s + local name=refs/heads/peel--raw-converted-from-gbp 804s + local val 804s ++ t-git-get-ref refs/heads/peel--raw-converted-from-gbp 804s ++ local ref=refs/heads/peel--raw-converted-from-gbp 804s ++ case "$ref" in 804s ++ git show-ref -d refs/heads/peel--raw-converted-from-gbp 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/heads/peel--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t-ref-same-val refs/heads/peel--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 804s + local name=refs/heads/peel--raw-converted-from-gbp 804s + local val=178896af44c5b02e05a3442df6c33233b6acb807 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t_ref_names+=("$name") 804s + checkletters=U 804s + '[' xU '!=' x ']' 804s + : '---- raw-converted-from-gbp ...U ----' 804s + make_check U 804s + case "$1" in 804s + t-refs-same-start 804s + unset t_ref_val 804s + t_ref_names=() 804s + t-refs-same refs/heads/before-work--raw-converted-from-gbp refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + local g 804s + for g in $* 804s + t-ref-same refs/heads/before-work--raw-converted-from-gbp 804s + local name=refs/heads/before-work--raw-converted-from-gbp 804s + local val 804s ++ t-git-get-ref refs/heads/before-work--raw-converted-from-gbp 804s ++ local ref=refs/heads/before-work--raw-converted-from-gbp 804s ++ case "$ref" in 804s ++ git show-ref -d refs/heads/before-work--raw-converted-from-gbp 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/heads/before-work--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t-ref-same-val refs/heads/before-work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 804s + local name=refs/heads/before-work--raw-converted-from-gbp 804s + local val=178896af44c5b02e05a3442df6c33233b6acb807 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t_ref_names+=("$name") 804s + for g in $* 804s + t-ref-same refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + local name=refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + local val 804s ++ t-git-get-ref refs/ffq-prev/heads/work--raw-converted-from-gbp 804s ++ local ref=refs/ffq-prev/heads/work--raw-converted-from-gbp 804s ++ case "$ref" in 804s ++ git show-ref -d refs/ffq-prev/heads/work--raw-converted-from-gbp 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s + val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t-ref-same-val refs/ffq-prev/heads/work--raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 804s + local name=refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + local val=178896af44c5b02e05a3442df6c33233b6acb807 804s + case "${t_ref_val-unset}" in 804s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 804s + t_ref_names+=("$name") 804s + make_check u 804s + case "$1" in 804s + t-git-get-ref refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + local ref=refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + case "$ref" in 804s + git show-ref -d refs/ffq-prev/heads/work--raw-converted-from-gbp 804s + perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s 178896af44c5b02e05a3442df6c33233b6acb807 804s + t-refs-notexist refs/debrebase-last/heads/work--raw-converted-from-gbp 804s + local val 804s + for g in $* 804s ++ t-git-get-ref refs/debrebase-last/heads/work--raw-converted-from-gbp 804s ++ local ref=refs/debrebase-last/heads/work--raw-converted-from-gbp 804s ++ case "$ref" in 804s ++ git show-ref -d refs/debrebase-last/heads/work--raw-converted-from-gbp 804s ++ perl -ne ' 804s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work--raw-converted-from-gbp\E(?:\^\{\})?$#; 804s END { print "$x\n" if length $x; } 804s ' 804s ++ test 1 = 1 804s + val= 804s + '[' x '!=' x ']' 804s + checkletters= 804s + '[' x '!=' x ']' 804s + subcmd stitch Ns Nu Sltf Stf Ns 804s + local subcmd=stitch 804s + shift 804s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 804s + work=work-stitch-stitched-laundered 804s + : '---------- stitch stitched-laundered ----------' 804s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 804s + git update-ref --stdin 804s + sed s/stitched-laundered/work-stitch-stitched-laundered/ 804s + git checkout work-stitch-stitched-laundered 804s Switched to branch 'work-stitch-stitched-laundered' 804s + checkletters=Ns 804s + shift 804s + before=before-work-stitch-stitched-laundered 804s + git branch before-work-stitch-stitched-laundered 804s + local xopts= 804s + case "$checkletters" in 804s + case "$checkletters" in 804s + case "$checkletters" in 804s + t-expect-fail E:. t-git-debrebase stitch 804s + local mpat=E:. 804s + shift 804s + set +o pipefail 804s + LC_MESSAGES=C 804s + LANGUAGE=C 804s + t-git-debrebase stitch 804s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D stitch 804s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 804s 804s git-debrebase: error: No ffq-prev to stitch. 804s + local 'ps=255 0' 804s + set -o pipefail 804s + case $ps in 804s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 804s + local mpat=E:. 804s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 804s + local grepper=fgrep 804s + case "$mpat" in 804s + case "$mpat" in 804s + grepper=egrep 804s + mpat=. 804s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D stitch 804s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 804s git-debrebase: error: No ffq-prev to stitch. 804s + xopts+=' --noop-ok' 804s + next_checkletter 804s + checkletters=s 804s + case "$checkletters" in 804s + t-git-debrebase --noop-ok stitch 804s + local gdr=git-debrebase 804s + : ' 804s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 804s + git-debrebase --dgit=dgit -D --noop-ok stitch 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-laundered 805s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s + peel=peel-stitch-stitched-laundered 805s + git checkout -b peel-stitch-stitched-laundered 805s Switched to a new branch 'peel-stitch-stitched-laundered' 805s + t-clean-on-branch peel-stitch-stitched-laundered 805s + t-output '## peel-stitch-stitched-laundered' git status -b --porcelain 805s + printf '%s\n' '## peel-stitch-stitched-laundered' 805s + shift 805s + git status -b --porcelain 805s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 805s + : '---------- stitch stitched-laundered s ----------' 805s + '[' xs '!=' x ']' 805s + : '---- stitch stitched-laundered ...s ----' 805s + make_check s 805s + case "$1" in 805s + t-refs-notexist refs/ffq-prev/heads/work-stitch-stitched-laundered 805s + local val 805s + for g in $* 805s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-stitched-laundered 805s ++ local ref=refs/ffq-prev/heads/work-stitch-stitched-laundered 805s ++ case "$ref" in 805s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-stitched-laundered 805s ++ perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-stitched-laundered\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s ++ test 1 = 1 805s + val= 805s + '[' x '!=' x ']' 805s + t-refs-same-start 805s + unset t_ref_val 805s + t_ref_names=() 805s + t-refs-same refs/debrebase-last/heads/work-stitch-stitched-laundered refs/debrebase-last/heads/stitched-laundered 805s + local g 805s + for g in $* 805s + t-ref-same refs/debrebase-last/heads/work-stitch-stitched-laundered 805s + local name=refs/debrebase-last/heads/work-stitch-stitched-laundered 805s + local val 805s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-stitched-laundered 805s ++ local ref=refs/debrebase-last/heads/work-stitch-stitched-laundered 805s ++ case "$ref" in 805s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-stitched-laundered 805s ++ perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-stitched-laundered\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + t-ref-same-val refs/debrebase-last/heads/work-stitch-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + local name=refs/debrebase-last/heads/work-stitch-stitched-laundered 805s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + case "${t_ref_val-unset}" in 805s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + t_ref_names+=("$name") 805s + for g in $* 805s + t-ref-same refs/debrebase-last/heads/stitched-laundered 805s + local name=refs/debrebase-last/heads/stitched-laundered 805s + local val 805s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 805s ++ local ref=refs/debrebase-last/heads/stitched-laundered 805s ++ case "$ref" in 805s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 805s ++ perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + local name=refs/debrebase-last/heads/stitched-laundered 805s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + case "${t_ref_val-unset}" in 805s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + t_ref_names+=("$name") 805s + t-has-ancestor HEAD refs/debrebase-last/heads/work-stitch-stitched-laundered 805s + local now 805s ++ git rev-parse HEAD 805s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + local ancestor 805s ++ git rev-parse 'HEAD^{}' 805s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + local mbase 805s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 805s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 805s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 805s + checkletters= 805s + '[' x '!=' x ']' 805s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 805s + work=work-stitch-stitched-mixed 805s + : '---------- stitch stitched-mixed ----------' 805s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 805s + git update-ref --stdin 805s + sed s/stitched-mixed/work-stitch-stitched-mixed/ 805s + git checkout work-stitch-stitched-mixed 805s Switched to branch 'work-stitch-stitched-mixed' 805s + checkletters=Nu 805s + shift 805s + before=before-work-stitch-stitched-mixed 805s + git branch before-work-stitch-stitched-mixed 805s + local xopts= 805s + case "$checkletters" in 805s + case "$checkletters" in 805s + case "$checkletters" in 805s + t-expect-fail E:. t-git-debrebase stitch 805s + local mpat=E:. 805s + shift 805s + set +o pipefail 805s + LC_MESSAGES=C 805s + LANGUAGE=C 805s + t-git-debrebase stitch 805s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D stitch 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 805s 805s git-debrebase: error: No ffq-prev to stitch. 805s + local 'ps=255 0' 805s + set -o pipefail 805s + case $ps in 805s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 805s + local mpat=E:. 805s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 805s + local grepper=fgrep 805s + case "$mpat" in 805s + case "$mpat" in 805s + grepper=egrep 805s + mpat=. 805s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D stitch 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 805s git-debrebase: error: No ffq-prev to stitch. 805s + xopts+=' --noop-ok' 805s + next_checkletter 805s + checkletters=u 805s + case "$checkletters" in 805s + t-git-debrebase --noop-ok stitch 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D --noop-ok stitch 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-stitched-mixed 805s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s + peel=peel-stitch-stitched-mixed 805s + git checkout -b peel-stitch-stitched-mixed 805s Switched to a new branch 'peel-stitch-stitched-mixed' 805s + t-clean-on-branch peel-stitch-stitched-mixed 805s + t-output '## peel-stitch-stitched-mixed' git status -b --porcelain 805s + printf '%s\n' '## peel-stitch-stitched-mixed' 805s + shift 805s + git status -b --porcelain 805s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 805s + : '---------- stitch stitched-mixed u ----------' 805s + '[' xu '!=' x ']' 805s + : '---- stitch stitched-mixed ...u ----' 805s + make_check u 805s + case "$1" in 805s + t-git-get-ref refs/ffq-prev/heads/work-stitch-stitched-mixed 805s + local ref=refs/ffq-prev/heads/work-stitch-stitched-mixed 805s + case "$ref" in 805s + git show-ref -d refs/ffq-prev/heads/work-stitch-stitched-mixed 805s + perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-stitched-mixed\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s + test 1 = 1 805s + t-refs-notexist refs/debrebase-last/heads/work-stitch-stitched-mixed 805s + local val 805s + for g in $* 805s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-stitched-mixed 805s ++ local ref=refs/debrebase-last/heads/work-stitch-stitched-mixed 805s ++ case "$ref" in 805s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-stitched-mixed 805s ++ perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-stitched-mixed\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s ++ test 1 = 1 805s + val= 805s + '[' x '!=' x ']' 805s + checkletters= 805s + '[' x '!=' x ']' 805s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 805s + work=work-stitch-unstitched-laundered 805s + : '---------- stitch unstitched-laundered ----------' 805s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 805s + git update-ref --stdin 805s + sed s/unstitched-laundered/work-stitch-unstitched-laundered/ 805s + git checkout work-stitch-unstitched-laundered 805s Switched to branch 'work-stitch-unstitched-laundered' 805s + checkletters=Sltf 805s + shift 805s + before=before-work-stitch-unstitched-laundered 805s + git branch before-work-stitch-unstitched-laundered 805s + local xopts= 805s + case "$checkletters" in 805s + case "$checkletters" in 805s + case "$checkletters" in 805s + case "$checkletters" in 805s + t-git-debrebase stitch 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D stitch 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-unstitched-laundered 805s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 805s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 805s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 805s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 805s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 805s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream"} 805s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 805s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 805s git-debrebase = Upstream {"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 805s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 805s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 805s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 805s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 805s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 805s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream"} 805s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 805s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 805s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 805s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 805s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 805s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 805s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 805s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 805s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging"} 805s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 805s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 805s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging"} 805s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 805s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 805s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 805s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 805s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 805s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 805s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 805s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 805s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}]} 805s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 805s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 805s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog"} 805s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 805s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 805s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 805s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 805s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 805s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 805s git-debrebase >= delete refs/ffq-prev/heads/work-stitch-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 805s git-debrebase >= update refs/debrebase-last/heads/work-stitch-unstitched-laundered 16d24eb7d6910efcc861bf07c151b5dcfed7e640 0000000000000000000000000000000000000000 805s git-debrebase >= update HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 805s git-debrebase >$ 805s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s + peel=peel-stitch-unstitched-laundered 805s + git checkout -b peel-stitch-unstitched-laundered 805s Switched to a new branch 'peel-stitch-unstitched-laundered' 805s + t-clean-on-branch peel-stitch-unstitched-laundered 805s + t-output '## peel-stitch-unstitched-laundered' git status -b --porcelain 805s + printf '%s\n' '## peel-stitch-unstitched-laundered' 805s + shift 805s + git status -b --porcelain 805s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 805s + : '---------- stitch unstitched-laundered Sltf ----------' 805s + '[' xSltf '!=' x ']' 805s + : '---- stitch unstitched-laundered ...Sltf ----' 805s + make_check Sltf 805s + case "$1" in 805s + t-refs-notexist refs/ffq-prev/heads/work-stitch-unstitched-laundered 805s + local val 805s + for g in $* 805s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-unstitched-laundered 805s ++ local ref=refs/ffq-prev/heads/work-stitch-unstitched-laundered 805s ++ case "$ref" in 805s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-unstitched-laundered 805s ++ perl -ne ' 805s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-unstitched-laundered\E(?:\^\{\})?$#; 805s END { print "$x\n" if length $x; } 805s ' 805s ++ test 1 = 1 805s + val= 805s + '[' x '!=' x ']' 805s + t-refs-same-start refs/debrebase-last/heads/work-stitch-unstitched-laundered 805s + unset t_ref_val 805s + t_ref_names=() 805s + t-ref-head 805s + local val 805s ++ git rev-parse HEAD 805s + val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 805s + t-ref-same-val HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 805s + local name=HEAD 805s + local val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 805s + case "${t_ref_val-unset}" in 805s + t_ref_val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 805s + t_ref_names+=("$name") 805s + git diff --quiet 'HEAD^1' 805s + git diff 'HEAD^2' 805s + grep unstitched-laundered 805s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 805s - // upstream subcommands refs/heads/unstitched-laundered 1 805s -+// both! subcommands refs/heads/unstitched-laundered 1 805s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 805s -+// upstream subcommands refs/heads/unstitched-laundered 1 805s + git reset --hard 'HEAD^1' 805s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 805s + checkletters=ltf 805s + '[' xltf '!=' x ']' 805s + : '---- stitch unstitched-laundered ...ltf ----' 805s + make_check ltf 805s + case "$1" in 805s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-laundered -- :. ':!debian/patches' 805s + t-gdr-good laundered 805s + local state=laundered 805s + local beforetag= 805s + case $state in 805s + git diff --quiet -- :. ':!debian/patches' 805s + LC_MESSAGES=C 805s + t-git-debrebase status 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D status 805s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 805s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 805s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 805s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 805s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 805s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"} 805s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 805s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 805s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}]} 805s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 805s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 805s git-debrebase = Upstream {"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 805s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 805s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 805s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 805s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 805s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 805s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 805s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 805s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 805s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 805s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 805s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 805s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging"} 805s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 805s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 805s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 805s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 805s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 805s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 805s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 805s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 805s git-debrebase = Packaging {"Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 805s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 805s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 805s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 805s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 805s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 805s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 805s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 805s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 805s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 805s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 805s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-stitch-unstitched-laundered 805s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s + case $state in 805s + egrep '^ *branch is laundered' ../status.check 805s branch is laundered 805s + t-gdr-good-analyse HEAD laundered 805s + local head=HEAD 805s + local state=laundered 805s + local wsfx= 805s + local etypes bwtip 805s + case $state in 805s + etypes=Upstream 805s ++ t-git-debrebase breakwater 805s ++ local gdr=git-debrebase 805s ++ : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s ++ git-debrebase --dgit=dgit -D breakwater 805s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 805s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 805s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 805s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 805s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 805s git-debrebase = Upstream {"Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 805s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 805s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 805s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 805s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 805s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 805s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Type" => "Upstream"} 805s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 805s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 805s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 805s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 805s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 805s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 805s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 805s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 805s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 805s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 805s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 805s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 805s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 805s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 805s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 805s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 805s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 805s git-debrebase = Packaging {"Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 805s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 805s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 805s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 805s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 805s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 805s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}]} 805s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 805s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 805s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 805s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 805s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 805s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 805s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 805s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 805s + anal=../anal 805s + t-git-debrebase analyse HEAD 805s + local gdr=git-debrebase 805s + : ' 805s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 805s + git-debrebase --dgit=dgit -D analyse HEAD 805s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 805s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 805s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 805s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 805s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 805s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 805s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream"} 805s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 805s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 805s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"} 805s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 805s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 805s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream"} 805s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 805s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 805s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 805s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 805s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 805s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 805s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 805s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 805s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 805s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 805s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 805s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}]} 805s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 805s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 805s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 805s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 805s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 805s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging"} 805s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 805s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 805s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}]} 805s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 805s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 805s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Msg" => "dch -r -D unstable\n"} 805s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 805s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 805s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 805s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 805s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 805s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 805s git-debrebase = Anchor {"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 805s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 805s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 805s ' 805s ++ git rev-parse HEAD 805s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 805s + exec 805s + local cid ctype info nparents 805s + read cid ctype info 805s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 805s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 805s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s + enparents=1 805s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 805s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 805s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s + enparents=1 805s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 805s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 805s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 805s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 805s + enparents=1 805s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 805s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 805s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 805s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 805s + enparents=1 805s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 805s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 805s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s + enparents=1 805s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 805s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 805s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s + enparents=1 805s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s ++ t-sort -u 805s ++ wc -w 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 805s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s + local cetype=Upstream 805s + '[' xUpstream = xUpstream ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 805s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 805s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 805s + enparents=1 805s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 805s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 805s + local cetype=Upstream 805s + '[' xPackaging = xUpstream ']' 805s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 805s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s + enparents=1 805s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 805s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 805s + bwtip= 805s + case "$cetype" in 805s + case "$ctype" in 805s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 805s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 805s + etypes=Packaging 805s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 805s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s + local cetype=Packaging 805s + '[' xPackaging = xPackaging ']' 805s + cetype=SAME 805s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 805s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s + enparents=1 805s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s + case "$ctype/$cetype" in 805s + case "$ctype/$etypes" in 805s + case "$cetype" in 805s + case "$ctype" in 805s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 805s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 805s + etypes=Packaging 805s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s ++ wc -w 805s + local cnparents=1 805s + test 1 = 1 805s ++ for f in $parents 805s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s ++ wc -w 805s ++ t-sort -u 805s ++ LC_COLLATE=C 805s ++ sort -u 805s + local cndparents=1 805s + test 1 = 1 805s + case "$parents" in 805s + case "$ctype" in 805s + read cid ctype info 805s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 805s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 805s + local cetype=Packaging 805s + '[' xPackaging = xPackaging ']' 806s + cetype=SAME 806s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 806s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 806s + expect=515e62b8d591fcc68597383b955d898db71abc6c 806s + enparents=1 806s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 806s + case "$ctype/$cetype" in 806s + case "$ctype/$etypes" in 806s + case "$cetype" in 806s + case "$ctype" in 806s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 806s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 806s + etypes=Packaging 806s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 806s ++ wc -w 806s + local cnparents=1 806s + test 1 = 1 806s ++ for f in $parents 806s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 806s ++ wc -w 806s ++ t-sort -u 806s ++ LC_COLLATE=C 806s ++ sort -u 806s + local cndparents=1 806s + test 1 = 1 806s + case "$parents" in 806s + case "$ctype" in 806s + read cid ctype info 806s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 806s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 806s + local cetype=Packaging 806s + '[' xPackaging = xPackaging ']' 806s + cetype=SAME 806s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 806s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 806s + expect=809643e5389def220ea36d61f2d3dd504603e95a 806s + enparents=1 806s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 806s + case "$ctype/$cetype" in 806s + case "$ctype/$etypes" in 806s + case "$cetype" in 806s + case "$ctype" in 806s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 806s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 806s + etypes=Packaging 806s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 806s ++ wc -w 806s + local cnparents=1 806s + test 1 = 1 806s ++ for f in $parents 806s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 806s ++ wc -w 806s ++ t-sort -u 806s ++ LC_COLLATE=C 806s ++ sort -u 806s + local cndparents=1 806s + test 1 = 1 806s + case "$parents" in 806s + case "$ctype" in 806s + read cid ctype info 806s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 806s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 806s + local cetype=Packaging 806s + '[' xChangelog = xPackaging ']' 806s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 806s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 806s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 806s + enparents=1 806s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 806s + case "$ctype/$cetype" in 806s + case "$ctype/$etypes" in 806s + case "$cetype" in 806s + case "$ctype" in 806s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 806s + etypes=Packaging 806s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 806s ++ wc -w 806s + local cnparents=1 806s + test 1 = 1 806s ++ for f in $parents 806s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 806s ++ wc -w 806s ++ t-sort -u 806s ++ LC_COLLATE=C 806s ++ sort -u 806s + local cndparents=1 806s + test 1 = 1 806s + case "$parents" in 806s + case "$ctype" in 806s + read cid ctype info 806s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 806s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 806s + local cetype=Packaging 806s + '[' xChangelog = xPackaging ']' 806s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 806s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s + enparents=1 806s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s + case "$ctype/$cetype" in 806s + case "$ctype/$etypes" in 806s + case "$cetype" in 806s + case "$ctype" in 806s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 806s + etypes=Packaging 806s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s ++ wc -w 806s + local cnparents=1 806s + test 1 = 1 806s ++ for f in $parents 806s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s ++ wc -w 806s ++ t-sort -u 806s ++ LC_COLLATE=C 806s ++ sort -u 806s + local cndparents=1 806s + test 1 = 1 806s + case "$parents" in 806s + case "$ctype" in 806s + read cid ctype info 806s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 806s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s + local cetype=Packaging 806s + '[' xAnchor = xPackaging ']' 806s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 806s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 806s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 806s + enparents=1 806s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 806s + case "$ctype/$cetype" in 806s + case "$ctype/$etypes" in 806s + case "$cetype" in 806s + case "$ctype" in 806s + break 806s + checkletters=tf 806s + '[' xtf '!=' x ']' 806s + : '---- stitch unstitched-laundered ...tf ----' 806s + make_check tf 806s + case "$1" in 806s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-laundered 806s + checkletters=f 806s + '[' xf '!=' x ']' 806s + : '---- stitch unstitched-laundered ...f ----' 806s + make_check f 806s + case "$1" in 806s + t-has-ancestor HEAD refs/heads/before-work-stitch-unstitched-laundered 806s + local now 806s ++ git rev-parse HEAD 806s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s + local ancestor 806s ++ git rev-parse 'HEAD^{}' 806s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s + local mbase 806s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 806s + checkletters= 806s + '[' x '!=' x ']' 806s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 806s + work=work-stitch-unstitched-mixed 806s + : '---------- stitch unstitched-mixed ----------' 806s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 806s + git update-ref --stdin 806s + sed s/unstitched-mixed/work-stitch-unstitched-mixed/ 806s + git checkout work-stitch-unstitched-mixed 806s Switched to branch 'work-stitch-unstitched-mixed' 806s + checkletters=Stf 806s + shift 806s + before=before-work-stitch-unstitched-mixed 806s + git branch before-work-stitch-unstitched-mixed 806s + local xopts= 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + t-git-debrebase stitch 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D stitch 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-unstitched-mixed 806s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 806s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 806s git-debrebase = Mixed {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Parents" => [{"Ix" => 0,"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367"}],"Type" => "Mixed"} 806s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 806s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 806s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Parents" => [{"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0,"Differs" => 2}],"Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Type" => "Upstream"} 806s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 806s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 806s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Parents" => [{"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32,"Ix" => 0}],"Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "Packaging"} 806s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 806s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 806s git-debrebase = AddPatches {"Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Parents" => [{"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Ix" => 0,"Differs" => 4}],"Type" => "AddPatches","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n"} 806s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 806s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 806s git-debrebase = Mixed {"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Parents" => [{"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0,"Differs" => 34}],"Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84"} 806s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 806s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 806s git-debrebase = Upstream {"Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Parents" => [{"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"} 806s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 806s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 806s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166"}],"Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n"} 806s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 806s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 806s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 806s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 806s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 806s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Parents" => [{"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2,"Ix" => 0}],"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Type" => "Upstream"} 806s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 806s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 806s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 806s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 806s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 806s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -r -D unstable\n"} 806s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 806s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 806s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog"} 806s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 806s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 806s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 806s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 806s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 806s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 806s git-debrebase >= delete refs/ffq-prev/heads/work-stitch-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 806s git-debrebase >= update refs/debrebase-last/heads/work-stitch-unstitched-mixed bfd2f4c9441a5910931482e80f181720b01f12a3 0000000000000000000000000000000000000000 806s git-debrebase >= update HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 9b56b9c2600dc10b9eec97d535d89870476de971 806s git-debrebase >$ 806s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 806s ' 806s + peel=peel-stitch-unstitched-mixed 806s + git checkout -b peel-stitch-unstitched-mixed 806s Switched to a new branch 'peel-stitch-unstitched-mixed' 806s + t-clean-on-branch peel-stitch-unstitched-mixed 806s + t-output '## peel-stitch-unstitched-mixed' git status -b --porcelain 806s + printf '%s\n' '## peel-stitch-unstitched-mixed' 806s + shift 806s + git status -b --porcelain 806s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 806s + : '---------- stitch unstitched-mixed Stf ----------' 806s + '[' xStf '!=' x ']' 806s + : '---- stitch unstitched-mixed ...Stf ----' 806s + make_check Stf 806s + case "$1" in 806s + t-refs-notexist refs/ffq-prev/heads/work-stitch-unstitched-mixed 806s + local val 806s + for g in $* 806s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-unstitched-mixed 806s ++ local ref=refs/ffq-prev/heads/work-stitch-unstitched-mixed 806s ++ case "$ref" in 806s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-unstitched-mixed 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-unstitched-mixed\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + '[' x '!=' x ']' 806s + t-refs-same-start refs/debrebase-last/heads/work-stitch-unstitched-mixed 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-ref-head 806s + local val 806s ++ git rev-parse HEAD 806s + val=bfd2f4c9441a5910931482e80f181720b01f12a3 806s + t-ref-same-val HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 806s + local name=HEAD 806s + local val=bfd2f4c9441a5910931482e80f181720b01f12a3 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=bfd2f4c9441a5910931482e80f181720b01f12a3 806s + t_ref_names+=("$name") 806s + git diff --quiet 'HEAD^1' 806s + git diff 'HEAD^2' 806s + grep unstitched-mixed 806s +Subject: MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 806s + // upstream subcommands refs/heads/unstitched-mixed 1 806s ++// both! subcommands refs/heads/unstitched-mixed 1 806s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 806s ++// upstream subcommands refs/heads/unstitched-mixed 1 806s +// debian subcommands refs/heads/unstitched-mixed 1 806s +// both! subcommands refs/heads/unstitched-mixed 1 806s +// debian subcommands refs/heads/unstitched-mixed 2 806s +// both! subcommands refs/heads/unstitched-mixed 2 806s +// upstream subcommands refs/heads/unstitched-mixed 1 806s +// both! subcommands refs/heads/unstitched-mixed 1 806s +// upstream subcommands refs/heads/unstitched-mixed 2 806s +// both! subcommands refs/heads/unstitched-mixed 2 806s + git reset --hard 'HEAD^1' 806s HEAD is now at 9b56b9c MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 806s + checkletters=tf 806s + '[' xtf '!=' x ']' 806s + : '---- stitch unstitched-mixed ...tf ----' 806s + make_check tf 806s + case "$1" in 806s + git diff --quiet HEAD refs/heads/before-work-stitch-unstitched-mixed 806s + checkletters=f 806s + '[' xf '!=' x ']' 806s + : '---- stitch unstitched-mixed ...f ----' 806s + make_check f 806s + case "$1" in 806s + t-has-ancestor HEAD refs/heads/before-work-stitch-unstitched-mixed 806s + local now 806s ++ git rev-parse HEAD 806s + now=9b56b9c2600dc10b9eec97d535d89870476de971 806s + local ancestor 806s ++ git rev-parse 'HEAD^{}' 806s + ancestor=9b56b9c2600dc10b9eec97d535d89870476de971 806s + local mbase 806s ++ t-git-merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 806s ++ git merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 806s + mbase=9b56b9c2600dc10b9eec97d535d89870476de971 806s + '[' x9b56b9c2600dc10b9eec97d535d89870476de971 '!=' x9b56b9c2600dc10b9eec97d535d89870476de971 ']' 806s + checkletters= 806s + '[' x '!=' x ']' 806s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 806s + work=work-stitch-raw-converted-from-gbp 806s + : '---------- stitch raw-converted-from-gbp ----------' 806s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 806s + git update-ref --stdin 806s + sed s/raw-converted-from-gbp/work-stitch-raw-converted-from-gbp/ 806s + git checkout work-stitch-raw-converted-from-gbp 806s Switched to branch 'work-stitch-raw-converted-from-gbp' 806s + checkletters=Ns 806s + shift 806s + before=before-work-stitch-raw-converted-from-gbp 806s + git branch before-work-stitch-raw-converted-from-gbp 806s + local xopts= 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + t-expect-fail E:. t-git-debrebase stitch 806s + local mpat=E:. 806s + shift 806s + set +o pipefail 806s + LC_MESSAGES=C 806s + LANGUAGE=C 806s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 806s + t-git-debrebase stitch 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D stitch 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 806s 806s git-debrebase: error: No ffq-prev to stitch. 806s + local 'ps=255 0' 806s + set -o pipefail 806s + case $ps in 806s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 806s + local mpat=E:. 806s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 806s + local grepper=fgrep 806s + case "$mpat" in 806s + case "$mpat" in 806s + grepper=egrep 806s + mpat=. 806s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D stitch 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 806s git-debrebase: error: No ffq-prev to stitch. 806s + xopts+=' --noop-ok' 806s + next_checkletter 806s + checkletters=s 806s + case "$checkletters" in 806s + t-git-debrebase --noop-ok stitch 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D --noop-ok stitch 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-stitch-raw-converted-from-gbp 806s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 806s ' 806s + peel=peel-stitch-raw-converted-from-gbp 806s + git checkout -b peel-stitch-raw-converted-from-gbp 806s Switched to a new branch 'peel-stitch-raw-converted-from-gbp' 806s + t-clean-on-branch peel-stitch-raw-converted-from-gbp 806s + t-output '## peel-stitch-raw-converted-from-gbp' git status -b --porcelain 806s + printf '%s\n' '## peel-stitch-raw-converted-from-gbp' 806s + shift 806s + git status -b --porcelain 806s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 806s + : '---------- stitch raw-converted-from-gbp s ----------' 806s + '[' xs '!=' x ']' 806s + : '---- stitch raw-converted-from-gbp ...s ----' 806s + make_check s 806s + case "$1" in 806s + t-refs-notexist refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 806s + local val 806s + for g in $* 806s ++ t-git-get-ref refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 806s ++ local ref=refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 806s ++ case "$ref" in 806s ++ git show-ref -d refs/ffq-prev/heads/work-stitch-raw-converted-from-gbp 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-stitch-raw-converted-from-gbp\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + '[' x '!=' x ']' 806s + t-refs-same-start 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-refs-same refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp refs/debrebase-last/heads/raw-converted-from-gbp 806s + local g 806s + for g in $* 806s + t-ref-same refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s + local name=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s + local val 806s ++ t-git-get-ref refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s ++ local ref=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s ++ case "$ref" in 806s ++ git show-ref -d refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-stitch-raw-converted-from-gbp\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + t-ref-same-val refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s + local name=refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s + local val= 806s + case "${t_ref_val-unset}" in 806s + t_ref_val= 806s + t_ref_names+=("$name") 806s + for g in $* 806s + t-ref-same refs/debrebase-last/heads/raw-converted-from-gbp 806s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 806s + local val 806s ++ t-git-get-ref refs/debrebase-last/heads/raw-converted-from-gbp 806s ++ local ref=refs/debrebase-last/heads/raw-converted-from-gbp 806s ++ case "$ref" in 806s ++ git show-ref -d refs/debrebase-last/heads/raw-converted-from-gbp 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/raw-converted-from-gbp\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + t-ref-same-val refs/debrebase-last/heads/raw-converted-from-gbp 806s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 806s + local val= 806s + case "${t_ref_val-unset}" in 806s + t_ref_val= 806s + t_ref_names+=("$name") 806s + t-has-ancestor HEAD refs/debrebase-last/heads/work-stitch-raw-converted-from-gbp 806s + local now 806s ++ git rev-parse HEAD 806s + now=178896af44c5b02e05a3442df6c33233b6acb807 806s + local ancestor 806s ++ git rev-parse 'HEAD^{}' 806s + ancestor=178896af44c5b02e05a3442df6c33233b6acb807 806s + local mbase 806s ++ t-git-merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 806s ++ git merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 806s + mbase=178896af44c5b02e05a3442df6c33233b6acb807 806s + '[' x178896af44c5b02e05a3442df6c33233b6acb807 '!=' x178896af44c5b02e05a3442df6c33233b6acb807 ']' 806s + checkletters= 806s + '[' x '!=' x ']' 806s + subcmd prepush ns nu Sltf Stf ns 806s + local subcmd=prepush 806s + shift 806s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 806s + work=work-prepush-stitched-laundered 806s + : '---------- prepush stitched-laundered ----------' 806s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 806s + git update-ref --stdin 806s + sed s/stitched-laundered/work-prepush-stitched-laundered/ 806s + git checkout work-prepush-stitched-laundered 806s Switched to branch 'work-prepush-stitched-laundered' 806s + checkletters=ns 806s + shift 806s + before=before-work-prepush-stitched-laundered 806s + git branch before-work-prepush-stitched-laundered 806s + local xopts= 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + t-git-debrebase prepush 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D prepush 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-stitched-laundered 806s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 806s ' 806s + peel=peel-prepush-stitched-laundered 806s + git checkout -b peel-prepush-stitched-laundered 806s Switched to a new branch 'peel-prepush-stitched-laundered' 806s + t-clean-on-branch peel-prepush-stitched-laundered 806s + t-output '## peel-prepush-stitched-laundered' git status -b --porcelain 806s + printf '%s\n' '## peel-prepush-stitched-laundered' 806s + shift 806s + git status -b --porcelain 806s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 806s + : '---------- prepush stitched-laundered ns ----------' 806s + '[' xns '!=' x ']' 806s + : '---- prepush stitched-laundered ...ns ----' 806s + make_check ns 806s + case "$1" in 806s + t-refs-same-start 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-refs-same refs/heads/before-work-prepush-stitched-laundered refs/heads/peel-prepush-stitched-laundered 806s + local g 806s + for g in $* 806s + t-ref-same refs/heads/before-work-prepush-stitched-laundered 806s + local name=refs/heads/before-work-prepush-stitched-laundered 806s + local val 806s ++ t-git-get-ref refs/heads/before-work-prepush-stitched-laundered 806s ++ local ref=refs/heads/before-work-prepush-stitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/heads/before-work-prepush-stitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-stitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t-ref-same-val refs/heads/before-work-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local name=refs/heads/before-work-prepush-stitched-laundered 806s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t_ref_names+=("$name") 806s + for g in $* 806s + t-ref-same refs/heads/peel-prepush-stitched-laundered 806s + local name=refs/heads/peel-prepush-stitched-laundered 806s + local val 806s ++ t-git-get-ref refs/heads/peel-prepush-stitched-laundered 806s ++ local ref=refs/heads/peel-prepush-stitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/heads/peel-prepush-stitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-stitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t-ref-same-val refs/heads/peel-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local name=refs/heads/peel-prepush-stitched-laundered 806s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t_ref_names+=("$name") 806s + checkletters=s 806s + '[' xs '!=' x ']' 806s + : '---- prepush stitched-laundered ...s ----' 806s + make_check s 806s + case "$1" in 806s + t-refs-notexist refs/ffq-prev/heads/work-prepush-stitched-laundered 806s + local val 806s + for g in $* 806s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-stitched-laundered 806s ++ local ref=refs/ffq-prev/heads/work-prepush-stitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-stitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-stitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + '[' x '!=' x ']' 806s + t-refs-same-start 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-refs-same refs/debrebase-last/heads/work-prepush-stitched-laundered refs/debrebase-last/heads/stitched-laundered 806s + local g 806s + for g in $* 806s + t-ref-same refs/debrebase-last/heads/work-prepush-stitched-laundered 806s + local name=refs/debrebase-last/heads/work-prepush-stitched-laundered 806s + local val 806s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-stitched-laundered 806s ++ local ref=refs/debrebase-last/heads/work-prepush-stitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-stitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-stitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t-ref-same-val refs/debrebase-last/heads/work-prepush-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local name=refs/debrebase-last/heads/work-prepush-stitched-laundered 806s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t_ref_names+=("$name") 806s + for g in $* 806s + t-ref-same refs/debrebase-last/heads/stitched-laundered 806s + local name=refs/debrebase-last/heads/stitched-laundered 806s + local val 806s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 806s ++ local ref=refs/debrebase-last/heads/stitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local name=refs/debrebase-last/heads/stitched-laundered 806s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + t_ref_names+=("$name") 806s + t-has-ancestor HEAD refs/debrebase-last/heads/work-prepush-stitched-laundered 806s + local now 806s ++ git rev-parse HEAD 806s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local ancestor 806s ++ git rev-parse 'HEAD^{}' 806s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + local mbase 806s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 806s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 806s + checkletters= 806s + '[' x '!=' x ']' 806s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 806s + work=work-prepush-stitched-mixed 806s + : '---------- prepush stitched-mixed ----------' 806s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 806s + git update-ref --stdin 806s + sed s/stitched-mixed/work-prepush-stitched-mixed/ 806s + git checkout work-prepush-stitched-mixed 806s Switched to branch 'work-prepush-stitched-mixed' 806s + checkletters=nu 806s + shift 806s + before=before-work-prepush-stitched-mixed 806s + git branch before-work-prepush-stitched-mixed 806s + local xopts= 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + t-git-debrebase prepush 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D prepush 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-stitched-mixed 806s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 806s ' 806s + peel=peel-prepush-stitched-mixed 806s + git checkout -b peel-prepush-stitched-mixed 806s Switched to a new branch 'peel-prepush-stitched-mixed' 806s + t-clean-on-branch peel-prepush-stitched-mixed 806s + t-output '## peel-prepush-stitched-mixed' git status -b --porcelain 806s + printf '%s\n' '## peel-prepush-stitched-mixed' 806s + shift 806s + git status -b --porcelain 806s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 806s + : '---------- prepush stitched-mixed nu ----------' 806s + '[' xnu '!=' x ']' 806s + : '---- prepush stitched-mixed ...nu ----' 806s + make_check nu 806s + case "$1" in 806s + t-refs-same-start 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-refs-same refs/heads/before-work-prepush-stitched-mixed refs/heads/peel-prepush-stitched-mixed 806s + local g 806s + for g in $* 806s + t-ref-same refs/heads/before-work-prepush-stitched-mixed 806s + local name=refs/heads/before-work-prepush-stitched-mixed 806s + local val 806s ++ t-git-get-ref refs/heads/before-work-prepush-stitched-mixed 806s ++ local ref=refs/heads/before-work-prepush-stitched-mixed 806s ++ case "$ref" in 806s ++ git show-ref -d refs/heads/before-work-prepush-stitched-mixed 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-stitched-mixed\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=5e0bf3cea3c715230b96aca41156852390014b98 806s + t-ref-same-val refs/heads/before-work-prepush-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 806s + local name=refs/heads/before-work-prepush-stitched-mixed 806s + local val=5e0bf3cea3c715230b96aca41156852390014b98 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 806s + t_ref_names+=("$name") 806s + for g in $* 806s + t-ref-same refs/heads/peel-prepush-stitched-mixed 806s + local name=refs/heads/peel-prepush-stitched-mixed 806s + local val 806s ++ t-git-get-ref refs/heads/peel-prepush-stitched-mixed 806s ++ local ref=refs/heads/peel-prepush-stitched-mixed 806s ++ case "$ref" in 806s ++ git show-ref -d refs/heads/peel-prepush-stitched-mixed 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-stitched-mixed\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + val=5e0bf3cea3c715230b96aca41156852390014b98 806s + t-ref-same-val refs/heads/peel-prepush-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 806s + local name=refs/heads/peel-prepush-stitched-mixed 806s + local val=5e0bf3cea3c715230b96aca41156852390014b98 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 806s + t_ref_names+=("$name") 806s + checkletters=u 806s + '[' xu '!=' x ']' 806s + : '---- prepush stitched-mixed ...u ----' 806s + make_check u 806s + case "$1" in 806s + t-git-get-ref refs/ffq-prev/heads/work-prepush-stitched-mixed 806s + local ref=refs/ffq-prev/heads/work-prepush-stitched-mixed 806s + case "$ref" in 806s + git show-ref -d refs/ffq-prev/heads/work-prepush-stitched-mixed 806s + perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-stitched-mixed\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s + test 1 = 1 806s + t-refs-notexist refs/debrebase-last/heads/work-prepush-stitched-mixed 806s + local val 806s + for g in $* 806s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-stitched-mixed 806s ++ local ref=refs/debrebase-last/heads/work-prepush-stitched-mixed 806s ++ case "$ref" in 806s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-stitched-mixed 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-stitched-mixed\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + '[' x '!=' x ']' 806s + checkletters= 806s + '[' x '!=' x ']' 806s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 806s + work=work-prepush-unstitched-laundered 806s + : '---------- prepush unstitched-laundered ----------' 806s + sed s/unstitched-laundered/work-prepush-unstitched-laundered/ 806s + git update-ref --stdin 806s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 806s + git checkout work-prepush-unstitched-laundered 806s Switched to branch 'work-prepush-unstitched-laundered' 806s + checkletters=Sltf 806s + shift 806s + before=before-work-prepush-unstitched-laundered 806s + git branch before-work-prepush-unstitched-laundered 806s + local xopts= 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + case "$checkletters" in 806s + t-git-debrebase prepush 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D prepush 806s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-unstitched-laundered 806s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 806s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 806s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 806s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 806s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 806s git-debrebase = Upstream {"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 806s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 806s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 806s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 806s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 806s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 806s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 806s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 806s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 806s git-debrebase = Upstream {"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 806s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 806s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 806s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Parents" => [{"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2}],"Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 806s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 806s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 806s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"} 806s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 806s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 806s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"} 806s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 806s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 806s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"} 806s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 806s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 806s git-debrebase = Packaging {"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 806s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 806s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 806s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 806s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 806s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 806s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 806s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 806s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 806s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 806s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 806s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 806s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 806s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 806s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 806s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 806s git-debrebase >= delete refs/ffq-prev/heads/work-prepush-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 806s git-debrebase >= update refs/debrebase-last/heads/work-prepush-unstitched-laundered 16d24eb7d6910efcc861bf07c151b5dcfed7e640 0000000000000000000000000000000000000000 806s git-debrebase >= update HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 806s git-debrebase >$ 806s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 806s ' 806s + peel=peel-prepush-unstitched-laundered 806s + git checkout -b peel-prepush-unstitched-laundered 806s Switched to a new branch 'peel-prepush-unstitched-laundered' 806s + t-clean-on-branch peel-prepush-unstitched-laundered 806s + t-output '## peel-prepush-unstitched-laundered' git status -b --porcelain 806s + printf '%s\n' '## peel-prepush-unstitched-laundered' 806s + shift 806s + git status -b --porcelain 806s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 806s + : '---------- prepush unstitched-laundered Sltf ----------' 806s + '[' xSltf '!=' x ']' 806s + : '---- prepush unstitched-laundered ...Sltf ----' 806s + make_check Sltf 806s + case "$1" in 806s + t-refs-notexist refs/ffq-prev/heads/work-prepush-unstitched-laundered 806s + local val 806s + for g in $* 806s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-unstitched-laundered 806s ++ local ref=refs/ffq-prev/heads/work-prepush-unstitched-laundered 806s ++ case "$ref" in 806s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-unstitched-laundered 806s ++ perl -ne ' 806s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-unstitched-laundered\E(?:\^\{\})?$#; 806s END { print "$x\n" if length $x; } 806s ' 806s ++ test 1 = 1 806s + val= 806s + '[' x '!=' x ']' 806s + t-refs-same-start refs/debrebase-last/heads/work-prepush-unstitched-laundered 806s + unset t_ref_val 806s + t_ref_names=() 806s + t-ref-head 806s + local val 806s ++ git rev-parse HEAD 806s + val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 806s + t-ref-same-val HEAD 16d24eb7d6910efcc861bf07c151b5dcfed7e640 806s + local name=HEAD 806s + local val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 806s + case "${t_ref_val-unset}" in 806s + t_ref_val=16d24eb7d6910efcc861bf07c151b5dcfed7e640 806s + t_ref_names+=("$name") 806s + git diff --quiet 'HEAD^1' 806s + git diff 'HEAD^2' 806s + grep unstitched-laundered 806s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 806s - // upstream subcommands refs/heads/unstitched-laundered 1 806s -+// both! subcommands refs/heads/unstitched-laundered 1 806s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 806s -+// upstream subcommands refs/heads/unstitched-laundered 1 806s + git reset --hard 'HEAD^1' 806s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 806s + checkletters=ltf 806s + '[' xltf '!=' x ']' 806s + : '---- prepush unstitched-laundered ...ltf ----' 806s + make_check ltf 806s + case "$1" in 806s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-laundered -- :. ':!debian/patches' 806s + t-gdr-good laundered 806s + local state=laundered 806s + local beforetag= 806s + case $state in 806s + git diff --quiet -- :. ':!debian/patches' 806s + LC_MESSAGES=C 806s + t-git-debrebase status 806s + local gdr=git-debrebase 806s + : ' 806s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 806s + git-debrebase --dgit=dgit -D status 806s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 806s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 806s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}]} 806s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 806s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 806s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 806s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 806s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 806s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e"} 806s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 806s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 806s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 806s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 806s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 806s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2,"Ix" => 0}],"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 806s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 806s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 806s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}]} 806s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 806s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 806s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream"} 806s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 806s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 806s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 806s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 806s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 806s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}]} 806s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 806s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 806s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 806s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 806s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 806s git-debrebase = Packaging {"Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 806s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 806s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 806s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 806s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 806s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 806s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 806s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 807s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 807s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 807s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 807s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-prepush-unstitched-laundered 807s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 807s ' 807s + case $state in 807s + egrep '^ *branch is laundered' ../status.check 807s branch is laundered 807s + t-gdr-good-analyse HEAD laundered 807s + local head=HEAD 807s + local state=laundered 807s + local wsfx= 807s + local etypes bwtip 807s + case $state in 807s + etypes=Upstream 807s ++ t-git-debrebase breakwater 807s ++ local gdr=git-debrebase 807s ++ : ' 807s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 807s ++ git-debrebase --dgit=dgit -D breakwater 807s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 807s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 807s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 807s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 807s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream"} 807s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 807s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 807s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2,"Ix" => 0}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 807s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 807s git-debrebase = Upstream {"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream"} 807s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 807s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 807s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 807s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 807s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 807s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 807s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 807s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 807s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 807s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"Type" => "Packaging"} 807s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 807s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 807s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"Type" => "Packaging"} 807s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 807s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 807s git-debrebase = Packaging {"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 807s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 807s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 807s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}]} 807s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 807s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 807s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 807s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 807s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 807s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Type" => "Changelog"} 807s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 807s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 807s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 807s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 807s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 807s ' 807s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 807s + anal=../anal 807s + t-git-debrebase analyse HEAD 807s + local gdr=git-debrebase 807s + : ' 807s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 807s + git-debrebase --dgit=dgit -D analyse HEAD 807s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 807s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 807s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 807s git-debrebase = Upstream {"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 807s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 807s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 807s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 807s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 807s git-debrebase = Upstream {"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream"} 807s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 807s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 807s git-debrebase = Upstream {"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2,"Ix" => 0}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 807s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 807s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 807s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 807s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 807s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 807s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Type" => "Upstream","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 807s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 807s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}]} 807s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 807s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 807s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}]} 807s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 807s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 807s git-debrebase = Packaging {"Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32,"Ix" => 0}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 807s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 807s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 807s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 807s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 807s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 807s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32}],"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 807s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 807s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 807s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog"} 807s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 807s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 807s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 807s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 807s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 807s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 807s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 807s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 807s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 807s ' 807s ++ git rev-parse HEAD 807s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + exec 807s + local cid ctype info nparents 807s + read cid ctype info 807s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 807s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s + enparents=1 807s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 807s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 807s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s + enparents=1 807s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 807s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 807s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 807s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 807s + enparents=1 807s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 807s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 807s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 807s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 807s + enparents=1 807s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 807s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 807s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s + enparents=1 807s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 807s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 807s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s + enparents=1 807s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 807s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s + local cetype=Upstream 807s + '[' xUpstream = xUpstream ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 807s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 807s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 807s + enparents=1 807s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 807s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 807s + local cetype=Upstream 807s + '[' xPackaging = xUpstream ']' 807s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 807s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s + enparents=1 807s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 807s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 807s + bwtip= 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 807s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 807s + etypes=Packaging 807s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 807s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s + local cetype=Packaging 807s + '[' xPackaging = xPackaging ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 807s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s + enparents=1 807s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 807s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 807s + etypes=Packaging 807s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 807s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s + local cetype=Packaging 807s + '[' xPackaging = xPackaging ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 807s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 807s + expect=515e62b8d591fcc68597383b955d898db71abc6c 807s + enparents=1 807s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 807s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 807s + etypes=Packaging 807s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 807s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 807s + local cetype=Packaging 807s + '[' xPackaging = xPackaging ']' 807s + cetype=SAME 807s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 807s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 807s + expect=809643e5389def220ea36d61f2d3dd504603e95a 807s + enparents=1 807s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 807s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 807s + etypes=Packaging 807s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 807s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 807s + local cetype=Packaging 807s + '[' xChangelog = xPackaging ']' 807s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 807s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 807s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 807s + enparents=1 807s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 807s + etypes=Packaging 807s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 807s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 807s + local cetype=Packaging 807s + '[' xChangelog = xPackaging ']' 807s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 807s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s + enparents=1 807s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 807s + etypes=Packaging 807s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s ++ wc -w 807s + local cnparents=1 807s + test 1 = 1 807s ++ for f in $parents 807s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s ++ wc -w 807s ++ t-sort -u 807s ++ LC_COLLATE=C 807s ++ sort -u 807s + local cndparents=1 807s + test 1 = 1 807s + case "$parents" in 807s + case "$ctype" in 807s + read cid ctype info 807s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 807s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s + local cetype=Packaging 807s + '[' xAnchor = xPackaging ']' 807s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 807s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 807s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 807s + enparents=1 807s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 807s + case "$ctype/$cetype" in 807s + case "$ctype/$etypes" in 807s + case "$cetype" in 807s + case "$ctype" in 807s + break 807s + checkletters=tf 807s + '[' xtf '!=' x ']' 807s + : '---- prepush unstitched-laundered ...tf ----' 807s + make_check tf 807s + case "$1" in 807s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-laundered 807s + checkletters=f 807s + '[' xf '!=' x ']' 807s + : '---- prepush unstitched-laundered ...f ----' 807s + make_check f 807s + case "$1" in 807s + t-has-ancestor HEAD refs/heads/before-work-prepush-unstitched-laundered 807s + local now 807s ++ git rev-parse HEAD 807s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + local ancestor 807s ++ git rev-parse 'HEAD^{}' 807s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + local mbase 807s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 807s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 807s + checkletters= 807s + '[' x '!=' x ']' 807s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 807s + work=work-prepush-unstitched-mixed 807s + : '---------- prepush unstitched-mixed ----------' 807s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 807s + git update-ref --stdin 807s + sed s/unstitched-mixed/work-prepush-unstitched-mixed/ 807s + git checkout work-prepush-unstitched-mixed 807s Switched to branch 'work-prepush-unstitched-mixed' 807s + checkletters=Stf 807s + shift 807s + before=before-work-prepush-unstitched-mixed 807s + git branch before-work-prepush-unstitched-mixed 807s + local xopts= 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + t-git-debrebase prepush 807s + local gdr=git-debrebase 807s + : ' 807s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 807s + git-debrebase --dgit=dgit -D prepush 807s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-unstitched-mixed 807s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 807s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 807s git-debrebase = Mixed {"Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Type" => "Mixed","Parents" => [{"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Ix" => 0,"Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971"} 807s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 807s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 807s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"}],"Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Upstream","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 807s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 807s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 807s git-debrebase = Packaging {"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Ix" => 0}],"Type" => "Packaging","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n"} 807s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 807s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 807s git-debrebase = AddPatches {"Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","Type" => "AddPatches","Parents" => [{"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Ix" => 0,"Differs" => 4}],"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386"} 807s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 807s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 807s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0}],"Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Type" => "Mixed","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n"} 807s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 807s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 807s git-debrebase = Upstream {"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"Differs" => 2,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Ix" => 0}],"Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Type" => "Upstream"} 807s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 807s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 807s git-debrebase = Packaging {"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"Ix" => 0,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32}],"Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Type" => "Packaging"} 807s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 807s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 807s git-debrebase = Upstream {"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 807s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 807s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 807s git-debrebase = Upstream {"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56"} 807s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 807s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 807s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 807s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 807s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 807s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog"} 807s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 807s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 807s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 807s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 807s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 807s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 807s git-debrebase = Anchor {"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 807s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 807s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 807s git-debrebase >= delete refs/ffq-prev/heads/work-prepush-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 807s git-debrebase >= update refs/debrebase-last/heads/work-prepush-unstitched-mixed bfd2f4c9441a5910931482e80f181720b01f12a3 0000000000000000000000000000000000000000 807s git-debrebase >= update HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 9b56b9c2600dc10b9eec97d535d89870476de971 807s git-debrebase >$ 807s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 807s ' 807s + peel=peel-prepush-unstitched-mixed 807s + git checkout -b peel-prepush-unstitched-mixed 807s Switched to a new branch 'peel-prepush-unstitched-mixed' 807s + t-clean-on-branch peel-prepush-unstitched-mixed 807s + t-output '## peel-prepush-unstitched-mixed' git status -b --porcelain 807s + printf '%s\n' '## peel-prepush-unstitched-mixed' 807s + shift 807s + git status -b --porcelain 807s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 807s + : '---------- prepush unstitched-mixed Stf ----------' 807s + '[' xStf '!=' x ']' 807s + : '---- prepush unstitched-mixed ...Stf ----' 807s + make_check Stf 807s + case "$1" in 807s + t-refs-notexist refs/ffq-prev/heads/work-prepush-unstitched-mixed 807s + local val 807s + for g in $* 807s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-unstitched-mixed 807s ++ local ref=refs/ffq-prev/heads/work-prepush-unstitched-mixed 807s ++ case "$ref" in 807s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-unstitched-mixed 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-unstitched-mixed\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s ++ test 1 = 1 807s + val= 807s + '[' x '!=' x ']' 807s + t-refs-same-start refs/debrebase-last/heads/work-prepush-unstitched-mixed 807s + unset t_ref_val 807s + t_ref_names=() 807s + t-ref-head 807s + local val 807s ++ git rev-parse HEAD 807s + val=bfd2f4c9441a5910931482e80f181720b01f12a3 807s + t-ref-same-val HEAD bfd2f4c9441a5910931482e80f181720b01f12a3 807s + local name=HEAD 807s + local val=bfd2f4c9441a5910931482e80f181720b01f12a3 807s + case "${t_ref_val-unset}" in 807s + t_ref_val=bfd2f4c9441a5910931482e80f181720b01f12a3 807s + t_ref_names+=("$name") 807s + git diff --quiet 'HEAD^1' 807s + git diff 'HEAD^2' 807s + grep unstitched-mixed 807s +Subject: MIXED add both() (subcommands refs/heads/unstitched-mixed 1) 807s + // upstream subcommands refs/heads/unstitched-mixed 1 807s ++// both! subcommands refs/heads/unstitched-mixed 1 807s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1) 807s ++// upstream subcommands refs/heads/unstitched-mixed 1 807s +// debian subcommands refs/heads/unstitched-mixed 1 807s +// both! subcommands refs/heads/unstitched-mixed 1 807s +// debian subcommands refs/heads/unstitched-mixed 2 807s +// both! subcommands refs/heads/unstitched-mixed 2 807s +// upstream subcommands refs/heads/unstitched-mixed 1 807s +// both! subcommands refs/heads/unstitched-mixed 1 807s +// upstream subcommands refs/heads/unstitched-mixed 2 807s +// both! subcommands refs/heads/unstitched-mixed 2 807s + git reset --hard 'HEAD^1' 807s HEAD is now at 9b56b9c MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 807s + checkletters=tf 807s + '[' xtf '!=' x ']' 807s + : '---- prepush unstitched-mixed ...tf ----' 807s + make_check tf 807s + case "$1" in 807s + git diff --quiet HEAD refs/heads/before-work-prepush-unstitched-mixed 807s + checkletters=f 807s + '[' xf '!=' x ']' 807s + : '---- prepush unstitched-mixed ...f ----' 807s + make_check f 807s + case "$1" in 807s + t-has-ancestor HEAD refs/heads/before-work-prepush-unstitched-mixed 807s + local now 807s ++ git rev-parse HEAD 807s + now=9b56b9c2600dc10b9eec97d535d89870476de971 807s + local ancestor 807s ++ git rev-parse 'HEAD^{}' 807s + ancestor=9b56b9c2600dc10b9eec97d535d89870476de971 807s + local mbase 807s ++ t-git-merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 807s ++ git merge-base 9b56b9c2600dc10b9eec97d535d89870476de971 9b56b9c2600dc10b9eec97d535d89870476de971 807s + mbase=9b56b9c2600dc10b9eec97d535d89870476de971 807s + '[' x9b56b9c2600dc10b9eec97d535d89870476de971 '!=' x9b56b9c2600dc10b9eec97d535d89870476de971 ']' 807s + checkletters= 807s + '[' x '!=' x ']' 807s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 807s + work=work-prepush-raw-converted-from-gbp 807s + : '---------- prepush raw-converted-from-gbp ----------' 807s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 807s + git update-ref --stdin 807s + sed s/raw-converted-from-gbp/work-prepush-raw-converted-from-gbp/ 807s + git checkout work-prepush-raw-converted-from-gbp 807s Switched to branch 'work-prepush-raw-converted-from-gbp' 807s + checkletters=ns 807s + shift 807s + before=before-work-prepush-raw-converted-from-gbp 807s + git branch before-work-prepush-raw-converted-from-gbp 807s + local xopts= 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + t-git-debrebase prepush 807s + local gdr=git-debrebase 807s + : ' 807s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 807s + git-debrebase --dgit=dgit -D prepush 807s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-prepush-raw-converted-from-gbp 807s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 807s ' 807s + peel=peel-prepush-raw-converted-from-gbp 807s + git checkout -b peel-prepush-raw-converted-from-gbp 807s Switched to a new branch 'peel-prepush-raw-converted-from-gbp' 807s + t-clean-on-branch peel-prepush-raw-converted-from-gbp 807s + t-output '## peel-prepush-raw-converted-from-gbp' git status -b --porcelain 807s + printf '%s\n' '## peel-prepush-raw-converted-from-gbp' 807s + shift 807s + git status -b --porcelain 807s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 807s + : '---------- prepush raw-converted-from-gbp ns ----------' 807s + '[' xns '!=' x ']' 807s + : '---- prepush raw-converted-from-gbp ...ns ----' 807s + make_check ns 807s + case "$1" in 807s + t-refs-same-start 807s + unset t_ref_val 807s + t_ref_names=() 807s + t-refs-same refs/heads/before-work-prepush-raw-converted-from-gbp refs/heads/peel-prepush-raw-converted-from-gbp 807s + local g 807s + for g in $* 807s + t-ref-same refs/heads/before-work-prepush-raw-converted-from-gbp 807s + local name=refs/heads/before-work-prepush-raw-converted-from-gbp 807s + local val 807s ++ t-git-get-ref refs/heads/before-work-prepush-raw-converted-from-gbp 807s ++ local ref=refs/heads/before-work-prepush-raw-converted-from-gbp 807s ++ case "$ref" in 807s ++ git show-ref -d refs/heads/before-work-prepush-raw-converted-from-gbp 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s + val=178896af44c5b02e05a3442df6c33233b6acb807 807s + t-ref-same-val refs/heads/before-work-prepush-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 807s + local name=refs/heads/before-work-prepush-raw-converted-from-gbp 807s + local val=178896af44c5b02e05a3442df6c33233b6acb807 807s + case "${t_ref_val-unset}" in 807s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 807s + t_ref_names+=("$name") 807s + for g in $* 807s + t-ref-same refs/heads/peel-prepush-raw-converted-from-gbp 807s + local name=refs/heads/peel-prepush-raw-converted-from-gbp 807s + local val 807s ++ t-git-get-ref refs/heads/peel-prepush-raw-converted-from-gbp 807s ++ local ref=refs/heads/peel-prepush-raw-converted-from-gbp 807s ++ case "$ref" in 807s ++ git show-ref -d refs/heads/peel-prepush-raw-converted-from-gbp 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/heads/peel-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s + val=178896af44c5b02e05a3442df6c33233b6acb807 807s + t-ref-same-val refs/heads/peel-prepush-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 807s + local name=refs/heads/peel-prepush-raw-converted-from-gbp 807s + local val=178896af44c5b02e05a3442df6c33233b6acb807 807s + case "${t_ref_val-unset}" in 807s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 807s + t_ref_names+=("$name") 807s + checkletters=s 807s + '[' xs '!=' x ']' 807s + : '---- prepush raw-converted-from-gbp ...s ----' 807s + make_check s 807s + case "$1" in 807s + t-refs-notexist refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 807s + local val 807s + for g in $* 807s ++ t-git-get-ref refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 807s ++ local ref=refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 807s ++ case "$ref" in 807s ++ git show-ref -d refs/ffq-prev/heads/work-prepush-raw-converted-from-gbp 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s ++ test 1 = 1 807s + val= 807s + '[' x '!=' x ']' 807s + t-refs-same-start 807s + unset t_ref_val 807s + t_ref_names=() 807s + t-refs-same refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp refs/debrebase-last/heads/raw-converted-from-gbp 807s + local g 807s + for g in $* 807s + t-ref-same refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s + local name=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s + local val 807s ++ t-git-get-ref refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s ++ local ref=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s ++ case "$ref" in 807s ++ git show-ref -d refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-prepush-raw-converted-from-gbp\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s ++ test 1 = 1 807s + val= 807s + t-ref-same-val refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s + local name=refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s + local val= 807s + case "${t_ref_val-unset}" in 807s + t_ref_val= 807s + t_ref_names+=("$name") 807s + for g in $* 807s + t-ref-same refs/debrebase-last/heads/raw-converted-from-gbp 807s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 807s + local val 807s ++ t-git-get-ref refs/debrebase-last/heads/raw-converted-from-gbp 807s ++ local ref=refs/debrebase-last/heads/raw-converted-from-gbp 807s ++ case "$ref" in 807s ++ git show-ref -d refs/debrebase-last/heads/raw-converted-from-gbp 807s ++ perl -ne ' 807s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/raw-converted-from-gbp\E(?:\^\{\})?$#; 807s END { print "$x\n" if length $x; } 807s ' 807s ++ test 1 = 1 807s + val= 807s + t-ref-same-val refs/debrebase-last/heads/raw-converted-from-gbp 807s + local name=refs/debrebase-last/heads/raw-converted-from-gbp 807s + local val= 807s + case "${t_ref_val-unset}" in 807s + t_ref_val= 807s + t_ref_names+=("$name") 807s + t-has-ancestor HEAD refs/debrebase-last/heads/work-prepush-raw-converted-from-gbp 807s + local now 807s ++ git rev-parse HEAD 807s + now=178896af44c5b02e05a3442df6c33233b6acb807 807s + local ancestor 807s ++ git rev-parse 'HEAD^{}' 807s + ancestor=178896af44c5b02e05a3442df6c33233b6acb807 807s + local mbase 807s ++ t-git-merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 807s ++ git merge-base 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 807s + mbase=178896af44c5b02e05a3442df6c33233b6acb807 807s + '[' x178896af44c5b02e05a3442df6c33233b6acb807 '!=' x178896af44c5b02e05a3442df6c33233b6acb807 ']' 807s + checkletters= 807s + '[' x '!=' x ']' 807s + subcmd quick ns Sl Sltf Sl n 807s + local subcmd=quick 807s + shift 807s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 807s + work=work-quick-stitched-laundered 807s + : '---------- quick stitched-laundered ----------' 807s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 807s + git update-ref --stdin 807s + sed s/stitched-laundered/work-quick-stitched-laundered/ 807s + git checkout work-quick-stitched-laundered 807s Switched to branch 'work-quick-stitched-laundered' 807s + checkletters=ns 807s + shift 807s + before=before-work-quick-stitched-laundered 807s + git branch before-work-quick-stitched-laundered 807s + local xopts= 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + case "$checkletters" in 807s + t-git-debrebase quick 807s + local gdr=git-debrebase 807s + : ' 807s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 807s + git-debrebase --dgit=dgit -D quick 807s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-laundered 807s git-debrebase ffq check_specs * 807s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 807s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 807s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 807s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 807s git-debrebase = Pseudomerge {"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Contributor" => {"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Differs" => 0,"Ix" => 0},"Parents" => [$VAR1->{"Contributor"},{"Differs" => 8,"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Ix" => 1}],"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Overwritten" => [$VAR1->{"Parents"}[1]]} 807s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 807s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 807s git-debrebase = Upstream {"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 807s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 807s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 807s git-debrebase = Upstream {"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"}]} 807s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 807s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 807s git-debrebase = Upstream {"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}],"Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 807s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 807s git-debrebase = Upstream {"Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Parents" => [{"Differs" => 2,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0}],"Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 807s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 807s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0}],"Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 807s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 807s git-debrebase = Upstream {"Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 807s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 807s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 807s git-debrebase = Upstream {"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}]} 807s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 807s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 807s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Parents" => [{"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32}],"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 807s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 807s git-debrebase = Packaging {"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 807s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 807s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Differs" => 32,"Ix" => 0}]} 807s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 807s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 807s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}]} 807s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 807s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 807s git-debrebase = Changelog {"Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16,"Ix" => 0}],"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 807s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 807s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 807s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 807s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 807s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 807s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 807s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 807s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 807s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 807s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 807s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 807s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 807s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 807s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 807s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 807s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 807s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 807s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 807s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 807s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 807s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 807s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 808s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 808s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 808s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 808s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 808s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 808s git-debrebase: laundered (head was 64d2fdf7628f675981360f0dce3aaaa227b0676a) 808s git-debrebase >= update refs/ffq-prev/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 808s git-debrebase >= delete refs/debrebase-last/heads/work-quick-stitched-laundered 808s git-debrebase >= update HEAD dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s git-debrebase >$ 808s Recorded previous head for preservation 808s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-laundered 808s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 808s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"}],"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream"} 808s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 808s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Upstream","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"}]} 808s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 808s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 808s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 808s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 808s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Upstream"} 808s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 808s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 808s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 808s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 808s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"} 808s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 808s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 808s git-debrebase = Upstream {"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45"}]} 808s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 808s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32}]} 808s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 808s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 808s git-debrebase = Packaging {"Parents" => [{"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Differs" => 32,"Ix" => 0}],"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Type" => "Packaging","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 808s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 808s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 808s git-debrebase = Packaging {"Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}],"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 808s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 808s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41"}]} 808s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 808s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 808s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Differs" => 16}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 808s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 808s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}]} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 808s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 808s git-debrebase >= delete refs/ffq-prev/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s git-debrebase >= update refs/debrebase-last/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 0000000000000000000000000000000000000000 808s git-debrebase >= update HEAD 64d2fdf7628f675981360f0dce3aaaa227b0676a dab3cc0fcfead932f6714305cfb670067c157804 808s git-debrebase >$ 808s HEAD is now at 64d2fdf Declare fast forward / record previous work 808s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 808s ' 808s + peel=peel-quick-stitched-laundered 808s + git checkout -b peel-quick-stitched-laundered 808s Switched to a new branch 'peel-quick-stitched-laundered' 808s + t-clean-on-branch peel-quick-stitched-laundered 808s + t-output '## peel-quick-stitched-laundered' git status -b --porcelain 808s + printf '%s\n' '## peel-quick-stitched-laundered' 808s + shift 808s + git status -b --porcelain 808s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 808s + : '---------- quick stitched-laundered ns ----------' 808s + '[' xns '!=' x ']' 808s + : '---- quick stitched-laundered ...ns ----' 808s + make_check ns 808s + case "$1" in 808s + t-refs-same-start 808s + unset t_ref_val 808s + t_ref_names=() 808s + t-refs-same refs/heads/before-work-quick-stitched-laundered refs/heads/peel-quick-stitched-laundered 808s + local g 808s + for g in $* 808s + t-ref-same refs/heads/before-work-quick-stitched-laundered 808s + local name=refs/heads/before-work-quick-stitched-laundered 808s + local val 808s ++ t-git-get-ref refs/heads/before-work-quick-stitched-laundered 808s ++ local ref=refs/heads/before-work-quick-stitched-laundered 808s ++ case "$ref" in 808s ++ git show-ref -d refs/heads/before-work-quick-stitched-laundered 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-quick-stitched-laundered\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t-ref-same-val refs/heads/before-work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local name=refs/heads/before-work-quick-stitched-laundered 808s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + case "${t_ref_val-unset}" in 808s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t_ref_names+=("$name") 808s + for g in $* 808s + t-ref-same refs/heads/peel-quick-stitched-laundered 808s + local name=refs/heads/peel-quick-stitched-laundered 808s + local val 808s ++ t-git-get-ref refs/heads/peel-quick-stitched-laundered 808s ++ local ref=refs/heads/peel-quick-stitched-laundered 808s ++ case "$ref" in 808s ++ git show-ref -d refs/heads/peel-quick-stitched-laundered 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/heads/peel-quick-stitched-laundered\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t-ref-same-val refs/heads/peel-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local name=refs/heads/peel-quick-stitched-laundered 808s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + case "${t_ref_val-unset}" in 808s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t_ref_names+=("$name") 808s + checkletters=s 808s + '[' xs '!=' x ']' 808s + : '---- quick stitched-laundered ...s ----' 808s + make_check s 808s + case "$1" in 808s + t-refs-notexist refs/ffq-prev/heads/work-quick-stitched-laundered 808s + local val 808s + for g in $* 808s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-stitched-laundered 808s ++ local ref=refs/ffq-prev/heads/work-quick-stitched-laundered 808s ++ case "$ref" in 808s ++ git show-ref -d refs/ffq-prev/heads/work-quick-stitched-laundered 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-stitched-laundered\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s ++ test 1 = 1 808s + val= 808s + '[' x '!=' x ']' 808s + t-refs-same-start 808s + unset t_ref_val 808s + t_ref_names=() 808s + t-refs-same refs/debrebase-last/heads/work-quick-stitched-laundered refs/debrebase-last/heads/stitched-laundered 808s + local g 808s + for g in $* 808s + t-ref-same refs/debrebase-last/heads/work-quick-stitched-laundered 808s + local name=refs/debrebase-last/heads/work-quick-stitched-laundered 808s + local val 808s ++ t-git-get-ref refs/debrebase-last/heads/work-quick-stitched-laundered 808s ++ local ref=refs/debrebase-last/heads/work-quick-stitched-laundered 808s ++ case "$ref" in 808s ++ git show-ref -d refs/debrebase-last/heads/work-quick-stitched-laundered 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-quick-stitched-laundered\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t-ref-same-val refs/debrebase-last/heads/work-quick-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local name=refs/debrebase-last/heads/work-quick-stitched-laundered 808s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + case "${t_ref_val-unset}" in 808s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t_ref_names+=("$name") 808s + for g in $* 808s + t-ref-same refs/debrebase-last/heads/stitched-laundered 808s + local name=refs/debrebase-last/heads/stitched-laundered 808s + local val 808s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 808s ++ local ref=refs/debrebase-last/heads/stitched-laundered 808s ++ case "$ref" in 808s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local name=refs/debrebase-last/heads/stitched-laundered 808s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + case "${t_ref_val-unset}" in 808s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + t_ref_names+=("$name") 808s + t-has-ancestor HEAD refs/debrebase-last/heads/work-quick-stitched-laundered 808s + local now 808s ++ git rev-parse HEAD 808s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local ancestor 808s ++ git rev-parse 'HEAD^{}' 808s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + local mbase 808s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 808s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 808s + checkletters= 808s + '[' x '!=' x ']' 808s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 808s + work=work-quick-stitched-mixed 808s + : '---------- quick stitched-mixed ----------' 808s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 808s + git update-ref --stdin 808s + sed s/stitched-mixed/work-quick-stitched-mixed/ 808s + git checkout work-quick-stitched-mixed 808s Switched to branch 'work-quick-stitched-mixed' 808s + checkletters=Sl 808s + shift 808s + before=before-work-quick-stitched-mixed 808s + git branch before-work-quick-stitched-mixed 808s + local xopts= 808s + case "$checkletters" in 808s + case "$checkletters" in 808s + case "$checkletters" in 808s + case "$checkletters" in 808s + t-git-debrebase quick 808s + local gdr=git-debrebase 808s + : ' 808s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 808s + git-debrebase --dgit=dgit -D quick 808s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-mixed 808s git-debrebase ffq check_specs * 808s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 808s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 808s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 808s git-debrebase = Mixed {"Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504","CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Parents" => [{"Differs" => 34,"CommitId" => "7091adece516711371505e702f87d9973010f25b","Ix" => 0}]} 808s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 808s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 808s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "6066466a7bfccd9539954883312605a59c5b4502","CommitId" => "7091adece516711371505e702f87d9973010f25b","Parents" => [{"Ix" => 0,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Differs" => 2}]} 808s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 808s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752"}]} 808s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 808s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 808s git-debrebase = AddPatches {"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Parents" => [{"Differs" => 4,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Ix" => 0}],"Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Type" => "AddPatches","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3"} 808s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 808s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 808s git-debrebase = Mixed {"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Parents" => [{"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Differs" => 34,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Mixed","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691"} 808s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 808s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 808s git-debrebase = Upstream {"Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Upstream","Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Parents" => [{"Differs" => 2,"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Ix" => 0}]} 808s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 808s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 808s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 32}],"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 808s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 808s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 808s git-debrebase = AddPatches {"Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"} 808s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 808s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 808s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"} 808s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 808s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 808s git-debrebase = Changelog {"Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 808s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 808s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 808s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 808s git-debrebase = Pseudomerge {"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Parents" => [{"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0},{"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9","Differs" => 8}],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 808s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 808s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 808s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 808s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 808s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 808s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 808s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 808s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]]} 808s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 808s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 808s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 808s git-debrebase WALK REWRITING NOW cl=HASH(0x55d2ef56c378) procd=HASH(0x55d2ef575e80) 808s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 808s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 808s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 808s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 808s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 808s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 808s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 808s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 808s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 808s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 808s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 808s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 808s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 808s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 808s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 808s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 808s git-debrebase: laundered (head was 5e0bf3cea3c715230b96aca41156852390014b98) 808s git-debrebase >= update refs/ffq-prev/heads/work-quick-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 0000000000000000000000000000000000000000 808s git-debrebase >= delete refs/debrebase-last/heads/work-quick-stitched-mixed 808s git-debrebase >= update HEAD 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 808s git-debrebase >$ 808s Recorded previous head for preservation 808s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-stitched-mixed 808s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 808s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 808s git-debrebase = Upstream {"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Differs" => 2,"Ix" => 0}],"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d"} 808s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 808s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 808s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Upstream","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Parents" => [{"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Differs" => 2}]} 808s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 808s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 808s git-debrebase = Upstream {"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Parents" => [{"Ix" => 0,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c"} 808s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 808s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 808s git-debrebase = Upstream {"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2,"Ix" => 0}],"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a"} 808s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 808s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 808s git-debrebase = Upstream {"Parents" => [{"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Differs" => 2,"Ix" => 0}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 808s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 808s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 808s git-debrebase = Upstream {"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Parents" => [{"Differs" => 2,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 808s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 808s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 808s git-debrebase = Upstream {"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Parents" => [{"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0}]} 808s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 808s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 808s git-debrebase = Packaging {"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Parents" => [{"Differs" => 32,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 808s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 808s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 808s git-debrebase = Packaging {"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5"} 808s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 808s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 808s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"}]} 808s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 808s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 808s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Ix" => 0}],"CommitId" => "5052af319e257b8c20174a42da76f055391029f3"} 808s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 808s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 808s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"}],"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 808s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 808s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"CommitId" => "60728ea4003218c146a7f595c4ff746760566965"} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 808s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 808s git-debrebase >= delete refs/ffq-prev/heads/work-quick-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 808s git-debrebase >= update refs/debrebase-last/heads/work-quick-stitched-mixed 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 0000000000000000000000000000000000000000 808s git-debrebase >= update HEAD 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 97a91c40026ff6a52a5cc7d020dda82048f2e77d 808s git-debrebase >$ 808s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 808s ' 808s + peel=peel-quick-stitched-mixed 808s + git checkout -b peel-quick-stitched-mixed 808s Switched to a new branch 'peel-quick-stitched-mixed' 808s + t-clean-on-branch peel-quick-stitched-mixed 808s + t-output '## peel-quick-stitched-mixed' git status -b --porcelain 808s + printf '%s\n' '## peel-quick-stitched-mixed' 808s + shift 808s + git status -b --porcelain 808s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 808s + : '---------- quick stitched-mixed Sl ----------' 808s + '[' xSl '!=' x ']' 808s + : '---- quick stitched-mixed ...Sl ----' 808s + make_check Sl 808s + case "$1" in 808s + t-refs-notexist refs/ffq-prev/heads/work-quick-stitched-mixed 808s + local val 808s + for g in $* 808s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-stitched-mixed 808s ++ local ref=refs/ffq-prev/heads/work-quick-stitched-mixed 808s ++ case "$ref" in 808s ++ git show-ref -d refs/ffq-prev/heads/work-quick-stitched-mixed 808s ++ perl -ne ' 808s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-stitched-mixed\E(?:\^\{\})?$#; 808s END { print "$x\n" if length $x; } 808s ' 808s ++ test 1 = 1 808s + val= 808s + '[' x '!=' x ']' 808s + t-refs-same-start refs/debrebase-last/heads/work-quick-stitched-mixed 808s + unset t_ref_val 808s + t_ref_names=() 808s + t-ref-head 808s + local val 808s ++ git rev-parse HEAD 808s + val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 808s + t-ref-same-val HEAD 12058514a4b2f01cf9dda0673ddfa15f68ecc55b 808s + local name=HEAD 808s + local val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 808s + case "${t_ref_val-unset}" in 808s + t_ref_val=12058514a4b2f01cf9dda0673ddfa15f68ecc55b 808s + t_ref_names+=("$name") 808s + git diff --quiet 'HEAD^1' 808s + git diff 'HEAD^2' 808s + grep stitched-mixed 808s -Subject: MIXED add both() (subcommands refs/heads/stitched-mixed 1) 808s - // upstream subcommands refs/heads/stitched-mixed 1 808s -+// both! subcommands refs/heads/stitched-mixed 1 808s -Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1) 808s -+// upstream subcommands refs/heads/stitched-mixed 1 808s + git reset --hard 'HEAD^1' 808s HEAD is now at 97a91c4 MIXED add both() (subcommands refs/heads/stitched-mixed 2) 808s + checkletters=l 808s + '[' xl '!=' x ']' 808s + : '---- quick stitched-mixed ...l ----' 808s + make_check l 808s + case "$1" in 808s + git diff --quiet HEAD refs/heads/before-work-quick-stitched-mixed -- :. ':!debian/patches' 808s + t-gdr-good laundered 808s + local state=laundered 808s + local beforetag= 808s + case $state in 808s + git diff --quiet -- :. ':!debian/patches' 808s + LC_MESSAGES=C 808s + t-git-debrebase status 808s + local gdr=git-debrebase 808s + : ' 808s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 808s + git-debrebase --dgit=dgit -D status 808s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 808s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Differs" => 2,"Ix" => 0}],"CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d"} 808s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 808s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 808s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53"} 808s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 808s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 808s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 808s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 808s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 808s git-debrebase = Upstream {"Parents" => [{"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Ix" => 0,"Differs" => 2}],"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Type" => "Upstream","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 808s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 808s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}],"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 808s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 808s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 808s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5"}],"Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 808s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 808s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 808s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588"}],"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 808s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 808s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"}],"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n"} 808s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 808s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a"}],"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e"} 808s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 808s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 808s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 808s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 808s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 808s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Type" => "Packaging","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 808s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 808s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 808s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 808s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog"} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 808s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-stitched-mixed 808s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 808s ' 808s + case $state in 808s + egrep '^ *branch is laundered' ../status.check 808s branch is laundered 808s + t-gdr-good-analyse HEAD laundered 808s + local head=HEAD 808s + local state=laundered 808s + local wsfx= 808s + local etypes bwtip 808s + case $state in 808s + etypes=Upstream 808s ++ t-git-debrebase breakwater 808s ++ local gdr=git-debrebase 808s ++ : ' 808s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 808s ++ git-debrebase --dgit=dgit -D breakwater 808s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 808s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 808s git-debrebase = Upstream {"Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557"}],"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 808s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 808s git-debrebase = Upstream {"Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 808s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 808s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 808s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 808s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 808s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc"}],"Type" => "Upstream","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a"} 808s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 808s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 808s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}]} 808s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 808s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 808s git-debrebase = Upstream {"Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 808s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 808s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 808s git-debrebase = Upstream {"Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Ix" => 0,"Differs" => 2}],"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 808s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 808s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e"} 808s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 808s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 808s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 808s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 808s git-debrebase = Packaging {"Parents" => [{"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 808s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 808s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 808s git-debrebase = Packaging {"Tree" => "84e220841747026f0ad129576c4e2db185521ecc","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 808s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 808s git-debrebase = Changelog {"Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 808s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 808s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Type" => "Changelog","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 808s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 808s ' 808s + bwtip=Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 808s + anal=../anal 808s + t-git-debrebase analyse HEAD 808s + local gdr=git-debrebase 808s + : ' 808s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 808s + git-debrebase --dgit=dgit -D analyse HEAD 808s git-debrebase *** WALK 97a91c40026ff6a52a5cc7d020dda82048f2e77d 1 *main::STDOUT 808s git-debrebase get_differs 2f5a428eb6044c48a90076bcad0c49753a477557 2a1d596365b897a46ef2465ef0e89b25e470a26c = 0x2 808s git-debrebase classify 97a91c40026ff6a52a5cc7d020dda82048f2e77d $t=2a1d596365b897a46ef2465ef0e89b25e470a26c @p 2f5a428eb6044c48a90076bcad0c49753a477557/0x2 808s git-debrebase = Upstream {"Hdr" => "tree 2a1d596365b897a46ef2465ef0e89b25e470a26c\nparent 2f5a428eb6044c48a90076bcad0c49753a477557\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "2a1d596365b897a46ef2465ef0e89b25e470a26c","CommitId" => "97a91c40026ff6a52a5cc7d020dda82048f2e77d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 808s git-debrebase get_differs dbe44ad09874a6a4cc7cc047c096dd541f833180 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 = 0x2 808s git-debrebase classify 2f5a428eb6044c48a90076bcad0c49753a477557 $t=1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53 @p dbe44ad09874a6a4cc7cc047c096dd541f833180/0x2 808s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "2f5a428eb6044c48a90076bcad0c49753a477557","Tree" => "1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53","Hdr" => "tree 1b4c360a7ba6496f603e6ff9088a3d0dd3ac9d53\nparent dbe44ad09874a6a4cc7cc047c096dd541f833180\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 2f5c652341e9f1508c8539185075ac0deb3ad68a 1113b74df767318c8d1e210010c8edcd5ccdb81c = 0x2 808s git-debrebase classify dbe44ad09874a6a4cc7cc047c096dd541f833180 $t=1113b74df767318c8d1e210010c8edcd5ccdb81c @p 2f5c652341e9f1508c8539185075ac0deb3ad68a/0x2 808s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Ix" => 0}],"Hdr" => "tree 1113b74df767318c8d1e210010c8edcd5ccdb81c\nparent 2f5c652341e9f1508c8539185075ac0deb3ad68a\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1113b74df767318c8d1e210010c8edcd5ccdb81c","CommitId" => "dbe44ad09874a6a4cc7cc047c096dd541f833180"} 808s git-debrebase get_differs 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 6fa7cee26826393afcf8d653572a731163a4f24f = 0x2 808s git-debrebase classify 2f5c652341e9f1508c8539185075ac0deb3ad68a $t=6fa7cee26826393afcf8d653572a731163a4f24f @p 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc/0x2 808s git-debrebase = Upstream {"Tree" => "6fa7cee26826393afcf8d653572a731163a4f24f","CommitId" => "2f5c652341e9f1508c8539185075ac0deb3ad68a","Hdr" => "tree 6fa7cee26826393afcf8d653572a731163a4f24f\nparent 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n"} 808s git-debrebase get_differs 53c89ace547b642d3714cc2f5cc74a4fc0922af4 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 = 0x2 808s git-debrebase classify 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc $t=2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8 @p 53c89ace547b642d3714cc2f5cc74a4fc0922af4/0x2 808s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8","CommitId" => "7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc","Hdr" => "tree 2b8d1db0cc313d3ef4440fbb17c1f4a590860cf8\nparent 53c89ace547b642d3714cc2f5cc74a4fc0922af4\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee = 0x2 808s git-debrebase classify 53c89ace547b642d3714cc2f5cc74a4fc0922af4 $t=15fdadd8f1305829fb7d6e6a3a36c6bea36024ee @p 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5/0x2 808s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree 15fdadd8f1305829fb7d6e6a3a36c6bea36024ee\nparent 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "53c89ace547b642d3714cc2f5cc74a4fc0922af4","Tree" => "15fdadd8f1305829fb7d6e6a3a36c6bea36024ee"} 808s git-debrebase get_differs e7d45cf6ecfa83b4fd6418de6b88f8471799e588 a704dde2a583e324f221839bd2f6f05d140bcdc9 = 0x2 808s git-debrebase classify 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 $t=a704dde2a583e324f221839bd2f6f05d140bcdc9 @p e7d45cf6ecfa83b4fd6418de6b88f8471799e588/0x2 808s git-debrebase = Upstream {"Tree" => "a704dde2a583e324f221839bd2f6f05d140bcdc9","CommitId" => "0640a4e813d7af991a5cdf2a2522b50fccaf4aa5","Hdr" => "tree a704dde2a583e324f221839bd2f6f05d140bcdc9\nparent e7d45cf6ecfa83b4fd6418de6b88f8471799e588\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 808s git-debrebase get_differs ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 324fefac260fae19926241bd0cd3439ae536e63e = 0x20 808s git-debrebase classify e7d45cf6ecfa83b4fd6418de6b88f8471799e588 $t=324fefac260fae19926241bd0cd3439ae536e63e @p ef1a3b6b02c3b4091eea7c3218709c1aa84c299e/0x20 808s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "324fefac260fae19926241bd0cd3439ae536e63e","CommitId" => "e7d45cf6ecfa83b4fd6418de6b88f8471799e588","Hdr" => "tree 324fefac260fae19926241bd0cd3439ae536e63e\nparent ef1a3b6b02c3b4091eea7c3218709c1aa84c299e\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 906c70d0be27939a63e478000e80b0914705ad3a 1bfecd02c53ef5ef129a045f7fe3613f2554efb5 = 0x20 808s git-debrebase classify ef1a3b6b02c3b4091eea7c3218709c1aa84c299e $t=1bfecd02c53ef5ef129a045f7fe3613f2554efb5 @p 906c70d0be27939a63e478000e80b0914705ad3a/0x20 808s git-debrebase = Packaging {"CommitId" => "ef1a3b6b02c3b4091eea7c3218709c1aa84c299e","Tree" => "1bfecd02c53ef5ef129a045f7fe3613f2554efb5","Hdr" => "tree 1bfecd02c53ef5ef129a045f7fe3613f2554efb5\nparent 906c70d0be27939a63e478000e80b0914705ad3a\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n"} 808s git-debrebase get_differs 5052af319e257b8c20174a42da76f055391029f3 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd = 0x20 808s git-debrebase classify 906c70d0be27939a63e478000e80b0914705ad3a $t=8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd @p 5052af319e257b8c20174a42da76f055391029f3/0x20 808s git-debrebase = Packaging {"Hdr" => "tree 8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd\nparent 5052af319e257b8c20174a42da76f055391029f3\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "906c70d0be27939a63e478000e80b0914705ad3a","Tree" => "8304ad2b57a5ac8d02e37201fcc6da1f0f58dacd","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Differs" => 32}],"Type" => "Packaging"} 808s git-debrebase get_differs 1aefa2934a527f1fa4ddaf809508b879f5086949 84e220841747026f0ad129576c4e2db185521ecc = 0x20 808s git-debrebase classify 5052af319e257b8c20174a42da76f055391029f3 $t=84e220841747026f0ad129576c4e2db185521ecc @p 1aefa2934a527f1fa4ddaf809508b879f5086949/0x20 808s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "5052af319e257b8c20174a42da76f055391029f3","Tree" => "84e220841747026f0ad129576c4e2db185521ecc","Hdr" => "tree 84e220841747026f0ad129576c4e2db185521ecc\nparent 1aefa2934a527f1fa4ddaf809508b879f5086949\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 808s git-debrebase get_differs 60728ea4003218c146a7f595c4ff746760566965 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 808s git-debrebase classify 1aefa2934a527f1fa4ddaf809508b879f5086949 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 60728ea4003218c146a7f595c4ff746760566965/0x10 808s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "60728ea4003218c146a7f595c4ff746760566965","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 60728ea4003218c146a7f595c4ff746760566965\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "1aefa2934a527f1fa4ddaf809508b879f5086949"} 808s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 808s git-debrebase classify 60728ea4003218c146a7f595c4ff746760566965 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 808s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "60728ea4003218c146a7f595c4ff746760566965"} 808s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 808s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 808s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 808s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 808s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 808s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 808s ' 808s ++ git rev-parse HEAD 808s + expect=97a91c40026ff6a52a5cc7d020dda82048f2e77d 808s + exec 808s + local cid ctype info nparents 808s + read cid ctype info 808s + : ===== 97a91c40026ff6a52a5cc7d020dda82048f2e77d Upstream ===== 808s + test 97a91c40026ff6a52a5cc7d020dda82048f2e77d = 97a91c40026ff6a52a5cc7d020dda82048f2e77d 808s + local cetype=Upstream 808s + '[' xUpstream = xUpstream ']' 808s + cetype=SAME 808s ++ git log -n1 --pretty=format:%P 97a91c40026ff6a52a5cc7d020dda82048f2e77d 808s + local parents=2f5a428eb6044c48a90076bcad0c49753a477557 808s + expect=2f5a428eb6044c48a90076bcad0c49753a477557 808s + enparents=1 808s + : Upstream/SAME 2f5a428eb6044c48a90076bcad0c49753a477557 808s + case "$ctype/$cetype" in 808s + case "$ctype/$etypes" in 808s + case "$cetype" in 808s + case "$ctype" in 808s ++ printf %s 2f5a428eb6044c48a90076bcad0c49753a477557 808s ++ wc -w 808s + local cnparents=1 808s + test 1 = 1 808s ++ for f in $parents 808s ++ echo 2f5a428eb6044c48a90076bcad0c49753a477557 808s ++ wc -w 808s ++ t-sort -u 808s ++ LC_COLLATE=C 808s ++ sort -u 808s + local cndparents=1 808s + test 1 = 1 808s + case "$parents" in 808s + case "$ctype" in 808s + read cid ctype info 808s + : ===== 2f5a428eb6044c48a90076bcad0c49753a477557 Upstream ===== 808s + test 2f5a428eb6044c48a90076bcad0c49753a477557 = 2f5a428eb6044c48a90076bcad0c49753a477557 808s + local cetype=Upstream 808s + '[' xUpstream = xUpstream ']' 808s + cetype=SAME 808s ++ git log -n1 --pretty=format:%P 2f5a428eb6044c48a90076bcad0c49753a477557 808s + local parents=dbe44ad09874a6a4cc7cc047c096dd541f833180 808s + expect=dbe44ad09874a6a4cc7cc047c096dd541f833180 808s + enparents=1 808s + : Upstream/SAME dbe44ad09874a6a4cc7cc047c096dd541f833180 808s + case "$ctype/$cetype" in 808s + case "$ctype/$etypes" in 808s + case "$cetype" in 808s + case "$ctype" in 808s ++ printf %s dbe44ad09874a6a4cc7cc047c096dd541f833180 808s ++ wc -w 808s + local cnparents=1 808s + test 1 = 1 808s ++ for f in $parents 808s ++ echo dbe44ad09874a6a4cc7cc047c096dd541f833180 808s ++ wc -w 808s ++ t-sort -u 808s ++ LC_COLLATE=C 808s ++ sort -u 808s + local cndparents=1 808s + test 1 = 1 808s + case "$parents" in 808s + case "$ctype" in 808s + read cid ctype info 808s + : ===== dbe44ad09874a6a4cc7cc047c096dd541f833180 Upstream ===== 808s + test dbe44ad09874a6a4cc7cc047c096dd541f833180 = dbe44ad09874a6a4cc7cc047c096dd541f833180 808s + local cetype=Upstream 808s + '[' xUpstream = xUpstream ']' 808s + cetype=SAME 808s ++ git log -n1 --pretty=format:%P dbe44ad09874a6a4cc7cc047c096dd541f833180 808s + local parents=2f5c652341e9f1508c8539185075ac0deb3ad68a 808s + expect=2f5c652341e9f1508c8539185075ac0deb3ad68a 808s + enparents=1 808s + : Upstream/SAME 2f5c652341e9f1508c8539185075ac0deb3ad68a 808s + case "$ctype/$cetype" in 808s + case "$ctype/$etypes" in 808s + case "$cetype" in 808s + case "$ctype" in 808s ++ printf %s 2f5c652341e9f1508c8539185075ac0deb3ad68a 808s ++ wc -w 808s + local cnparents=1 808s + test 1 = 1 808s ++ for f in $parents 808s ++ echo 2f5c652341e9f1508c8539185075ac0deb3ad68a 808s ++ wc -w 808s ++ t-sort -u 808s ++ LC_COLLATE=C 808s ++ sort -u 808s + local cndparents=1 808s + test 1 = 1 808s + case "$parents" in 808s + case "$ctype" in 808s + read cid ctype info 808s + : ===== 2f5c652341e9f1508c8539185075ac0deb3ad68a Upstream ===== 808s + test 2f5c652341e9f1508c8539185075ac0deb3ad68a = 2f5c652341e9f1508c8539185075ac0deb3ad68a 808s + local cetype=Upstream 808s + '[' xUpstream = xUpstream ']' 808s + cetype=SAME 808s ++ git log -n1 --pretty=format:%P 2f5c652341e9f1508c8539185075ac0deb3ad68a 808s + local parents=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 808s + expect=7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 808s + enparents=1 808s + : Upstream/SAME 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 808s + case "$ctype/$cetype" in 808s + case "$ctype/$etypes" in 808s + case "$cetype" in 808s + case "$ctype" in 808s ++ printf %s 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 808s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc Upstream ===== 809s + test 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc = 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 7fb9b43592ada1cd690f7cbe9a1a03bd2072d8cc 809s + local parents=53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s + expect=53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s + enparents=1 809s + : Upstream/SAME 53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s 53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 53c89ace547b642d3714cc2f5cc74a4fc0922af4 Upstream ===== 809s + test 53c89ace547b642d3714cc2f5cc74a4fc0922af4 = 53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 53c89ace547b642d3714cc2f5cc74a4fc0922af4 809s + local parents=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s + expect=0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s + enparents=1 809s + : Upstream/SAME 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 Upstream ===== 809s + test 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 = 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 0640a4e813d7af991a5cdf2a2522b50fccaf4aa5 809s + local parents=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + expect=e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + enparents=1 809s + : Upstream/SAME e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== e7d45cf6ecfa83b4fd6418de6b88f8471799e588 Packaging ===== 809s + test e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + local cetype=Upstream 809s + '[' xPackaging = xUpstream ']' 809s ++ git log -n1 --pretty=format:%P e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + local parents=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s + expect=ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s + enparents=1 809s + : Packaging/Upstream ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + '[' xY:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 '!=' x ']' 809s + test Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 = Y:e7d45cf6ecfa83b4fd6418de6b88f8471799e588 809s + bwtip= 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :. ':!debian' 809s + git diff --quiet ef1a3b6b02c3b4091eea7c3218709c1aa84c299e..e7d45cf6ecfa83b4fd6418de6b88f8471799e588 -- :debian/patches 809s + etypes=Packaging 809s ++ printf %s ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== ef1a3b6b02c3b4091eea7c3218709c1aa84c299e Packaging ===== 809s + test ef1a3b6b02c3b4091eea7c3218709c1aa84c299e = ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s + local cetype=Packaging 809s + '[' xPackaging = xPackaging ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P ef1a3b6b02c3b4091eea7c3218709c1aa84c299e 809s + local parents=906c70d0be27939a63e478000e80b0914705ad3a 809s + expect=906c70d0be27939a63e478000e80b0914705ad3a 809s + enparents=1 809s + : Packaging/SAME 906c70d0be27939a63e478000e80b0914705ad3a 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :. ':!debian' 809s + git diff --quiet 906c70d0be27939a63e478000e80b0914705ad3a..ef1a3b6b02c3b4091eea7c3218709c1aa84c299e -- :debian/patches 809s + etypes=Packaging 809s ++ printf %s 906c70d0be27939a63e478000e80b0914705ad3a 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 906c70d0be27939a63e478000e80b0914705ad3a 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 906c70d0be27939a63e478000e80b0914705ad3a Packaging ===== 809s + test 906c70d0be27939a63e478000e80b0914705ad3a = 906c70d0be27939a63e478000e80b0914705ad3a 809s + local cetype=Packaging 809s + '[' xPackaging = xPackaging ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 906c70d0be27939a63e478000e80b0914705ad3a 809s + local parents=5052af319e257b8c20174a42da76f055391029f3 809s + expect=5052af319e257b8c20174a42da76f055391029f3 809s + enparents=1 809s + : Packaging/SAME 5052af319e257b8c20174a42da76f055391029f3 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :. ':!debian' 809s + git diff --quiet 5052af319e257b8c20174a42da76f055391029f3..906c70d0be27939a63e478000e80b0914705ad3a -- :debian/patches 809s + etypes=Packaging 809s ++ printf %s 5052af319e257b8c20174a42da76f055391029f3 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 5052af319e257b8c20174a42da76f055391029f3 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 5052af319e257b8c20174a42da76f055391029f3 Packaging ===== 809s + test 5052af319e257b8c20174a42da76f055391029f3 = 5052af319e257b8c20174a42da76f055391029f3 809s + local cetype=Packaging 809s + '[' xPackaging = xPackaging ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 5052af319e257b8c20174a42da76f055391029f3 809s + local parents=1aefa2934a527f1fa4ddaf809508b879f5086949 809s + expect=1aefa2934a527f1fa4ddaf809508b879f5086949 809s + enparents=1 809s + : Packaging/SAME 1aefa2934a527f1fa4ddaf809508b879f5086949 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :. ':!debian' 809s + git diff --quiet 1aefa2934a527f1fa4ddaf809508b879f5086949..5052af319e257b8c20174a42da76f055391029f3 -- :debian/patches 809s + etypes=Packaging 809s ++ printf %s 1aefa2934a527f1fa4ddaf809508b879f5086949 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 1aefa2934a527f1fa4ddaf809508b879f5086949 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 1aefa2934a527f1fa4ddaf809508b879f5086949 Changelog ===== 809s + test 1aefa2934a527f1fa4ddaf809508b879f5086949 = 1aefa2934a527f1fa4ddaf809508b879f5086949 809s + local cetype=Packaging 809s + '[' xChangelog = xPackaging ']' 809s ++ git log -n1 --pretty=format:%P 1aefa2934a527f1fa4ddaf809508b879f5086949 809s + local parents=60728ea4003218c146a7f595c4ff746760566965 809s + expect=60728ea4003218c146a7f595c4ff746760566965 809s + enparents=1 809s + : Changelog/Packaging 60728ea4003218c146a7f595c4ff746760566965 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet 60728ea4003218c146a7f595c4ff746760566965..1aefa2934a527f1fa4ddaf809508b879f5086949 -- :. ':!debian/changelog' 809s + etypes=Packaging 809s ++ printf %s 60728ea4003218c146a7f595c4ff746760566965 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 60728ea4003218c146a7f595c4ff746760566965 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 60728ea4003218c146a7f595c4ff746760566965 Changelog ===== 809s + test 60728ea4003218c146a7f595c4ff746760566965 = 60728ea4003218c146a7f595c4ff746760566965 809s + local cetype=Packaging 809s + '[' xChangelog = xPackaging ']' 809s ++ git log -n1 --pretty=format:%P 60728ea4003218c146a7f595c4ff746760566965 809s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s + enparents=1 809s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..60728ea4003218c146a7f595c4ff746760566965 -- :. ':!debian/changelog' 809s + etypes=Packaging 809s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 809s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s + local cetype=Packaging 809s + '[' xAnchor = xPackaging ']' 809s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 809s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 809s + enparents=1 809s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s + break 809s + checkletters= 809s + '[' x '!=' x ']' 809s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 809s + work=work-quick-unstitched-laundered 809s + : '---------- quick unstitched-laundered ----------' 809s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 809s + git update-ref --stdin 809s + sed s/unstitched-laundered/work-quick-unstitched-laundered/ 809s + git checkout work-quick-unstitched-laundered 809s Switched to branch 'work-quick-unstitched-laundered' 809s + checkletters=Sltf 809s + shift 809s + before=before-work-quick-unstitched-laundered 809s + git branch before-work-quick-unstitched-laundered 809s + local xopts= 809s + case "$checkletters" in 809s + case "$checkletters" in 809s + case "$checkletters" in 809s + case "$checkletters" in 809s + t-git-debrebase quick 809s + local gdr=git-debrebase 809s + : ' 809s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 809s + git-debrebase --dgit=dgit -D quick 809s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-laundered 809s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 809s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 809s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 809s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 809s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 809s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 809s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 809s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 809s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}]} 809s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 809s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 809s git-debrebase = Upstream {"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 809s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 809s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 809s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 809s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 809s git-debrebase = Upstream {"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream"} 809s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 809s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 809s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 809s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 809s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 809s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 809s git-debrebase = Packaging {"Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 809s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 809s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 809s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 809s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 809s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 809s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 809s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 809s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 809s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 809s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 809s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 809s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 809s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 809s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 809s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 809s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 809s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 809s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 809s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 809s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 809s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 809s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 809s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 809s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 809s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 809s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 809s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 809s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 809s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 809s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 809s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 809s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 809s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 809s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 809s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-laundered 809s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 809s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0,"Differs" => 2}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 809s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 809s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 809s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 809s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 809s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 809s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 809s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 809s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 809s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 809s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}]} 809s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 809s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 809s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 809s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 809s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 809s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 809s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 809s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 809s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 809s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 809s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 809s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 809s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}]} 809s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 809s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 809s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f"} 809s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 809s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 809s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 809s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 809s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 809s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 809s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 809s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 809s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 809s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 809s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 809s git-debrebase >= delete refs/ffq-prev/heads/work-quick-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 809s git-debrebase >= update refs/debrebase-last/heads/work-quick-unstitched-laundered b35dc4c5ac9626e05811f857d83e42693da4c5ce 0000000000000000000000000000000000000000 809s git-debrebase >= update HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 809s git-debrebase >$ 809s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 809s ' 809s + peel=peel-quick-unstitched-laundered 809s + git checkout -b peel-quick-unstitched-laundered 809s Switched to a new branch 'peel-quick-unstitched-laundered' 809s + t-clean-on-branch peel-quick-unstitched-laundered 809s + t-output '## peel-quick-unstitched-laundered' git status -b --porcelain 809s + printf '%s\n' '## peel-quick-unstitched-laundered' 809s + shift 809s + git status -b --porcelain 809s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 809s + : '---------- quick unstitched-laundered Sltf ----------' 809s + '[' xSltf '!=' x ']' 809s + : '---- quick unstitched-laundered ...Sltf ----' 809s + make_check Sltf 809s + case "$1" in 809s + t-refs-notexist refs/ffq-prev/heads/work-quick-unstitched-laundered 809s + local val 809s + for g in $* 809s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-unstitched-laundered 809s ++ local ref=refs/ffq-prev/heads/work-quick-unstitched-laundered 809s ++ case "$ref" in 809s ++ git show-ref -d refs/ffq-prev/heads/work-quick-unstitched-laundered 809s ++ perl -ne ' 809s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-unstitched-laundered\E(?:\^\{\})?$#; 809s END { print "$x\n" if length $x; } 809s ' 809s ++ test 1 = 1 809s + val= 809s + '[' x '!=' x ']' 809s + t-refs-same-start refs/debrebase-last/heads/work-quick-unstitched-laundered 809s + unset t_ref_val 809s + t_ref_names=() 809s + t-ref-head 809s + local val 809s ++ git rev-parse HEAD 809s + val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 809s + t-ref-same-val HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 809s + local name=HEAD 809s + local val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 809s + case "${t_ref_val-unset}" in 809s + t_ref_val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 809s + t_ref_names+=("$name") 809s + git diff --quiet 'HEAD^1' 809s + git diff 'HEAD^2' 809s + grep unstitched-laundered 809s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 809s - // upstream subcommands refs/heads/unstitched-laundered 1 809s -+// both! subcommands refs/heads/unstitched-laundered 1 809s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 809s -+// upstream subcommands refs/heads/unstitched-laundered 1 809s + git reset --hard 'HEAD^1' 809s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 809s + checkletters=ltf 809s + '[' xltf '!=' x ']' 809s + : '---- quick unstitched-laundered ...ltf ----' 809s + make_check ltf 809s + case "$1" in 809s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-laundered -- :. ':!debian/patches' 809s + t-gdr-good laundered 809s + local state=laundered 809s + local beforetag= 809s + case $state in 809s + git diff --quiet -- :. ':!debian/patches' 809s + LC_MESSAGES=C 809s + t-git-debrebase status 809s + local gdr=git-debrebase 809s + : ' 809s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 809s + git-debrebase --dgit=dgit -D status 809s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 809s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 809s git-debrebase = Upstream {"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 809s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 809s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 809s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 809s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 809s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 809s git-debrebase = Upstream {"Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0,"Differs" => 2}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Type" => "Upstream","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 809s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n"} 809s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 809s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 809s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Type" => "Upstream","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 809s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 809s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream"} 809s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 809s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 809s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 809s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 809s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 809s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 809s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 809s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 809s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 809s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 809s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 809s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 809s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 809s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 809s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 809s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 809s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 809s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 809s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 809s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-unstitched-laundered 809s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 809s ' 809s + case $state in 809s + egrep '^ *branch is laundered' ../status.check 809s branch is laundered 809s + t-gdr-good-analyse HEAD laundered 809s + local head=HEAD 809s + local state=laundered 809s + local wsfx= 809s + local etypes bwtip 809s + case $state in 809s + etypes=Upstream 809s ++ t-git-debrebase breakwater 809s ++ local gdr=git-debrebase 809s ++ : ' 809s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 809s ++ git-debrebase --dgit=dgit -D breakwater 809s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 809s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 809s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 809s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 809s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 809s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 809s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"} 809s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 809s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 809s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 809s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 809s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 809s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Type" => "Upstream"} 809s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 809s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 809s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 809s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 809s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 809s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Type" => "Upstream"} 809s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 809s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 809s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 809s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 809s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 809s git-debrebase = Packaging {"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 809s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 809s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 809s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 809s git-debrebase = Packaging {"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}]} 809s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 809s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 809s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 809s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 809s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 809s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 809s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 809s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 809s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 809s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 809s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 809s ' 809s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 809s + anal=../anal 809s + t-git-debrebase analyse HEAD 809s + local gdr=git-debrebase 809s + : ' 809s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 809s + git-debrebase --dgit=dgit -D analyse HEAD 809s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 809s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 809s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 809s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 809s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 809s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 809s git-debrebase = Upstream {"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Differs" => 2}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da"} 809s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 809s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 809s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 809s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 809s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 809s git-debrebase = Upstream {"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"} 809s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 809s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 809s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"} 809s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 809s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 809s git-debrebase = Upstream {"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 809s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 809s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 809s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 809s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 809s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 809s git-debrebase = Packaging {"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32,"Ix" => 0}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 809s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 809s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 809s git-debrebase = Packaging {"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}]} 809s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 809s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 809s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"} 809s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 809s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 809s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 809s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 809s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 809s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}]} 809s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 809s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 809s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 809s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 809s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 809s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 809s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]]} 809s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 809s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 809s ' 809s ++ git rev-parse HEAD 809s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 809s + exec 809s + local cid ctype info nparents 809s + read cid ctype info 809s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 809s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 809s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s + enparents=1 809s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 809s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 809s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s + enparents=1 809s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 809s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 809s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 809s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 809s + enparents=1 809s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 809s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 809s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 809s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 809s + enparents=1 809s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 809s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 809s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s + enparents=1 809s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 809s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 809s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s + enparents=1 809s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s ++ wc -w 809s ++ t-sort -u 809s ++ LC_COLLATE=C 809s ++ sort -u 809s + local cndparents=1 809s + test 1 = 1 809s + case "$parents" in 809s + case "$ctype" in 809s + read cid ctype info 809s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 809s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s + local cetype=Upstream 809s + '[' xUpstream = xUpstream ']' 809s + cetype=SAME 809s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 809s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 809s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 809s + enparents=1 809s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 809s + case "$ctype/$cetype" in 809s + case "$ctype/$etypes" in 809s + case "$cetype" in 809s + case "$ctype" in 809s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 809s ++ wc -w 809s + local cnparents=1 809s + test 1 = 1 809s ++ for f in $parents 809s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 810s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 810s + local cetype=Upstream 810s + '[' xPackaging = xUpstream ']' 810s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 810s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s + enparents=1 810s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 810s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 810s + bwtip= 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 810s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 810s + etypes=Packaging 810s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 810s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s + local cetype=Packaging 810s + '[' xPackaging = xPackaging ']' 810s + cetype=SAME 810s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 810s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s + enparents=1 810s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 810s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 810s + etypes=Packaging 810s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 810s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s + local cetype=Packaging 810s + '[' xPackaging = xPackaging ']' 810s + cetype=SAME 810s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 810s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 810s + expect=515e62b8d591fcc68597383b955d898db71abc6c 810s + enparents=1 810s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 810s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 810s + etypes=Packaging 810s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 810s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 810s + local cetype=Packaging 810s + '[' xPackaging = xPackaging ']' 810s + cetype=SAME 810s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 810s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 810s + expect=809643e5389def220ea36d61f2d3dd504603e95a 810s + enparents=1 810s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 810s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 810s + etypes=Packaging 810s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 810s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 810s + local cetype=Packaging 810s + '[' xChangelog = xPackaging ']' 810s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 810s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 810s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 810s + enparents=1 810s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 810s + etypes=Packaging 810s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 810s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 810s + local cetype=Packaging 810s + '[' xChangelog = xPackaging ']' 810s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 810s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s + enparents=1 810s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 810s + etypes=Packaging 810s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s ++ wc -w 810s + local cnparents=1 810s + test 1 = 1 810s ++ for f in $parents 810s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s ++ wc -w 810s ++ t-sort -u 810s ++ LC_COLLATE=C 810s ++ sort -u 810s + local cndparents=1 810s + test 1 = 1 810s + case "$parents" in 810s + case "$ctype" in 810s + read cid ctype info 810s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 810s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s + local cetype=Packaging 810s + '[' xAnchor = xPackaging ']' 810s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 810s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 810s + enparents=1 810s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 810s + case "$ctype/$cetype" in 810s + case "$ctype/$etypes" in 810s + case "$cetype" in 810s + case "$ctype" in 810s + break 810s + checkletters=tf 810s + '[' xtf '!=' x ']' 810s + : '---- quick unstitched-laundered ...tf ----' 810s + make_check tf 810s + case "$1" in 810s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-laundered 810s + checkletters=f 810s + '[' xf '!=' x ']' 810s + : '---- quick unstitched-laundered ...f ----' 810s + make_check f 810s + case "$1" in 810s + t-has-ancestor HEAD refs/heads/before-work-quick-unstitched-laundered 810s + local now 810s ++ git rev-parse HEAD 810s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 810s + local ancestor 810s ++ git rev-parse 'HEAD^{}' 810s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 810s + local mbase 810s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 810s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 810s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 810s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 810s + checkletters= 810s + '[' x '!=' x ']' 810s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 810s + work=work-quick-unstitched-mixed 810s + : '---------- quick unstitched-mixed ----------' 810s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 810s + git update-ref --stdin 810s + sed s/unstitched-mixed/work-quick-unstitched-mixed/ 810s + git checkout work-quick-unstitched-mixed 810s Switched to branch 'work-quick-unstitched-mixed' 810s + checkletters=Sl 810s + shift 810s + before=before-work-quick-unstitched-mixed 810s + git branch before-work-quick-unstitched-mixed 810s + local xopts= 810s + case "$checkletters" in 810s + case "$checkletters" in 810s + case "$checkletters" in 810s + case "$checkletters" in 810s + t-git-debrebase quick 810s + local gdr=git-debrebase 810s + : ' 810s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 810s + git-debrebase --dgit=dgit -D quick 810s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-mixed 810s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 810s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 810s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 810s git-debrebase = Mixed {"Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Mixed","Parents" => [{"Differs" => 34,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Ix" => 0}],"CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971"} 810s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 810s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 810s git-debrebase = Upstream {"Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Parents" => [{"Differs" => 2,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 810s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 810s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 810s git-debrebase = Packaging {"Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Parents" => [{"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"} 810s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 810s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 810s git-debrebase = AddPatches {"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Differs" => 4}],"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178"} 810s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 810s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 810s git-debrebase = Mixed {"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Parents" => [{"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Differs" => 34,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Mixed"} 810s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 810s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 810s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f"} 810s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 810s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 810s git-debrebase = Packaging {"Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"} 810s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 810s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 810s git-debrebase = Upstream {"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 810s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 810s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 810s git-debrebase = Upstream {"Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2"}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"} 810s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 810s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 810s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 2}],"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c"} 810s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 810s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 810s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 810s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 810s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 810s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 810s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 810s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 810s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 810s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 810s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 810s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 810s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 810s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 810s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 810s git-debrebase WALK REWRITING NOW cl=HASH(0x5592290461e8) procd=HASH(0x559229065170) 810s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 810s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 810s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 810s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 810s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 810s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 810s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 810s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 810s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 810s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 810s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 810s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 810s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 810s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 810s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 810s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 810s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 810s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 810s git-debrebase >$ 810s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-unstitched-mixed 810s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 810s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 810s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2,"Ix" => 0}]} 810s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 810s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 810s git-debrebase = Upstream {"Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Upstream"} 810s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 810s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 810s git-debrebase = Upstream {"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}],"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 810s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 810s git-debrebase = Upstream {"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}],"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 810s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 810s git-debrebase = Upstream {"Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"} 810s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 810s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 810s git-debrebase = Upstream {"Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}]} 810s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 810s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 810s git-debrebase = Upstream {"Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2,"Ix" => 0}],"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"} 810s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 810s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 810s git-debrebase = Packaging {"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 810s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 810s git-debrebase = Packaging {"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32}]} 810s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 810s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 810s git-debrebase = Packaging {"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 810s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 810s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 810s git-debrebase = Packaging {"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"} 810s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 810s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 810s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}]} 810s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 810s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 810s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 810s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 810s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 810s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 810s git-debrebase = Anchor {"OrigParents" => [{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 810s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 810s git-debrebase >= delete refs/ffq-prev/heads/work-quick-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 810s git-debrebase >= update refs/debrebase-last/heads/work-quick-unstitched-mixed 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 0000000000000000000000000000000000000000 810s git-debrebase >= update HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 810s git-debrebase >$ 810s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 810s ' 810s + peel=peel-quick-unstitched-mixed 810s + git checkout -b peel-quick-unstitched-mixed 810s Switched to a new branch 'peel-quick-unstitched-mixed' 810s + t-clean-on-branch peel-quick-unstitched-mixed 810s + t-output '## peel-quick-unstitched-mixed' git status -b --porcelain 810s + printf '%s\n' '## peel-quick-unstitched-mixed' 810s + shift 810s + git status -b --porcelain 810s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 810s + : '---------- quick unstitched-mixed Sl ----------' 810s + '[' xSl '!=' x ']' 810s + : '---- quick unstitched-mixed ...Sl ----' 810s + make_check Sl 810s + case "$1" in 810s + t-refs-notexist refs/ffq-prev/heads/work-quick-unstitched-mixed 810s + local val 810s + for g in $* 810s ++ t-git-get-ref refs/ffq-prev/heads/work-quick-unstitched-mixed 810s ++ local ref=refs/ffq-prev/heads/work-quick-unstitched-mixed 810s ++ case "$ref" in 810s ++ git show-ref -d refs/ffq-prev/heads/work-quick-unstitched-mixed 810s ++ perl -ne ' 810s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-quick-unstitched-mixed\E(?:\^\{\})?$#; 810s END { print "$x\n" if length $x; } 810s ' 810s ++ test 1 = 1 810s + val= 810s + '[' x '!=' x ']' 810s + t-refs-same-start refs/debrebase-last/heads/work-quick-unstitched-mixed 810s + unset t_ref_val 810s + t_ref_names=() 810s + t-ref-head 810s + local val 810s ++ git rev-parse HEAD 810s + val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 810s + t-ref-same-val HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 810s + local name=HEAD 810s + local val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 810s + case "${t_ref_val-unset}" in 810s + t_ref_val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 810s + t_ref_names+=("$name") 810s + git diff --quiet 'HEAD^1' 810s + git diff 'HEAD^2' 810s + grep unstitched-mixed 810s +// debian subcommands refs/heads/unstitched-mixed 1 810s +// both! subcommands refs/heads/unstitched-mixed 1 810s +// debian subcommands refs/heads/unstitched-mixed 2 810s +// both! subcommands refs/heads/unstitched-mixed 2 810s +// upstream subcommands refs/heads/unstitched-mixed 1 810s +// both! subcommands refs/heads/unstitched-mixed 1 810s +// upstream subcommands refs/heads/unstitched-mixed 2 810s +// both! subcommands refs/heads/unstitched-mixed 2 810s + git reset --hard 'HEAD^1' 810s HEAD is now at 7b7a1b7 MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 810s + checkletters=l 810s + '[' xl '!=' x ']' 810s + : '---- quick unstitched-mixed ...l ----' 810s + make_check l 810s + case "$1" in 810s + git diff --quiet HEAD refs/heads/before-work-quick-unstitched-mixed -- :. ':!debian/patches' 810s + t-gdr-good laundered 810s + local state=laundered 810s + local beforetag= 810s + case $state in 810s + git diff --quiet -- :. ':!debian/patches' 810s + LC_MESSAGES=C 810s + t-git-debrebase status 810s + local gdr=git-debrebase 810s + : ' 810s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 810s + git-debrebase --dgit=dgit -D status 810s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 810s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 810s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 810s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 810s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2"} 810s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 810s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 810s git-debrebase = Upstream {"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0}],"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream"} 810s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 810s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 810s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6"} 810s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 810s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 810s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"} 810s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 810s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 810s git-debrebase = Upstream {"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 810s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 810s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 810s git-debrebase = Upstream {"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2}]} 810s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 810s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 810s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67"} 810s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 810s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 810s git-debrebase = Packaging {"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578"} 810s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 810s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 810s git-debrebase = Packaging {"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}]} 810s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 810s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 810s git-debrebase = Packaging {"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 810s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 810s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 810s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 810s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 810s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 810s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 810s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 810s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 810s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 810s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-quick-unstitched-mixed 810s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 810s ' 810s + case $state in 810s + egrep '^ *branch is laundered' ../status.check 810s branch is laundered 810s + t-gdr-good-analyse HEAD laundered 810s + local head=HEAD 810s + local state=laundered 810s + local wsfx= 810s + local etypes bwtip 810s + case $state in 810s + etypes=Upstream 810s ++ t-git-debrebase breakwater 810s ++ local gdr=git-debrebase 810s ++ : ' 810s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 810s ++ git-debrebase --dgit=dgit -D breakwater 810s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 810s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 810s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2}],"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5"} 810s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 810s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 810s git-debrebase = Upstream {"Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Differs" => 2,"Ix" => 0}],"Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n"} 810s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 810s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 810s git-debrebase = Upstream {"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Type" => "Upstream","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Parents" => [{"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 810s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 810s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 810s git-debrebase = Upstream {"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Type" => "Upstream","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}]} 810s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 810s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 810s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 810s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 810s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}],"Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8"} 810s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 810s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 810s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Differs" => 2}],"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Type" => "Upstream"} 810s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 810s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 810s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}],"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Type" => "Packaging"} 810s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 810s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 810s git-debrebase = Packaging {"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Type" => "Packaging","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}],"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578"} 810s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 810s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 810s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32,"Ix" => 0}],"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Type" => "Packaging","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 810s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 810s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Type" => "Packaging"} 810s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 810s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 810s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 810s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 810s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 810s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 810s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 810s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 810s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 810s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 810s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 810s ' 810s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 810s + anal=../anal 810s + t-git-debrebase analyse HEAD 810s + local gdr=git-debrebase 810s + : ' 810s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 810s + git-debrebase --dgit=dgit -D analyse HEAD 810s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 810s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 810s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 810s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 810s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 810s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"} 810s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 810s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 810s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"Differs" => 2,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 810s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 810s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}],"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n"} 810s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 810s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 810s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Parents" => [{"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 810s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 810s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 810s git-debrebase = Upstream {"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Type" => "Upstream","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}]} 811s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 811s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 811s git-debrebase = Upstream {"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0}]} 811s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 811s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 811s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}],"Type" => "Packaging","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 811s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 811s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 811s git-debrebase = Packaging {"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Type" => "Packaging","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}]} 811s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 811s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 811s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 811s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 811s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 811s git-debrebase = Packaging {"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}]} 811s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 811s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 811s git-debrebase = Changelog {"Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 811s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 811s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 811s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 811s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 811s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 811s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 811s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 811s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 811s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 811s ' 811s ++ git rev-parse HEAD 811s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 811s + exec 811s + local cid ctype info nparents 811s + read cid ctype info 811s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 811s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 811s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s + enparents=1 811s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 811s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 811s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 811s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 811s + enparents=1 811s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 811s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 811s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s + enparents=1 811s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 811s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 811s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s + enparents=1 811s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 811s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 811s + local parents=e143304e38e5e9a822f93056dad834788c62e198 811s + expect=e143304e38e5e9a822f93056dad834788c62e198 811s + enparents=1 811s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo e143304e38e5e9a822f93056dad834788c62e198 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 811s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 811s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 811s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 811s + enparents=1 811s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 811s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 811s + local cetype=Upstream 811s + '[' xUpstream = xUpstream ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 811s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + enparents=1 811s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 811s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + local cetype=Upstream 811s + '[' xPackaging = xUpstream ']' 811s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s + enparents=1 811s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 811s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 811s + bwtip= 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 811s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 811s + etypes=Packaging 811s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 811s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s + local cetype=Packaging 811s + '[' xPackaging = xPackaging ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 811s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s + enparents=1 811s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 811s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 811s + etypes=Packaging 811s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 811s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s + local cetype=Packaging 811s + '[' xPackaging = xPackaging ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 811s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s + enparents=1 811s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 811s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 811s + etypes=Packaging 811s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 811s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s + local cetype=Packaging 811s + '[' xPackaging = xPackaging ']' 811s + cetype=SAME 811s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 811s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 811s + expect=809643e5389def220ea36d61f2d3dd504603e95a 811s + enparents=1 811s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 811s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 811s + etypes=Packaging 811s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s ++ wc -w 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 811s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 811s + local cetype=Packaging 811s + '[' xChangelog = xPackaging ']' 811s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 811s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 811s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 811s + enparents=1 811s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 811s + etypes=Packaging 811s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 811s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 811s + local cetype=Packaging 811s + '[' xChangelog = xPackaging ']' 811s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 811s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s + enparents=1 811s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 811s + etypes=Packaging 811s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s ++ wc -w 811s + local cnparents=1 811s + test 1 = 1 811s ++ for f in $parents 811s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s ++ wc -w 811s ++ t-sort -u 811s ++ LC_COLLATE=C 811s ++ sort -u 811s + local cndparents=1 811s + test 1 = 1 811s + case "$parents" in 811s + case "$ctype" in 811s + read cid ctype info 811s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 811s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s + local cetype=Packaging 811s + '[' xAnchor = xPackaging ']' 811s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 811s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 811s + enparents=1 811s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 811s + case "$ctype/$cetype" in 811s + case "$ctype/$etypes" in 811s + case "$cetype" in 811s + case "$ctype" in 811s + break 811s + checkletters= 811s + '[' x '!=' x ']' 811s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 811s + work=work-quick-raw-converted-from-gbp 811s + : '---------- quick raw-converted-from-gbp ----------' 811s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 811s + git update-ref --stdin 811s + sed s/raw-converted-from-gbp/work-quick-raw-converted-from-gbp/ 811s + git checkout work-quick-raw-converted-from-gbp 811s Switched to branch 'work-quick-raw-converted-from-gbp' 811s + checkletters=n 811s + shift 811s + before=before-work-quick-raw-converted-from-gbp 811s + git branch before-work-quick-raw-converted-from-gbp 811s + local xopts= 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + t-git-debrebase quick 811s + local gdr=git-debrebase 811s + : ' 811s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 811s + git-debrebase --dgit=dgit -D quick 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-raw-converted-from-gbp 811s git-debrebase ffq check_specs * 811s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 811s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 811s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 811s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 811s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 811s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 811s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 811s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 811s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 811s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}]} 811s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 811s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 811s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 811s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]]} 811s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 811s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 811s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 811s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 811s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 811s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 811s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 811s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s git-debrebase: laundered (head was 178896af44c5b02e05a3442df6c33233b6acb807) 811s git-debrebase >= update refs/ffq-prev/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 811s git-debrebase >= delete refs/debrebase-last/heads/work-quick-raw-converted-from-gbp 811s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 811s git-debrebase >$ 811s Recorded previous head for preservation 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-quick-raw-converted-from-gbp 811s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 811s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 811s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Parents" => [{"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 811s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 811s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 811s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}]} 811s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 811s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 811s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 811s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 811s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 811s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 811s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 811s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 811s git-debrebase >= delete refs/ffq-prev/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 811s git-debrebase >= update refs/debrebase-last/heads/work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 0000000000000000000000000000000000000000 811s git-debrebase >= update HEAD 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 811s git-debrebase >$ 811s HEAD is now at 178896a Add another new upstream file 811s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 811s ' 811s + peel=peel-quick-raw-converted-from-gbp 811s + git checkout -b peel-quick-raw-converted-from-gbp 811s Switched to a new branch 'peel-quick-raw-converted-from-gbp' 811s + t-clean-on-branch peel-quick-raw-converted-from-gbp 811s + t-output '## peel-quick-raw-converted-from-gbp' git status -b --porcelain 811s + printf '%s\n' '## peel-quick-raw-converted-from-gbp' 811s + shift 811s + git status -b --porcelain 811s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 811s + : '---------- quick raw-converted-from-gbp n ----------' 811s + '[' xn '!=' x ']' 811s + : '---- quick raw-converted-from-gbp ...n ----' 811s + make_check n 811s + case "$1" in 811s + t-refs-same-start 811s + unset t_ref_val 811s + t_ref_names=() 811s + t-refs-same refs/heads/before-work-quick-raw-converted-from-gbp refs/heads/peel-quick-raw-converted-from-gbp 811s + local g 811s + for g in $* 811s + t-ref-same refs/heads/before-work-quick-raw-converted-from-gbp 811s + local name=refs/heads/before-work-quick-raw-converted-from-gbp 811s + local val 811s ++ t-git-get-ref refs/heads/before-work-quick-raw-converted-from-gbp 811s ++ local ref=refs/heads/before-work-quick-raw-converted-from-gbp 811s ++ case "$ref" in 811s ++ git show-ref -d refs/heads/before-work-quick-raw-converted-from-gbp 811s ++ perl -ne ' 811s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-quick-raw-converted-from-gbp\E(?:\^\{\})?$#; 811s END { print "$x\n" if length $x; } 811s ' 811s + val=178896af44c5b02e05a3442df6c33233b6acb807 811s + t-ref-same-val refs/heads/before-work-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 811s + local name=refs/heads/before-work-quick-raw-converted-from-gbp 811s + local val=178896af44c5b02e05a3442df6c33233b6acb807 811s + case "${t_ref_val-unset}" in 811s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 811s + t_ref_names+=("$name") 811s + for g in $* 811s + t-ref-same refs/heads/peel-quick-raw-converted-from-gbp 811s + local name=refs/heads/peel-quick-raw-converted-from-gbp 811s + local val 811s ++ t-git-get-ref refs/heads/peel-quick-raw-converted-from-gbp 811s ++ local ref=refs/heads/peel-quick-raw-converted-from-gbp 811s ++ case "$ref" in 811s ++ git show-ref -d refs/heads/peel-quick-raw-converted-from-gbp 811s ++ perl -ne ' 811s $x = $1 if m#^(\w+) \Qrefs/heads/peel-quick-raw-converted-from-gbp\E(?:\^\{\})?$#; 811s END { print "$x\n" if length $x; } 811s ' 811s + val=178896af44c5b02e05a3442df6c33233b6acb807 811s + t-ref-same-val refs/heads/peel-quick-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 811s + local name=refs/heads/peel-quick-raw-converted-from-gbp 811s + local val=178896af44c5b02e05a3442df6c33233b6acb807 811s + case "${t_ref_val-unset}" in 811s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 811s + t_ref_names+=("$name") 811s + checkletters= 811s + '[' x '!=' x ']' 811s + subcmd conclude 'F:No ongoing git-debrebase session' 'F:No ongoing git-debrebase session' Sltf Sl N 811s + local subcmd=conclude 811s + shift 811s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 811s + work=work-conclude-stitched-laundered 811s + : '---------- conclude stitched-laundered ----------' 811s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 811s + git update-ref --stdin 811s + sed s/stitched-laundered/work-conclude-stitched-laundered/ 811s + git checkout work-conclude-stitched-laundered 811s Switched to branch 'work-conclude-stitched-laundered' 811s + checkletters='F:No ongoing git-debrebase session' 811s + shift 811s + before=before-work-conclude-stitched-laundered 811s + git branch before-work-conclude-stitched-laundered 811s + local xopts= 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + t-expect-fail 'F:No ongoing git-debrebase session' t-git-debrebase conclude 811s + local 'mpat=F:No ongoing git-debrebase session' 811s + shift 811s + set +o pipefail 811s + LC_MESSAGES=C 811s + LANGUAGE=C 811s + t-git-debrebase conclude 811s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local gdr=git-debrebase 811s + : ' 811s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 811s + git-debrebase --dgit=dgit -D conclude 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-stitched-laundered 811s 811s git-debrebase: error: No ongoing git-debrebase session. 811s + local 'ps=255 0' 811s + set -o pipefail 811s + case $ps in 811s + t-grep-mpat 'F:No ongoing git-debrebase session' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local 'mpat=F:No ongoing git-debrebase session' 811s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local grepper=fgrep 811s + case "$mpat" in 811s + case "$mpat" in 811s + grepper=fgrep 811s + mpat='No ongoing git-debrebase session' 811s + fgrep -e 'No ongoing git-debrebase session' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s git-debrebase: error: No ongoing git-debrebase session. 811s + continue 811s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 811s + work=work-conclude-stitched-mixed 811s + : '---------- conclude stitched-mixed ----------' 811s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 811s + git update-ref --stdin 811s + sed s/stitched-mixed/work-conclude-stitched-mixed/ 811s + git checkout work-conclude-stitched-mixed 811s Switched to branch 'work-conclude-stitched-mixed' 811s + checkletters='F:No ongoing git-debrebase session' 811s + shift 811s + before=before-work-conclude-stitched-mixed 811s + git branch before-work-conclude-stitched-mixed 811s + local xopts= 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + t-expect-fail 'F:No ongoing git-debrebase session' t-git-debrebase conclude 811s + local 'mpat=F:No ongoing git-debrebase session' 811s + shift 811s + set +o pipefail 811s + LC_MESSAGES=C 811s + LANGUAGE=C 811s + t-git-debrebase conclude 811s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local gdr=git-debrebase 811s + : ' 811s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 811s + git-debrebase --dgit=dgit -D conclude 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-stitched-mixed 811s 811s git-debrebase: error: No ongoing git-debrebase session. 811s + local 'ps=255 0' 811s + set -o pipefail 811s + case $ps in 811s + t-grep-mpat 'F:No ongoing git-debrebase session' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local 'mpat=F:No ongoing git-debrebase session' 811s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s + local grepper=fgrep 811s + case "$mpat" in 811s + case "$mpat" in 811s + grepper=fgrep 811s + mpat='No ongoing git-debrebase session' 811s + fgrep -e 'No ongoing git-debrebase session' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 811s git-debrebase: error: No ongoing git-debrebase session. 811s + continue 811s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 811s + work=work-conclude-unstitched-laundered 811s + : '---------- conclude unstitched-laundered ----------' 811s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 811s + git update-ref --stdin 811s + sed s/unstitched-laundered/work-conclude-unstitched-laundered/ 811s + git checkout work-conclude-unstitched-laundered 811s Switched to branch 'work-conclude-unstitched-laundered' 811s + checkletters=Sltf 811s + shift 811s + before=before-work-conclude-unstitched-laundered 811s + git branch before-work-conclude-unstitched-laundered 811s + local xopts= 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + case "$checkletters" in 811s + t-git-debrebase conclude 811s + local gdr=git-debrebase 811s + : ' 811s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 811s + git-debrebase --dgit=dgit -D conclude 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 811s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 811s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 811s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 811s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b"} 811s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 811s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 811s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 811s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 811s git-debrebase = Upstream {"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 811s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 811s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 811s git-debrebase = Upstream {"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0,"Differs" => 2}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d"} 811s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 811s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 811s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 811s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 811s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730"}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 811s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 811s git-debrebase = Upstream {"Parents" => [{"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0,"Differs" => 2}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 811s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 811s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 811s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 811s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21"} 811s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 811s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 811s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 811s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 811s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 811s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 811s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 811s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n"} 811s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 811s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 811s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 811s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 811s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 811s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 811s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 811s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 811s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 811s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 811s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 811s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 811s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 811s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 811s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 811s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 811s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 811s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 811s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 811s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 811s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 811s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 811s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 811s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 811s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 811s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-laundered 811s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 811s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 811s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 811s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 811s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 811s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 811s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 811s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 811s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 811s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 811s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 811s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 811s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 811s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 811s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5"} 811s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 811s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 811s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 811s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 811s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0}],"Type" => "Packaging","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 811s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 811s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 811s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0,"Differs" => 32}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 811s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 811s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Type" => "Packaging","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Parents" => [{"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0,"Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n"} 811s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 811s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 811s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 811s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 811s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 811s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 811s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 811s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 811s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 811s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 811s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1,"Differs" => 48}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 811s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 811s git-debrebase >= delete refs/ffq-prev/heads/work-conclude-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 811s git-debrebase >= update refs/debrebase-last/heads/work-conclude-unstitched-laundered b35dc4c5ac9626e05811f857d83e42693da4c5ce 0000000000000000000000000000000000000000 811s git-debrebase >= update HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 811s git-debrebase >$ 811s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 811s ' 811s + peel=peel-conclude-unstitched-laundered 811s + git checkout -b peel-conclude-unstitched-laundered 811s Switched to a new branch 'peel-conclude-unstitched-laundered' 811s + t-clean-on-branch peel-conclude-unstitched-laundered 811s + t-output '## peel-conclude-unstitched-laundered' git status -b --porcelain 811s + printf '%s\n' '## peel-conclude-unstitched-laundered' 811s + shift 811s + git status -b --porcelain 811s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 811s + : '---------- conclude unstitched-laundered Sltf ----------' 811s + '[' xSltf '!=' x ']' 811s + : '---- conclude unstitched-laundered ...Sltf ----' 811s + make_check Sltf 811s + case "$1" in 811s + t-refs-notexist refs/ffq-prev/heads/work-conclude-unstitched-laundered 811s + local val 811s + for g in $* 811s ++ t-git-get-ref refs/ffq-prev/heads/work-conclude-unstitched-laundered 811s ++ local ref=refs/ffq-prev/heads/work-conclude-unstitched-laundered 811s ++ case "$ref" in 811s ++ git show-ref -d refs/ffq-prev/heads/work-conclude-unstitched-laundered 811s ++ perl -ne ' 811s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-conclude-unstitched-laundered\E(?:\^\{\})?$#; 811s END { print "$x\n" if length $x; } 811s ' 811s ++ test 1 = 1 811s + val= 811s + '[' x '!=' x ']' 811s + t-refs-same-start refs/debrebase-last/heads/work-conclude-unstitched-laundered 811s + unset t_ref_val 811s + t_ref_names=() 811s + t-ref-head 811s + local val 811s ++ git rev-parse HEAD 811s + val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 811s + t-ref-same-val HEAD b35dc4c5ac9626e05811f857d83e42693da4c5ce 811s + local name=HEAD 811s + local val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 811s + case "${t_ref_val-unset}" in 811s + t_ref_val=b35dc4c5ac9626e05811f857d83e42693da4c5ce 811s + t_ref_names+=("$name") 811s + git diff --quiet 'HEAD^1' 811s + git diff 'HEAD^2' 811s + grep unstitched-laundered 811s -Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 811s - // upstream subcommands refs/heads/unstitched-laundered 1 811s -+// both! subcommands refs/heads/unstitched-laundered 1 811s -Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 811s -+// upstream subcommands refs/heads/unstitched-laundered 1 811s + git reset --hard 'HEAD^1' 811s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 811s + checkletters=ltf 811s + '[' xltf '!=' x ']' 811s + : '---- conclude unstitched-laundered ...ltf ----' 811s + make_check ltf 811s + case "$1" in 811s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-laundered -- :. ':!debian/patches' 811s + t-gdr-good laundered 811s + local state=laundered 811s + local beforetag= 811s + case $state in 811s + git diff --quiet -- :. ':!debian/patches' 811s + LC_MESSAGES=C 811s + t-git-debrebase status 811s + local gdr=git-debrebase 811s + : ' 811s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 811s + git-debrebase --dgit=dgit -D status 811s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 811s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 811s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 811s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 811s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 811s git-debrebase = Upstream {"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n"} 811s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 811s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 811s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}]} 811s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 811s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 811s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Differs" => 2}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 811s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 811s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0,"Differs" => 2}]} 811s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 811s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 811s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 811s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 811s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 811s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Parents" => [{"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 811s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 811s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 811s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Ix" => 0,"Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 811s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 811s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 811s git-debrebase = Packaging {"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 811s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 811s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 811s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 812s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 812s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 812s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0,"Differs" => 32}]} 812s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 812s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 812s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 812s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 812s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 812s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 812s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 812s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 812s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 812s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 812s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-conclude-unstitched-laundered 812s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 812s ' 812s + case $state in 812s + egrep '^ *branch is laundered' ../status.check 812s branch is laundered 812s + t-gdr-good-analyse HEAD laundered 812s + local head=HEAD 812s + local state=laundered 812s + local wsfx= 812s + local etypes bwtip 812s + case $state in 812s + etypes=Upstream 812s ++ t-git-debrebase breakwater 812s ++ local gdr=git-debrebase 812s ++ : ' 812s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 812s ++ git-debrebase --dgit=dgit -D breakwater 812s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 812s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 812s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 812s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 812s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 812s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da"} 812s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 812s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 812s git-debrebase = Upstream {"Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Type" => "Upstream","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 812s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 812s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 812s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d"} 812s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 812s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 812s git-debrebase = Upstream {"Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Differs" => 2}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Type" => "Upstream"} 812s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 812s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 812s git-debrebase = Upstream {"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Type" => "Upstream","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}]} 812s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 812s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 812s git-debrebase = Upstream {"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Differs" => 2}],"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 812s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 812s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 812s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","Type" => "Packaging","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 812s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 812s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 812s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 812s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 812s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 812s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Ix" => 0}],"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 812s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 812s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 812s git-debrebase = Packaging {"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n"} 812s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 812s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 812s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 812s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 812s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 812s git-debrebase = Changelog {"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 812s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 812s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 812s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 812s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 812s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 812s ' 812s + bwtip=Y:86248dea3770451139d1a57015bd9b36aa1ed39c 812s + anal=../anal 812s + t-git-debrebase analyse HEAD 812s + local gdr=git-debrebase 812s + : ' 812s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 812s + git-debrebase --dgit=dgit -D analyse HEAD 812s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 1 *main::STDOUT 812s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 812s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 812s git-debrebase = Upstream {"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Parents" => [{"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 812s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 812s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 812s git-debrebase = Upstream {"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream"} 812s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 812s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 812s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"} 812s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 812s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 812s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d"} 812s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 812s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 812s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"}]} 812s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 812s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 812s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Differs" => 2,"Ix" => 0}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 812s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 812s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 812s git-debrebase = Upstream {"Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150"} 812s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 812s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 812s git-debrebase = Packaging {"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d"}],"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 812s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 812s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 812s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d"}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21"} 812s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 812s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 812s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging"} 812s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 812s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 812s git-debrebase = Packaging {"Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"} 812s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 812s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 812s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}]} 812s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 812s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 812s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 812s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 812s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 812s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 812s git-debrebase = Anchor {"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor"} 812s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 812s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 812s ' 812s ++ git rev-parse HEAD 812s + expect=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + exec 812s + local cid ctype info nparents 812s + read cid ctype info 812s + : ===== 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream ===== 812s + test 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + local parents=fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s + expect=fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s + enparents=1 812s + : Upstream/SAME fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream ===== 812s + test fb2b176dd5509310e0f163d0610814f1f7b8a1be = fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P fb2b176dd5509310e0f163d0610814f1f7b8a1be 812s + local parents=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s + expect=eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s + enparents=1 812s + : Upstream/SAME eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream ===== 812s + test eb582a38ee36ac6a11c7c876ca3013ed426e76f4 = eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P eb582a38ee36ac6a11c7c876ca3013ed426e76f4 812s + local parents=b79d513107e3cff19d401deb87cc3e6c4809966e 812s + expect=b79d513107e3cff19d401deb87cc3e6c4809966e 812s + enparents=1 812s + : Upstream/SAME b79d513107e3cff19d401deb87cc3e6c4809966e 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s b79d513107e3cff19d401deb87cc3e6c4809966e 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo b79d513107e3cff19d401deb87cc3e6c4809966e 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== b79d513107e3cff19d401deb87cc3e6c4809966e Upstream ===== 812s + test b79d513107e3cff19d401deb87cc3e6c4809966e = b79d513107e3cff19d401deb87cc3e6c4809966e 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P b79d513107e3cff19d401deb87cc3e6c4809966e 812s + local parents=853334aca9591577e4a921adddf5b2cab3fb1ab8 812s + expect=853334aca9591577e4a921adddf5b2cab3fb1ab8 812s + enparents=1 812s + : Upstream/SAME 853334aca9591577e4a921adddf5b2cab3fb1ab8 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s 853334aca9591577e4a921adddf5b2cab3fb1ab8 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 853334aca9591577e4a921adddf5b2cab3fb1ab8 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream ===== 812s + test 853334aca9591577e4a921adddf5b2cab3fb1ab8 = 853334aca9591577e4a921adddf5b2cab3fb1ab8 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P 853334aca9591577e4a921adddf5b2cab3fb1ab8 812s + local parents=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s + expect=e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s + enparents=1 812s + : Upstream/SAME e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream ===== 812s + test e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 = e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 812s + local parents=6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s + expect=6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s + enparents=1 812s + : Upstream/SAME 6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s 6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream ===== 812s + test 6ff5320a54f70fe413a138a89b1f5fd0f237f730 = 6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s + local cetype=Upstream 812s + '[' xUpstream = xUpstream ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P 6ff5320a54f70fe413a138a89b1f5fd0f237f730 812s + local parents=86248dea3770451139d1a57015bd9b36aa1ed39c 812s + expect=86248dea3770451139d1a57015bd9b36aa1ed39c 812s + enparents=1 812s + : Upstream/SAME 86248dea3770451139d1a57015bd9b36aa1ed39c 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s ++ printf %s 86248dea3770451139d1a57015bd9b36aa1ed39c 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 86248dea3770451139d1a57015bd9b36aa1ed39c 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 86248dea3770451139d1a57015bd9b36aa1ed39c Packaging ===== 812s + test 86248dea3770451139d1a57015bd9b36aa1ed39c = 86248dea3770451139d1a57015bd9b36aa1ed39c 812s + local cetype=Upstream 812s + '[' xPackaging = xUpstream ']' 812s ++ git log -n1 --pretty=format:%P 86248dea3770451139d1a57015bd9b36aa1ed39c 812s + local parents=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s + expect=f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s + enparents=1 812s + : Packaging/Upstream f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + '[' xY:86248dea3770451139d1a57015bd9b36aa1ed39c '!=' x ']' 812s + test Y:86248dea3770451139d1a57015bd9b36aa1ed39c = Y:86248dea3770451139d1a57015bd9b36aa1ed39c 812s + bwtip= 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :. ':!debian' 812s + git diff --quiet f2db5dc7e25f34f0f34d04d0160f912a76b3667d..86248dea3770451139d1a57015bd9b36aa1ed39c -- :debian/patches 812s + etypes=Packaging 812s ++ printf %s f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== f2db5dc7e25f34f0f34d04d0160f912a76b3667d Packaging ===== 812s + test f2db5dc7e25f34f0f34d04d0160f912a76b3667d = f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s + local cetype=Packaging 812s + '[' xPackaging = xPackaging ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P f2db5dc7e25f34f0f34d04d0160f912a76b3667d 812s + local parents=301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s + expect=301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s + enparents=1 812s + : Packaging/SAME 301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :. ':!debian' 812s + git diff --quiet 301cc9756d79fc379acfed35ff33c0785f2e1b7d..f2db5dc7e25f34f0f34d04d0160f912a76b3667d -- :debian/patches 812s + etypes=Packaging 812s ++ printf %s 301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 301cc9756d79fc379acfed35ff33c0785f2e1b7d Packaging ===== 812s + test 301cc9756d79fc379acfed35ff33c0785f2e1b7d = 301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s + local cetype=Packaging 812s + '[' xPackaging = xPackaging ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P 301cc9756d79fc379acfed35ff33c0785f2e1b7d 812s + local parents=515e62b8d591fcc68597383b955d898db71abc6c 812s + expect=515e62b8d591fcc68597383b955d898db71abc6c 812s + enparents=1 812s + : Packaging/SAME 515e62b8d591fcc68597383b955d898db71abc6c 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :. ':!debian' 812s + git diff --quiet 515e62b8d591fcc68597383b955d898db71abc6c..301cc9756d79fc379acfed35ff33c0785f2e1b7d -- :debian/patches 812s + etypes=Packaging 812s ++ printf %s 515e62b8d591fcc68597383b955d898db71abc6c 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 515e62b8d591fcc68597383b955d898db71abc6c 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 515e62b8d591fcc68597383b955d898db71abc6c Packaging ===== 812s + test 515e62b8d591fcc68597383b955d898db71abc6c = 515e62b8d591fcc68597383b955d898db71abc6c 812s + local cetype=Packaging 812s + '[' xPackaging = xPackaging ']' 812s + cetype=SAME 812s ++ git log -n1 --pretty=format:%P 515e62b8d591fcc68597383b955d898db71abc6c 812s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 812s + expect=809643e5389def220ea36d61f2d3dd504603e95a 812s + enparents=1 812s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :. ':!debian' 812s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..515e62b8d591fcc68597383b955d898db71abc6c -- :debian/patches 812s + etypes=Packaging 812s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 812s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 812s + local cetype=Packaging 812s + '[' xChangelog = xPackaging ']' 812s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 812s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 812s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 812s + enparents=1 812s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 812s + etypes=Packaging 812s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 812s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 812s + local cetype=Packaging 812s + '[' xChangelog = xPackaging ']' 812s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 812s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s + enparents=1 812s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 812s + etypes=Packaging 812s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s ++ wc -w 812s + local cnparents=1 812s + test 1 = 1 812s ++ for f in $parents 812s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s ++ wc -w 812s ++ t-sort -u 812s ++ LC_COLLATE=C 812s ++ sort -u 812s + local cndparents=1 812s + test 1 = 1 812s + case "$parents" in 812s + case "$ctype" in 812s + read cid ctype info 812s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 812s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s + local cetype=Packaging 812s + '[' xAnchor = xPackaging ']' 812s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 812s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 812s + enparents=1 812s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 812s + case "$ctype/$cetype" in 812s + case "$ctype/$etypes" in 812s + case "$cetype" in 812s + case "$ctype" in 812s + break 812s + checkletters=tf 812s + '[' xtf '!=' x ']' 812s + : '---- conclude unstitched-laundered ...tf ----' 812s + make_check tf 812s + case "$1" in 812s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-laundered 812s + checkletters=f 812s + '[' xf '!=' x ']' 812s + : '---- conclude unstitched-laundered ...f ----' 812s + make_check f 812s + case "$1" in 812s + t-has-ancestor HEAD refs/heads/before-work-conclude-unstitched-laundered 812s + local now 812s ++ git rev-parse HEAD 812s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + local ancestor 812s ++ git rev-parse 'HEAD^{}' 812s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + local mbase 812s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 812s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 812s + checkletters= 812s + '[' x '!=' x ']' 812s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 812s + work=work-conclude-unstitched-mixed 812s + : '---------- conclude unstitched-mixed ----------' 812s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 812s + git update-ref --stdin 812s + sed s/unstitched-mixed/work-conclude-unstitched-mixed/ 812s + git checkout work-conclude-unstitched-mixed 812s Switched to branch 'work-conclude-unstitched-mixed' 812s + checkletters=Sl 812s + shift 812s + before=before-work-conclude-unstitched-mixed 812s + git branch before-work-conclude-unstitched-mixed 812s + local xopts= 812s + case "$checkletters" in 812s + case "$checkletters" in 812s + case "$checkletters" in 812s + case "$checkletters" in 812s + t-git-debrebase conclude 812s + local gdr=git-debrebase 812s + : ' 812s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 812s + git-debrebase --dgit=dgit -D conclude 812s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 812s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 812s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 812s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 812s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 812s git-debrebase = Mixed {"Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367"}],"Type" => "Mixed","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971"} 812s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 812s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 812s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Differs" => 2}],"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39"} 812s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 812s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 812s git-debrebase = Packaging {"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Differs" => 32}]} 812s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 812s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 812s git-debrebase = AddPatches {"Type" => "AddPatches","Parents" => [{"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Ix" => 0,"Differs" => 4}],"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178"} 812s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 812s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 812s git-debrebase = Mixed {"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Parents" => [{"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0,"Differs" => 34}],"Type" => "Mixed"} 812s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 812s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 812s git-debrebase = Upstream {"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2}]} 812s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 812s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 812s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Ix" => 0}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"} 812s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 812s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 812s git-debrebase = Upstream {"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"}]} 812s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 812s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 812s git-debrebase = Upstream {"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Differs" => 2}]} 812s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 812s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 812s git-debrebase = Upstream {"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2","Parents" => [{"Differs" => 2,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Type" => "Upstream"} 812s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 812s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 812s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}]} 812s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 812s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 812s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Type" => "Changelog"} 812s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 812s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 812s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 812s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Parents" => [{"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 812s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 812s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 812s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 812s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 812s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 812s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 812s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 812s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 812s git-debrebase WALK REWRITING NOW cl=HASH(0x55da2dd3a3d8) procd=HASH(0x55da2dd3cf40) 812s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 812s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 812s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 812s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 812s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 812s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 812s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 812s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 812s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 812s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 812s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 812s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 812s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 812s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 812s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 812s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 812s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 812s git-debrebase: laundered (head was 9b56b9c2600dc10b9eec97d535d89870476de971) 812s git-debrebase >= update HEAD 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 812s git-debrebase >$ 812s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-unstitched-mixed 812s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 812s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 812s git-debrebase = Upstream {"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}]} 812s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 812s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 812s git-debrebase = Upstream {"Parents" => [{"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"} 812s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 812s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 812s git-debrebase = Upstream {"Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 812s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 812s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 812s git-debrebase = Upstream {"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}]} 812s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 812s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 812s git-debrebase = Upstream {"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Ix" => 0}]} 812s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 812s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 812s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Ix" => 0}],"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 812s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 812s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 812s git-debrebase = Upstream {"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Parents" => [{"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 812s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 812s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 812s git-debrebase = Packaging {"Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 812s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 812s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 812s git-debrebase = Packaging {"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"}]} 812s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 812s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 812s git-debrebase = Packaging {"Parents" => [{"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"} 813s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 813s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 813s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"} 813s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 813s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 813s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 813s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 813s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 813s git-debrebase = Changelog {"Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 813s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 813s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 813s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 813s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 813s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 813s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 813s git-debrebase >= delete refs/ffq-prev/heads/work-conclude-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 813s git-debrebase >= update refs/debrebase-last/heads/work-conclude-unstitched-mixed 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 0000000000000000000000000000000000000000 813s git-debrebase >= update HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 813s git-debrebase >$ 813s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s + peel=peel-conclude-unstitched-mixed 813s + git checkout -b peel-conclude-unstitched-mixed 813s Switched to a new branch 'peel-conclude-unstitched-mixed' 813s + t-clean-on-branch peel-conclude-unstitched-mixed 813s + t-output '## peel-conclude-unstitched-mixed' git status -b --porcelain 813s + printf '%s\n' '## peel-conclude-unstitched-mixed' 813s + shift 813s + git status -b --porcelain 813s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 813s + : '---------- conclude unstitched-mixed Sl ----------' 813s + '[' xSl '!=' x ']' 813s + : '---- conclude unstitched-mixed ...Sl ----' 813s + make_check Sl 813s + case "$1" in 813s + t-refs-notexist refs/ffq-prev/heads/work-conclude-unstitched-mixed 813s + local val 813s + for g in $* 813s ++ t-git-get-ref refs/ffq-prev/heads/work-conclude-unstitched-mixed 813s ++ local ref=refs/ffq-prev/heads/work-conclude-unstitched-mixed 813s ++ case "$ref" in 813s ++ perl -ne ' 813s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-conclude-unstitched-mixed\E(?:\^\{\})?$#; 813s END { print "$x\n" if length $x; } 813s ' 813s ++ git show-ref -d refs/ffq-prev/heads/work-conclude-unstitched-mixed 813s ++ test 1 = 1 813s + val= 813s + '[' x '!=' x ']' 813s + t-refs-same-start refs/debrebase-last/heads/work-conclude-unstitched-mixed 813s + unset t_ref_val 813s + t_ref_names=() 813s + t-ref-head 813s + local val 813s ++ git rev-parse HEAD 813s + val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 813s + t-ref-same-val HEAD 3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 813s + local name=HEAD 813s + local val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 813s + case "${t_ref_val-unset}" in 813s + t_ref_val=3ca6d82e73bf52a343a66ba9e49162b1d02d8e3a 813s + t_ref_names+=("$name") 813s + git diff --quiet 'HEAD^1' 813s + git diff 'HEAD^2' 813s + grep unstitched-mixed 813s +// debian subcommands refs/heads/unstitched-mixed 1 813s +// both! subcommands refs/heads/unstitched-mixed 1 813s +// debian subcommands refs/heads/unstitched-mixed 2 813s +// both! subcommands refs/heads/unstitched-mixed 2 813s +// upstream subcommands refs/heads/unstitched-mixed 1 813s +// both! subcommands refs/heads/unstitched-mixed 1 813s +// upstream subcommands refs/heads/unstitched-mixed 2 813s +// both! subcommands refs/heads/unstitched-mixed 2 813s + git reset --hard 'HEAD^1' 813s HEAD is now at 7b7a1b7 MIXED add both() (subcommands refs/heads/unstitched-mixed 2) 813s + checkletters=l 813s + '[' xl '!=' x ']' 813s + : '---- conclude unstitched-mixed ...l ----' 813s + make_check l 813s + case "$1" in 813s + git diff --quiet HEAD refs/heads/before-work-conclude-unstitched-mixed -- :. ':!debian/patches' 813s + t-gdr-good laundered 813s + local state=laundered 813s + local beforetag= 813s + case $state in 813s + git diff --quiet -- :. ':!debian/patches' 813s + LC_MESSAGES=C 813s + t-git-debrebase status 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D status 813s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 813s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 813s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Ix" => 0}],"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 813s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 813s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 813s git-debrebase = Upstream {"Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}]} 813s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 813s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 813s git-debrebase = Upstream {"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2,"Ix" => 0}]} 813s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 813s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 813s git-debrebase = Upstream {"Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Parents" => [{"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0}]} 813s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 813s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 813s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 813s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 813s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 813s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2}],"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8"} 813s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 813s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 813s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b"} 813s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 813s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 813s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Ix" => 0}],"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 813s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 813s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 813s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Differs" => 32}],"Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n"} 813s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 813s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 813s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"Type" => "Packaging","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71"} 813s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 813s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 813s git-debrebase = Packaging {"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}]} 813s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 813s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 813s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}]} 813s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 813s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 813s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 813s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 813s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 813s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 813s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/peel-conclude-unstitched-mixed 813s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s + case $state in 813s + egrep '^ *branch is laundered' ../status.check 813s branch is laundered 813s + t-gdr-good-analyse HEAD laundered 813s + local head=HEAD 813s + local state=laundered 813s + local wsfx= 813s + local etypes bwtip 813s + case $state in 813s + etypes=Upstream 813s ++ t-git-debrebase breakwater 813s ++ local gdr=git-debrebase 813s ++ : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s ++ git-debrebase --dgit=dgit -D breakwater 813s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 813s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 813s git-debrebase = Upstream {"Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45"}],"Type" => "Upstream"} 813s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 813s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 813s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2"} 813s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 813s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 813s git-debrebase = Upstream {"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Ix" => 0,"Differs" => 2}]} 813s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 813s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 813s git-debrebase = Upstream {"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Parents" => [{"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 813s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 813s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 813s git-debrebase = Upstream {"Parents" => [{"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3","Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 813s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 813s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 813s git-debrebase = Upstream {"Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Type" => "Upstream","Parents" => [{"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Differs" => 2,"Ix" => 0}]} 813s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 813s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 813s git-debrebase = Upstream {"Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"Type" => "Upstream"} 813s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 813s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 813s git-debrebase = Packaging {"Parents" => [{"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 813s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 813s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 813s git-debrebase = Packaging {"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Type" => "Packaging","Parents" => [{"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0,"Differs" => 32}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n"} 813s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 813s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 813s git-debrebase = Packaging {"Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0"}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0"} 813s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 813s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 813s git-debrebase = Packaging {"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169"} 813s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 813s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 813s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"} 813s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 813s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 813s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"} 813s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 813s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 813s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 813s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 813s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s + bwtip=Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + anal=../anal 813s + t-git-debrebase analyse HEAD 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D analyse HEAD 813s git-debrebase *** WALK 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 1 *main::STDOUT 813s git-debrebase get_differs 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 = 0x2 813s git-debrebase classify 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb $t=c7b9242ebb5fd1ae74e8893b815337112ef0d6e5 @p 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45/0x2 813s git-debrebase = Upstream {"CommitId" => "7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb","Type" => "Upstream","Hdr" => "tree c7b9242ebb5fd1ae74e8893b815337112ef0d6e5\nparent 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "c7b9242ebb5fd1ae74e8893b815337112ef0d6e5","Parents" => [{"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Differs" => 2,"Ix" => 0}]} 813s git-debrebase get_differs 439c17a177f0446ce30950b9b8e91f43c101cc23 3699a8fe7963625b6ab8d978fdfeb687e22042f2 = 0x2 813s git-debrebase classify 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 $t=3699a8fe7963625b6ab8d978fdfeb687e22042f2 @p 439c17a177f0446ce30950b9b8e91f43c101cc23/0x2 813s git-debrebase = Upstream {"CommitId" => "986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45","Type" => "Upstream","Hdr" => "tree 3699a8fe7963625b6ab8d978fdfeb687e22042f2\nparent 439c17a177f0446ce30950b9b8e91f43c101cc23\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Tree" => "3699a8fe7963625b6ab8d978fdfeb687e22042f2","Parents" => [{"Ix" => 0,"CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Differs" => 2}]} 813s git-debrebase get_differs 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 4f433123996b28186a3b6cb1b8b705d7a3333dec = 0x2 813s git-debrebase classify 439c17a177f0446ce30950b9b8e91f43c101cc23 $t=4f433123996b28186a3b6cb1b8b705d7a3333dec @p 0436dc2eaaf600249c1bce4335fdd5dc2e912e42/0x2 813s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "439c17a177f0446ce30950b9b8e91f43c101cc23","Parents" => [{"Ix" => 0,"CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Differs" => 2}],"Hdr" => "tree 4f433123996b28186a3b6cb1b8b705d7a3333dec\nparent 0436dc2eaaf600249c1bce4335fdd5dc2e912e42\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4f433123996b28186a3b6cb1b8b705d7a3333dec"} 813s git-debrebase get_differs f96b8ee9c829c22ea92f8e82e2048017db012c8a a81c80a25ad9930f057ffa8dbee4bc64475535e6 = 0x2 813s git-debrebase classify 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 $t=a81c80a25ad9930f057ffa8dbee4bc64475535e6 @p f96b8ee9c829c22ea92f8e82e2048017db012c8a/0x2 813s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "0436dc2eaaf600249c1bce4335fdd5dc2e912e42","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a"}],"Tree" => "a81c80a25ad9930f057ffa8dbee4bc64475535e6","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree a81c80a25ad9930f057ffa8dbee4bc64475535e6\nparent f96b8ee9c829c22ea92f8e82e2048017db012c8a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 813s git-debrebase get_differs e143304e38e5e9a822f93056dad834788c62e198 1979d1cc12b643ca3c7a6d3fb193eff5744740f3 = 0x2 813s git-debrebase classify f96b8ee9c829c22ea92f8e82e2048017db012c8a $t=1979d1cc12b643ca3c7a6d3fb193eff5744740f3 @p e143304e38e5e9a822f93056dad834788c62e198/0x2 813s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "f96b8ee9c829c22ea92f8e82e2048017db012c8a","Parents" => [{"Ix" => 0,"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Differs" => 2}],"Hdr" => "tree 1979d1cc12b643ca3c7a6d3fb193eff5744740f3\nparent e143304e38e5e9a822f93056dad834788c62e198\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000030 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "1979d1cc12b643ca3c7a6d3fb193eff5744740f3"} 813s git-debrebase get_differs 195f145753880dd4e5c1ff65136bb523cb2940c4 883935cfd74ca89f35046d1fa068266662fe21f8 = 0x2 813s git-debrebase classify e143304e38e5e9a822f93056dad834788c62e198 $t=883935cfd74ca89f35046d1fa068266662fe21f8 @p 195f145753880dd4e5c1ff65136bb523cb2940c4/0x2 813s git-debrebase = Upstream {"CommitId" => "e143304e38e5e9a822f93056dad834788c62e198","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "883935cfd74ca89f35046d1fa068266662fe21f8","Hdr" => "tree 883935cfd74ca89f35046d1fa068266662fe21f8\nparent 195f145753880dd4e5c1ff65136bb523cb2940c4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"}]} 813s git-debrebase get_differs 72e35041bfbd2d841ef8d4b4bf24616be30909ce f587f30a27f778e3dd784b3d599cda13f587b56b = 0x2 813s git-debrebase classify 195f145753880dd4e5c1ff65136bb523cb2940c4 $t=f587f30a27f778e3dd784b3d599cda13f587b56b @p 72e35041bfbd2d841ef8d4b4bf24616be30909ce/0x2 813s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "f587f30a27f778e3dd784b3d599cda13f587b56b","Hdr" => "tree f587f30a27f778e3dd784b3d599cda13f587b56b\nparent 72e35041bfbd2d841ef8d4b4bf24616be30909ce\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Upstream","CommitId" => "195f145753880dd4e5c1ff65136bb523cb2940c4"} 813s git-debrebase get_differs 7c13e61bd6887af7ef124f8331a541ae7431bc7c ad3ea77a259c10a362df964797fb0f72bcad0d67 = 0x20 813s git-debrebase classify 72e35041bfbd2d841ef8d4b4bf24616be30909ce $t=ad3ea77a259c10a362df964797fb0f72bcad0d67 @p 7c13e61bd6887af7ef124f8331a541ae7431bc7c/0x20 813s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c"}],"Tree" => "ad3ea77a259c10a362df964797fb0f72bcad0d67","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree ad3ea77a259c10a362df964797fb0f72bcad0d67\nparent 7c13e61bd6887af7ef124f8331a541ae7431bc7c\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Type" => "Packaging","CommitId" => "72e35041bfbd2d841ef8d4b4bf24616be30909ce"} 813s git-debrebase get_differs 63bb83776dc0439e7e1f38011cc3230347a1f3a0 b3fa45cf1192a0aab9497f5979efcac3b56fd578 = 0x20 813s git-debrebase classify 7c13e61bd6887af7ef124f8331a541ae7431bc7c $t=b3fa45cf1192a0aab9497f5979efcac3b56fd578 @p 63bb83776dc0439e7e1f38011cc3230347a1f3a0/0x20 813s git-debrebase = Packaging {"Hdr" => "tree b3fa45cf1192a0aab9497f5979efcac3b56fd578\nparent 63bb83776dc0439e7e1f38011cc3230347a1f3a0\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000030 +0100\n","Tree" => "b3fa45cf1192a0aab9497f5979efcac3b56fd578","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Ix" => 0}],"CommitId" => "7c13e61bd6887af7ef124f8331a541ae7431bc7c","Type" => "Packaging"} 813s git-debrebase get_differs 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 = 0x20 813s git-debrebase classify 63bb83776dc0439e7e1f38011cc3230347a1f3a0 $t=17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71 @p 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0/0x20 813s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "63bb83776dc0439e7e1f38011cc3230347a1f3a0","Parents" => [{"Ix" => 0,"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Differs" => 32}],"Tree" => "17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 17884f4e2f6a0b8bf92bf4c470dd2b5d8e640a71\nparent 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n"} 813s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a effb23b091b1ac6ab68a07e75473043a51f43169 = 0x20 813s git-debrebase classify 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 $t=effb23b091b1ac6ab68a07e75473043a51f43169 @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 813s git-debrebase = Packaging {"Tree" => "effb23b091b1ac6ab68a07e75473043a51f43169","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Hdr" => "tree effb23b091b1ac6ab68a07e75473043a51f43169\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000030 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"CommitId" => "9f709bdabe61538f8c7e779d001e7b4e87bcb6a0","Type" => "Packaging"} 813s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 813s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 813s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16,"Ix" => 0}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 813s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 813s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 813s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}]} 813s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 813s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 813s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 813s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 813s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 813s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s ++ git rev-parse HEAD 813s + expect=7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 813s + exec 813s + local cid ctype info nparents 813s + read cid ctype info 813s + : ===== 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb Upstream ===== 813s + test 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb = 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 813s + local parents=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s + expect=986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s + enparents=1 813s + : Upstream/SAME 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 Upstream ===== 813s + test 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 = 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 986e38fcd0f19ef356f70ecc5bdb7cbc8b8b7b45 813s + local parents=439c17a177f0446ce30950b9b8e91f43c101cc23 813s + expect=439c17a177f0446ce30950b9b8e91f43c101cc23 813s + enparents=1 813s + : Upstream/SAME 439c17a177f0446ce30950b9b8e91f43c101cc23 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s 439c17a177f0446ce30950b9b8e91f43c101cc23 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 439c17a177f0446ce30950b9b8e91f43c101cc23 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 439c17a177f0446ce30950b9b8e91f43c101cc23 Upstream ===== 813s + test 439c17a177f0446ce30950b9b8e91f43c101cc23 = 439c17a177f0446ce30950b9b8e91f43c101cc23 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 439c17a177f0446ce30950b9b8e91f43c101cc23 813s + local parents=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s + expect=0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s + enparents=1 813s + : Upstream/SAME 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 Upstream ===== 813s + test 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 = 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 0436dc2eaaf600249c1bce4335fdd5dc2e912e42 813s + local parents=f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + expect=f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + enparents=1 813s + : Upstream/SAME f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ wc -w 813s ++ printf %s f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== f96b8ee9c829c22ea92f8e82e2048017db012c8a Upstream ===== 813s + test f96b8ee9c829c22ea92f8e82e2048017db012c8a = f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P f96b8ee9c829c22ea92f8e82e2048017db012c8a 813s + local parents=e143304e38e5e9a822f93056dad834788c62e198 813s + expect=e143304e38e5e9a822f93056dad834788c62e198 813s + enparents=1 813s + : Upstream/SAME e143304e38e5e9a822f93056dad834788c62e198 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s e143304e38e5e9a822f93056dad834788c62e198 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo e143304e38e5e9a822f93056dad834788c62e198 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== e143304e38e5e9a822f93056dad834788c62e198 Upstream ===== 813s + test e143304e38e5e9a822f93056dad834788c62e198 = e143304e38e5e9a822f93056dad834788c62e198 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P e143304e38e5e9a822f93056dad834788c62e198 813s + local parents=195f145753880dd4e5c1ff65136bb523cb2940c4 813s + expect=195f145753880dd4e5c1ff65136bb523cb2940c4 813s + enparents=1 813s + : Upstream/SAME 195f145753880dd4e5c1ff65136bb523cb2940c4 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s 195f145753880dd4e5c1ff65136bb523cb2940c4 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 195f145753880dd4e5c1ff65136bb523cb2940c4 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 195f145753880dd4e5c1ff65136bb523cb2940c4 Upstream ===== 813s + test 195f145753880dd4e5c1ff65136bb523cb2940c4 = 195f145753880dd4e5c1ff65136bb523cb2940c4 813s + local cetype=Upstream 813s + '[' xUpstream = xUpstream ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 195f145753880dd4e5c1ff65136bb523cb2940c4 813s + local parents=72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + expect=72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + enparents=1 813s + : Upstream/SAME 72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s ++ printf %s 72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 72e35041bfbd2d841ef8d4b4bf24616be30909ce Packaging ===== 813s + test 72e35041bfbd2d841ef8d4b4bf24616be30909ce = 72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + local cetype=Upstream 813s + '[' xPackaging = xUpstream ']' 813s ++ git log -n1 --pretty=format:%P 72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + local parents=7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s + expect=7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s + enparents=1 813s + : Packaging/Upstream 7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + '[' xY:72e35041bfbd2d841ef8d4b4bf24616be30909ce '!=' x ']' 813s + test Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce = Y:72e35041bfbd2d841ef8d4b4bf24616be30909ce 813s + bwtip= 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :. ':!debian' 813s + git diff --quiet 7c13e61bd6887af7ef124f8331a541ae7431bc7c..72e35041bfbd2d841ef8d4b4bf24616be30909ce -- :debian/patches 813s + etypes=Packaging 813s ++ printf %s 7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 7c13e61bd6887af7ef124f8331a541ae7431bc7c Packaging ===== 813s + test 7c13e61bd6887af7ef124f8331a541ae7431bc7c = 7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s + local cetype=Packaging 813s + '[' xPackaging = xPackaging ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 7c13e61bd6887af7ef124f8331a541ae7431bc7c 813s + local parents=63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s + expect=63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s + enparents=1 813s + : Packaging/SAME 63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :. ':!debian' 813s + git diff --quiet 63bb83776dc0439e7e1f38011cc3230347a1f3a0..7c13e61bd6887af7ef124f8331a541ae7431bc7c -- :debian/patches 813s + etypes=Packaging 813s ++ printf %s 63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 63bb83776dc0439e7e1f38011cc3230347a1f3a0 Packaging ===== 813s + test 63bb83776dc0439e7e1f38011cc3230347a1f3a0 = 63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s + local cetype=Packaging 813s + '[' xPackaging = xPackaging ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 63bb83776dc0439e7e1f38011cc3230347a1f3a0 813s + local parents=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s + expect=9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s + enparents=1 813s + : Packaging/SAME 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :. ':!debian' 813s + git diff --quiet 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0..63bb83776dc0439e7e1f38011cc3230347a1f3a0 -- :debian/patches 813s + etypes=Packaging 813s ++ printf %s 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 Packaging ===== 813s + test 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 = 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s + local cetype=Packaging 813s + '[' xPackaging = xPackaging ']' 813s + cetype=SAME 813s ++ git log -n1 --pretty=format:%P 9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 813s + local parents=809643e5389def220ea36d61f2d3dd504603e95a 813s + expect=809643e5389def220ea36d61f2d3dd504603e95a 813s + enparents=1 813s + : Packaging/SAME 809643e5389def220ea36d61f2d3dd504603e95a 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :. ':!debian' 813s + git diff --quiet 809643e5389def220ea36d61f2d3dd504603e95a..9f709bdabe61538f8c7e779d001e7b4e87bcb6a0 -- :debian/patches 813s + etypes=Packaging 813s ++ printf %s 809643e5389def220ea36d61f2d3dd504603e95a 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 809643e5389def220ea36d61f2d3dd504603e95a 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 809643e5389def220ea36d61f2d3dd504603e95a Changelog ===== 813s + test 809643e5389def220ea36d61f2d3dd504603e95a = 809643e5389def220ea36d61f2d3dd504603e95a 813s + local cetype=Packaging 813s + '[' xChangelog = xPackaging ']' 813s ++ git log -n1 --pretty=format:%P 809643e5389def220ea36d61f2d3dd504603e95a 813s + local parents=a9e43d48f464a00d90f17184927401111ff9a8ed 813s + expect=a9e43d48f464a00d90f17184927401111ff9a8ed 813s + enparents=1 813s + : Changelog/Packaging a9e43d48f464a00d90f17184927401111ff9a8ed 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet a9e43d48f464a00d90f17184927401111ff9a8ed..809643e5389def220ea36d61f2d3dd504603e95a -- :. ':!debian/changelog' 813s + etypes=Packaging 813s ++ printf %s a9e43d48f464a00d90f17184927401111ff9a8ed 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo a9e43d48f464a00d90f17184927401111ff9a8ed 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== a9e43d48f464a00d90f17184927401111ff9a8ed Changelog ===== 813s + test a9e43d48f464a00d90f17184927401111ff9a8ed = a9e43d48f464a00d90f17184927401111ff9a8ed 813s + local cetype=Packaging 813s + '[' xChangelog = xPackaging ']' 813s ++ git log -n1 --pretty=format:%P a9e43d48f464a00d90f17184927401111ff9a8ed 813s + local parents=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s + expect=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s + enparents=1 813s + : Changelog/Packaging 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + git diff --quiet 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6..a9e43d48f464a00d90f17184927401111ff9a8ed -- :. ':!debian/changelog' 813s + etypes=Packaging 813s ++ printf %s 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s ++ wc -w 813s + local cnparents=1 813s + test 1 = 1 813s ++ for f in $parents 813s ++ echo 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s ++ wc -w 813s ++ t-sort -u 813s ++ LC_COLLATE=C 813s ++ sort -u 813s + local cndparents=1 813s + test 1 = 1 813s + case "$parents" in 813s + case "$ctype" in 813s + read cid ctype info 813s + : ===== 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 Anchor ===== 813s + test 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 = 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s + local cetype=Packaging 813s + '[' xAnchor = xPackaging ']' 813s ++ git log -n1 --pretty=format:%P 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 813s + local 'parents=cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 813s + expect='cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 813s + enparents=1 813s + : Anchor/Packaging 'cb0034db655d97285f64f8b69e80542b2d612491 923df13cd47c1ac87a6a0646124ace159c3d8291' 813s + case "$ctype/$cetype" in 813s + case "$ctype/$etypes" in 813s + case "$cetype" in 813s + case "$ctype" in 813s + break 813s + checkletters= 813s + '[' x '!=' x ']' 813s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 813s + work=work-conclude-raw-converted-from-gbp 813s + : '---------- conclude raw-converted-from-gbp ----------' 813s + sed s/raw-converted-from-gbp/work-conclude-raw-converted-from-gbp/ 813s + git update-ref --stdin 813s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 813s + git checkout work-conclude-raw-converted-from-gbp 813s Switched to branch 'work-conclude-raw-converted-from-gbp' 813s + checkletters=N 813s + shift 813s + before=before-work-conclude-raw-converted-from-gbp 813s + git branch before-work-conclude-raw-converted-from-gbp 813s + local xopts= 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + t-expect-fail E:. t-git-debrebase conclude 813s + local mpat=E:. 813s + shift 813s + set +o pipefail 813s + LC_MESSAGES=C 813s + LANGUAGE=C 813s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + t-git-debrebase conclude 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D conclude 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 813s 813s git-debrebase: error: No ongoing git-debrebase session. 813s + local 'ps=255 0' 813s + set -o pipefail 813s + case $ps in 813s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local mpat=E:. 813s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local grepper=fgrep 813s + case "$mpat" in 813s + case "$mpat" in 813s + grepper=egrep 813s + mpat=. 813s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D conclude 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 813s git-debrebase: error: No ongoing git-debrebase session. 813s + xopts+=' --noop-ok' 813s + next_checkletter 813s + checkletters= 813s + case "$checkletters" in 813s + t-git-debrebase --noop-ok conclude 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D --noop-ok conclude 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-conclude-raw-converted-from-gbp 813s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s + peel=peel-conclude-raw-converted-from-gbp 813s + git checkout -b peel-conclude-raw-converted-from-gbp 813s Switched to a new branch 'peel-conclude-raw-converted-from-gbp' 813s + t-clean-on-branch peel-conclude-raw-converted-from-gbp 813s + t-output '## peel-conclude-raw-converted-from-gbp' git status -b --porcelain 813s + printf '%s\n' '## peel-conclude-raw-converted-from-gbp' 813s + shift 813s + git status -b --porcelain 813s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 813s + : '---------- conclude raw-converted-from-gbp ----------' 813s + '[' x '!=' x ']' 813s + subcmd scrap Ns Ns Z Z N 813s + local subcmd=scrap 813s + shift 813s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 813s + work=work-scrap-stitched-laundered 813s + : '---------- scrap stitched-laundered ----------' 813s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 813s + git update-ref --stdin 813s + sed s/stitched-laundered/work-scrap-stitched-laundered/ 813s + git checkout work-scrap-stitched-laundered 813s Switched to branch 'work-scrap-stitched-laundered' 813s + checkletters=Ns 813s + shift 813s + before=before-work-scrap-stitched-laundered 813s + git branch before-work-scrap-stitched-laundered 813s + local xopts= 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + t-expect-fail E:. t-git-debrebase scrap 813s + local mpat=E:. 813s + shift 813s + set +o pipefail 813s + LC_MESSAGES=C 813s + LANGUAGE=C 813s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + t-git-debrebase scrap 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D scrap 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 813s 813s git-debrebase: error: No ongoing git-debrebase session. 813s + local 'ps=255 0' 813s + set -o pipefail 813s + case $ps in 813s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local mpat=E:. 813s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local grepper=fgrep 813s + case "$mpat" in 813s + case "$mpat" in 813s + grepper=egrep 813s + mpat=. 813s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D scrap 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 813s git-debrebase: error: No ongoing git-debrebase session. 813s + xopts+=' --noop-ok' 813s + next_checkletter 813s + checkletters=s 813s + case "$checkletters" in 813s + t-git-debrebase --noop-ok scrap 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D --noop-ok scrap 813s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-laundered 813s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 813s ' 813s + peel=peel-scrap-stitched-laundered 813s + git checkout -b peel-scrap-stitched-laundered 813s Switched to a new branch 'peel-scrap-stitched-laundered' 813s + t-clean-on-branch peel-scrap-stitched-laundered 813s + t-output '## peel-scrap-stitched-laundered' git status -b --porcelain 813s + printf '%s\n' '## peel-scrap-stitched-laundered' 813s + shift 813s + git status -b --porcelain 813s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 813s + : '---------- scrap stitched-laundered s ----------' 813s + '[' xs '!=' x ']' 813s + : '---- scrap stitched-laundered ...s ----' 813s + make_check s 813s + case "$1" in 813s + t-refs-notexist refs/ffq-prev/heads/work-scrap-stitched-laundered 813s + local val 813s + for g in $* 813s ++ t-git-get-ref refs/ffq-prev/heads/work-scrap-stitched-laundered 813s ++ local ref=refs/ffq-prev/heads/work-scrap-stitched-laundered 813s ++ case "$ref" in 813s ++ git show-ref -d refs/ffq-prev/heads/work-scrap-stitched-laundered 813s ++ perl -ne ' 813s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-scrap-stitched-laundered\E(?:\^\{\})?$#; 813s END { print "$x\n" if length $x; } 813s ' 813s ++ test 1 = 1 813s + val= 813s + '[' x '!=' x ']' 813s + t-refs-same-start 813s + unset t_ref_val 813s + t_ref_names=() 813s + t-refs-same refs/debrebase-last/heads/work-scrap-stitched-laundered refs/debrebase-last/heads/stitched-laundered 813s + local g 813s + for g in $* 813s + t-ref-same refs/debrebase-last/heads/work-scrap-stitched-laundered 813s + local name=refs/debrebase-last/heads/work-scrap-stitched-laundered 813s + local val 813s ++ t-git-get-ref refs/debrebase-last/heads/work-scrap-stitched-laundered 813s ++ local ref=refs/debrebase-last/heads/work-scrap-stitched-laundered 813s ++ case "$ref" in 813s ++ git show-ref -d refs/debrebase-last/heads/work-scrap-stitched-laundered 813s ++ perl -ne ' 813s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-scrap-stitched-laundered\E(?:\^\{\})?$#; 813s END { print "$x\n" if length $x; } 813s ' 813s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + t-ref-same-val refs/debrebase-last/heads/work-scrap-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + local name=refs/debrebase-last/heads/work-scrap-stitched-laundered 813s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + case "${t_ref_val-unset}" in 813s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + t_ref_names+=("$name") 813s + for g in $* 813s + t-ref-same refs/debrebase-last/heads/stitched-laundered 813s + local name=refs/debrebase-last/heads/stitched-laundered 813s + local val 813s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 813s ++ local ref=refs/debrebase-last/heads/stitched-laundered 813s ++ case "$ref" in 813s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 813s ++ perl -ne ' 813s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 813s END { print "$x\n" if length $x; } 813s ' 813s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + local name=refs/debrebase-last/heads/stitched-laundered 813s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + case "${t_ref_val-unset}" in 813s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + t_ref_names+=("$name") 813s + t-has-ancestor HEAD refs/debrebase-last/heads/work-scrap-stitched-laundered 813s + local now 813s ++ git rev-parse HEAD 813s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + local ancestor 813s ++ git rev-parse 'HEAD^{}' 813s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + local mbase 813s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 813s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 813s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 813s + checkletters= 813s + '[' x '!=' x ']' 813s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 813s + work=work-scrap-stitched-mixed 813s + : '---------- scrap stitched-mixed ----------' 813s + sed s/stitched-mixed/work-scrap-stitched-mixed/ 813s + git update-ref --stdin 813s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 813s + git checkout work-scrap-stitched-mixed 813s Switched to branch 'work-scrap-stitched-mixed' 813s + checkletters=Ns 813s + shift 813s + before=before-work-scrap-stitched-mixed 813s + git branch before-work-scrap-stitched-mixed 813s + local xopts= 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + case "$checkletters" in 813s + t-expect-fail E:. t-git-debrebase scrap 813s + local mpat=E:. 813s + shift 813s + set +o pipefail 813s + LC_MESSAGES=C 813s + LANGUAGE=C 813s + t-git-debrebase scrap 813s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 813s + local gdr=git-debrebase 813s + : ' 813s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 813s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 814s 814s git-debrebase: error: No ongoing git-debrebase session. 814s + local 'ps=255 0' 814s + set -o pipefail 814s + case $ps in 814s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local mpat=E:. 814s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local grepper=fgrep 814s + case "$mpat" in 814s + case "$mpat" in 814s + grepper=egrep 814s + mpat=. 814s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 814s git-debrebase: error: No ongoing git-debrebase session. 814s + xopts+=' --noop-ok' 814s + next_checkletter 814s + checkletters=s 814s + case "$checkletters" in 814s + t-git-debrebase --noop-ok scrap 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D --noop-ok scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-stitched-mixed 814s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 814s ' 814s + peel=peel-scrap-stitched-mixed 814s + git checkout -b peel-scrap-stitched-mixed 814s Switched to a new branch 'peel-scrap-stitched-mixed' 814s + t-clean-on-branch peel-scrap-stitched-mixed 814s + t-output '## peel-scrap-stitched-mixed' git status -b --porcelain 814s + printf '%s\n' '## peel-scrap-stitched-mixed' 814s + shift 814s + git status -b --porcelain 814s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 814s + : '---------- scrap stitched-mixed s ----------' 814s + '[' xs '!=' x ']' 814s + : '---- scrap stitched-mixed ...s ----' 814s + make_check s 814s + case "$1" in 814s + t-refs-notexist refs/ffq-prev/heads/work-scrap-stitched-mixed 814s + local val 814s + for g in $* 814s ++ t-git-get-ref refs/ffq-prev/heads/work-scrap-stitched-mixed 814s ++ local ref=refs/ffq-prev/heads/work-scrap-stitched-mixed 814s ++ case "$ref" in 814s ++ git show-ref -d refs/ffq-prev/heads/work-scrap-stitched-mixed 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-scrap-stitched-mixed\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s ++ test 1 = 1 814s + val= 814s + '[' x '!=' x ']' 814s + t-refs-same-start 814s + unset t_ref_val 814s + t_ref_names=() 814s + t-refs-same refs/debrebase-last/heads/work-scrap-stitched-mixed refs/debrebase-last/heads/stitched-mixed 814s + local g 814s + for g in $* 814s + t-ref-same refs/debrebase-last/heads/work-scrap-stitched-mixed 814s + local name=refs/debrebase-last/heads/work-scrap-stitched-mixed 814s + local val 814s ++ t-git-get-ref refs/debrebase-last/heads/work-scrap-stitched-mixed 814s ++ local ref=refs/debrebase-last/heads/work-scrap-stitched-mixed 814s ++ case "$ref" in 814s ++ git show-ref -d refs/debrebase-last/heads/work-scrap-stitched-mixed 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-scrap-stitched-mixed\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s ++ test 1 = 1 814s + val= 814s + t-ref-same-val refs/debrebase-last/heads/work-scrap-stitched-mixed 814s + local name=refs/debrebase-last/heads/work-scrap-stitched-mixed 814s + local val= 814s + case "${t_ref_val-unset}" in 814s + t_ref_val= 814s + t_ref_names+=("$name") 814s + for g in $* 814s + t-ref-same refs/debrebase-last/heads/stitched-mixed 814s + local name=refs/debrebase-last/heads/stitched-mixed 814s + local val 814s ++ t-git-get-ref refs/debrebase-last/heads/stitched-mixed 814s ++ local ref=refs/debrebase-last/heads/stitched-mixed 814s ++ case "$ref" in 814s ++ git show-ref -d refs/debrebase-last/heads/stitched-mixed 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-mixed\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s ++ test 1 = 1 814s + val= 814s + t-ref-same-val refs/debrebase-last/heads/stitched-mixed 814s + local name=refs/debrebase-last/heads/stitched-mixed 814s + local val= 814s + case "${t_ref_val-unset}" in 814s + t_ref_val= 814s + t_ref_names+=("$name") 814s + t-has-ancestor HEAD refs/debrebase-last/heads/work-scrap-stitched-mixed 814s + local now 814s ++ git rev-parse HEAD 814s + now=5e0bf3cea3c715230b96aca41156852390014b98 814s + local ancestor 814s ++ git rev-parse 'HEAD^{}' 814s + ancestor=5e0bf3cea3c715230b96aca41156852390014b98 814s + local mbase 814s ++ t-git-merge-base 5e0bf3cea3c715230b96aca41156852390014b98 5e0bf3cea3c715230b96aca41156852390014b98 814s ++ git merge-base 5e0bf3cea3c715230b96aca41156852390014b98 5e0bf3cea3c715230b96aca41156852390014b98 814s + mbase=5e0bf3cea3c715230b96aca41156852390014b98 814s + '[' x5e0bf3cea3c715230b96aca41156852390014b98 '!=' x5e0bf3cea3c715230b96aca41156852390014b98 ']' 814s + checkletters= 814s + '[' x '!=' x ']' 814s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 814s + work=work-scrap-unstitched-laundered 814s + : '---------- scrap unstitched-laundered ----------' 814s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 814s + git update-ref --stdin 814s + sed s/unstitched-laundered/work-scrap-unstitched-laundered/ 814s + git checkout work-scrap-unstitched-laundered 814s Switched to branch 'work-scrap-unstitched-laundered' 814s + checkletters=Z 814s + shift 814s + before=before-work-scrap-unstitched-laundered 814s + git branch before-work-scrap-unstitched-laundered 814s + local xopts= 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + t-git-debrebase scrap 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-unstitched-laundered 814s git-debrebase >= update refs/debrebase-last/heads/work-scrap-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 0000000000000000000000000000000000000000 814s git-debrebase >= update refs/ffq-prev/heads/work-scrap-unstitched-laundered 0000000000000000000000000000000000000000 5c6280b3d52c002248dd7f608e1adb63f1295538 814s git-debrebase >= update HEAD 5c6280b3d52c002248dd7f608e1adb63f1295538 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 814s git-debrebase >$ 814s HEAD is now at 5c6280b MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 814s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 814s ' 814s + peel=peel-scrap-unstitched-laundered 814s + git checkout -b peel-scrap-unstitched-laundered 814s Switched to a new branch 'peel-scrap-unstitched-laundered' 814s + t-clean-on-branch peel-scrap-unstitched-laundered 814s + t-output '## peel-scrap-unstitched-laundered' git status -b --porcelain 814s + printf '%s\n' '## peel-scrap-unstitched-laundered' 814s + shift 814s + git status -b --porcelain 814s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 814s + : '---------- scrap unstitched-laundered Z ----------' 814s + '[' xZ '!=' x ']' 814s + : '---- scrap unstitched-laundered ...Z ----' 814s + make_check Z 814s + case "$1" in 814s + t-refs-same-start 814s + unset t_ref_val 814s + t_ref_names=() 814s + t-refs-same refs/heads/peel-scrap-unstitched-laundered 814s + local g 814s + for g in $* 814s + t-ref-same refs/heads/peel-scrap-unstitched-laundered 814s + local name=refs/heads/peel-scrap-unstitched-laundered 814s + local val 814s ++ t-git-get-ref refs/heads/peel-scrap-unstitched-laundered 814s ++ local ref=refs/heads/peel-scrap-unstitched-laundered 814s ++ case "$ref" in 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/heads/peel-scrap-unstitched-laundered\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ++ git show-ref -d refs/heads/peel-scrap-unstitched-laundered 814s ' 814s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t-ref-same-val refs/heads/peel-scrap-unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 814s + local name=refs/heads/peel-scrap-unstitched-laundered 814s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t_ref_names+=("$name") 814s + t-refs-same refs/heads/before-unstitch/unstitched-laundered 814s + local g 814s + for g in $* 814s + t-ref-same refs/heads/before-unstitch/unstitched-laundered 814s + local name=refs/heads/before-unstitch/unstitched-laundered 814s + local val 814s ++ t-git-get-ref refs/heads/before-unstitch/unstitched-laundered 814s ++ local ref=refs/heads/before-unstitch/unstitched-laundered 814s ++ case "$ref" in 814s ++ git show-ref -d refs/heads/before-unstitch/unstitched-laundered 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/heads/before-unstitch/unstitched-laundered\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t-ref-same-val refs/heads/before-unstitch/unstitched-laundered 5c6280b3d52c002248dd7f608e1adb63f1295538 814s + local name=refs/heads/before-unstitch/unstitched-laundered 814s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t_ref_names+=("$name") 814s + t-ref-head 814s + local val 814s ++ git rev-parse HEAD 814s + val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t-ref-same-val HEAD 5c6280b3d52c002248dd7f608e1adb63f1295538 814s + local name=HEAD 814s + local val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=5c6280b3d52c002248dd7f608e1adb63f1295538 814s + t_ref_names+=("$name") 814s + checkletters= 814s + '[' x '!=' x ']' 814s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 814s + work=work-scrap-unstitched-mixed 814s + : '---------- scrap unstitched-mixed ----------' 814s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 814s + git update-ref --stdin 814s + sed s/unstitched-mixed/work-scrap-unstitched-mixed/ 814s + git checkout work-scrap-unstitched-mixed 814s Switched to branch 'work-scrap-unstitched-mixed' 814s + checkletters=Z 814s + shift 814s + before=before-work-scrap-unstitched-mixed 814s + git branch before-work-scrap-unstitched-mixed 814s + local xopts= 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + t-git-debrebase scrap 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-unstitched-mixed 814s git-debrebase >= update refs/debrebase-last/heads/work-scrap-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 0000000000000000000000000000000000000000 814s git-debrebase >= update refs/ffq-prev/heads/work-scrap-unstitched-mixed 0000000000000000000000000000000000000000 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s git-debrebase >= update HEAD 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 9b56b9c2600dc10b9eec97d535d89870476de971 814s git-debrebase >$ 814s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 814s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 814s ' 814s + peel=peel-scrap-unstitched-mixed 814s + git checkout -b peel-scrap-unstitched-mixed 814s Switched to a new branch 'peel-scrap-unstitched-mixed' 814s + t-clean-on-branch peel-scrap-unstitched-mixed 814s + t-output '## peel-scrap-unstitched-mixed' git status -b --porcelain 814s + printf '%s\n' '## peel-scrap-unstitched-mixed' 814s + shift 814s + git status -b --porcelain 814s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 814s + : '---------- scrap unstitched-mixed Z ----------' 814s + '[' xZ '!=' x ']' 814s + : '---- scrap unstitched-mixed ...Z ----' 814s + make_check Z 814s + case "$1" in 814s + t-refs-same-start 814s + unset t_ref_val 814s + t_ref_names=() 814s + t-refs-same refs/heads/peel-scrap-unstitched-mixed 814s + local g 814s + for g in $* 814s + t-ref-same refs/heads/peel-scrap-unstitched-mixed 814s + local name=refs/heads/peel-scrap-unstitched-mixed 814s + local val 814s ++ t-git-get-ref refs/heads/peel-scrap-unstitched-mixed 814s ++ local ref=refs/heads/peel-scrap-unstitched-mixed 814s ++ case "$ref" in 814s ++ git show-ref -d refs/heads/peel-scrap-unstitched-mixed 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/heads/peel-scrap-unstitched-mixed\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t-ref-same-val refs/heads/peel-scrap-unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + local name=refs/heads/peel-scrap-unstitched-mixed 814s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t_ref_names+=("$name") 814s + t-refs-same refs/heads/before-unstitch/unstitched-mixed 814s + local g 814s + for g in $* 814s + t-ref-same refs/heads/before-unstitch/unstitched-mixed 814s + local name=refs/heads/before-unstitch/unstitched-mixed 814s + local val 814s ++ t-git-get-ref refs/heads/before-unstitch/unstitched-mixed 814s ++ local ref=refs/heads/before-unstitch/unstitched-mixed 814s ++ case "$ref" in 814s ++ git show-ref -d refs/heads/before-unstitch/unstitched-mixed 814s ++ perl -ne ' 814s $x = $1 if m#^(\w+) \Qrefs/heads/before-unstitch/unstitched-mixed\E(?:\^\{\})?$#; 814s END { print "$x\n" if length $x; } 814s ' 814s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t-ref-same-val refs/heads/before-unstitch/unstitched-mixed 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + local name=refs/heads/before-unstitch/unstitched-mixed 814s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t_ref_names+=("$name") 814s + t-ref-head 814s + local val 814s ++ git rev-parse HEAD 814s + val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t-ref-same-val HEAD 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + local name=HEAD 814s + local val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + case "${t_ref_val-unset}" in 814s + t_ref_val=6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 814s + t_ref_names+=("$name") 814s + checkletters= 814s + '[' x '!=' x ']' 814s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 814s + work=work-scrap-raw-converted-from-gbp 814s + : '---------- scrap raw-converted-from-gbp ----------' 814s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 814s + git update-ref --stdin 814s + sed s/raw-converted-from-gbp/work-scrap-raw-converted-from-gbp/ 814s + git checkout work-scrap-raw-converted-from-gbp 814s Switched to branch 'work-scrap-raw-converted-from-gbp' 814s + checkletters=N 814s + shift 814s + before=before-work-scrap-raw-converted-from-gbp 814s + git branch before-work-scrap-raw-converted-from-gbp 814s + local xopts= 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + t-expect-fail E:. t-git-debrebase scrap 814s + local mpat=E:. 814s + shift 814s + set +o pipefail 814s + LC_MESSAGES=C 814s + LANGUAGE=C 814s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + t-git-debrebase scrap 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 814s 814s git-debrebase: error: No ongoing git-debrebase session. 814s + local 'ps=255 0' 814s + set -o pipefail 814s + case $ps in 814s + t-grep-mpat E:. /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local mpat=E:. 814s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local grepper=fgrep 814s + case "$mpat" in 814s + case "$mpat" in 814s + grepper=egrep 814s + mpat=. 814s + egrep -e . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 814s git-debrebase: error: No ongoing git-debrebase session. 814s + xopts+=' --noop-ok' 814s + next_checkletter 814s + checkletters= 814s + case "$checkletters" in 814s + t-git-debrebase --noop-ok scrap 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D --noop-ok scrap 814s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-scrap-raw-converted-from-gbp 814s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 814s ' 814s + peel=peel-scrap-raw-converted-from-gbp 814s + git checkout -b peel-scrap-raw-converted-from-gbp 814s Switched to a new branch 'peel-scrap-raw-converted-from-gbp' 814s + t-clean-on-branch peel-scrap-raw-converted-from-gbp 814s + t-output '## peel-scrap-raw-converted-from-gbp' git status -b --porcelain 814s + printf '%s\n' '## peel-scrap-raw-converted-from-gbp' 814s + shift 814s + git status -b --porcelain 814s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 814s + : '---------- scrap raw-converted-from-gbp ----------' 814s + '[' x '!=' x ']' 814s + subcmd make-patches sPft 'F:Patch export produced patch amendments' uPft 'F:Patch export produced patch amendments' Pn 814s + local subcmd=make-patches 814s + shift 814s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 814s + work=work-make-patches-stitched-laundered 814s + : '---------- make-patches stitched-laundered ----------' 814s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 814s + git update-ref --stdin 814s + sed s/stitched-laundered/work-make-patches-stitched-laundered/ 814s + git checkout work-make-patches-stitched-laundered 814s Switched to branch 'work-make-patches-stitched-laundered' 814s + checkletters=sPft 814s + shift 814s + before=before-work-make-patches-stitched-laundered 814s + git branch before-work-make-patches-stitched-laundered 814s + local xopts= 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + case "$checkletters" in 814s + t-git-debrebase make-patches 814s + local gdr=git-debrebase 814s + : ' 814s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 814s + git-debrebase --dgit=dgit -D make-patches 814s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 814s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 814s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 814s git-debrebase = Pseudomerge {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n","Parents" => [{"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Ix" => 0,"Differs" => 0},{"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Ix" => 1,"Differs" => 8}],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n"} 814s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 814s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 814s git-debrebase = Upstream {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0}]} 814s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 814s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 814s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391"}],"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4"} 814s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 814s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 814s git-debrebase = Upstream {"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555"}],"Type" => "Upstream","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 814s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 814s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 814s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Differs" => 2}],"Type" => "Upstream","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n"} 814s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 814s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 814s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Ix" => 0}]} 814s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 814s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 814s git-debrebase = Upstream {"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 814s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 814s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 814s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656","Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Differs" => 2}]} 814s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 814s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 814s git-debrebase = Packaging {"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Differs" => 32}],"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28"} 814s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 814s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 814s git-debrebase = Packaging {"Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Type" => "Packaging"} 814s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 814s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 814s git-debrebase = Packaging {"Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d"}]} 814s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 814s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 814s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Differs" => 32}],"Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e"} 814s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 814s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 814s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Ix" => 0,"Differs" => 16}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 814s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 814s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 814s git-debrebase = Changelog {"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 16}],"Type" => "Changelog","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 814s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 814s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 814s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 814s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 814s git-debrebase *** WALK 64d2fdf7628f675981360f0dce3aaaa227b0676a 0 - 814s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0 814s git-debrebase get_differs 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x8 814s git-debrebase classify 64d2fdf7628f675981360f0dce3aaaa227b0676a $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p dab3cc0fcfead932f6714305cfb670067c157804/0 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9/0x8 814s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Ix" => 0,"Differs" => 0},{"CommitId" => "9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9","Ix" => 1,"Differs" => 8}],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "64d2fdf7628f675981360f0dce3aaaa227b0676a","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent dab3cc0fcfead932f6714305cfb670067c157804\nparent 9d6d227a25eeaa46c107ceebf5dfd4cf4adaa5d9\nauthor dgit test git user 1530000008 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: quick]\n"} 814s git-debrebase get_differs 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d = 0x2 814s git-debrebase classify dab3cc0fcfead932f6714305cfb670067c157804 $t=4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d @p 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4/0x2 814s git-debrebase = Upstream {"Tree" => "4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "dab3cc0fcfead932f6714305cfb670067c157804","Hdr" => "tree 4bb5081b86c0bfb3fa29511ee82c2d873c1a3f4d\nparent 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Ix" => 0}],"Type" => "Upstream"} 814s git-debrebase get_differs 3025551c1e030f25c60bdabaab789745e585f391 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf = 0x2 814s git-debrebase classify 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 $t=823a56d21f6aea0f48e9fc2bd5a30552ca914aaf @p 3025551c1e030f25c60bdabaab789745e585f391/0x2 814s git-debrebase = Upstream {"Hdr" => "tree 823a56d21f6aea0f48e9fc2bd5a30552ca914aaf\nparent 3025551c1e030f25c60bdabaab789745e585f391\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6512f5b89fd98e0ecdf99b7d376b3094c41f54d4","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Differs" => 2}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "823a56d21f6aea0f48e9fc2bd5a30552ca914aaf"} 814s git-debrebase get_differs cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 228ab8d3c19570be4d2244ade9f765121eb10555 = 0x2 814s git-debrebase classify 3025551c1e030f25c60bdabaab789745e585f391 $t=228ab8d3c19570be4d2244ade9f765121eb10555 @p cda5ac6f8c9ae0afba09b32d661cfe801d5e8555/0x2 814s git-debrebase = Upstream {"CommitId" => "3025551c1e030f25c60bdabaab789745e585f391","Hdr" => "tree 228ab8d3c19570be4d2244ade9f765121eb10555\nparent cda5ac6f8c9ae0afba09b32d661cfe801d5e8555\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Ix" => 0}],"Type" => "Upstream","Tree" => "228ab8d3c19570be4d2244ade9f765121eb10555","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 814s git-debrebase get_differs 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 68f5bb4030958f88b68fd6314f04e9eeb9a76745 = 0x2 814s git-debrebase classify cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 $t=68f5bb4030958f88b68fd6314f04e9eeb9a76745 @p 302b5f6d03d17e2448d79f8b0c55fa8412a01be9/0x2 814s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Ix" => 0}],"Hdr" => "tree 68f5bb4030958f88b68fd6314f04e9eeb9a76745\nparent 302b5f6d03d17e2448d79f8b0c55fa8412a01be9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "cda5ac6f8c9ae0afba09b32d661cfe801d5e8555","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1)\n","Tree" => "68f5bb4030958f88b68fd6314f04e9eeb9a76745"} 814s git-debrebase get_differs b0291461cc529ff9fa4060b3e41ebff6cb563c49 62c38f9828a4af53809a241de29417bd7790cfec = 0x2 814s git-debrebase classify 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 $t=62c38f9828a4af53809a241de29417bd7790cfec @p b0291461cc529ff9fa4060b3e41ebff6cb563c49/0x2 814s git-debrebase = Upstream {"CommitId" => "302b5f6d03d17e2448d79f8b0c55fa8412a01be9","Hdr" => "tree 62c38f9828a4af53809a241de29417bd7790cfec\nparent b0291461cc529ff9fa4060b3e41ebff6cb563c49\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49"}],"Type" => "Upstream","Tree" => "62c38f9828a4af53809a241de29417bd7790cfec","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 814s git-debrebase get_differs 64efa6cded3fc4da385f8ed4bd8c72164c1c914d 4b0aa2b30c5c260ed1f972839f87a3d296009e2f = 0x2 814s git-debrebase classify b0291461cc529ff9fa4060b3e41ebff6cb563c49 $t=4b0aa2b30c5c260ed1f972839f87a3d296009e2f @p 64efa6cded3fc4da385f8ed4bd8c72164c1c914d/0x2 814s git-debrebase = Upstream {"Hdr" => "tree 4b0aa2b30c5c260ed1f972839f87a3d296009e2f\nparent 64efa6cded3fc4da385f8ed4bd8c72164c1c914d\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "b0291461cc529ff9fa4060b3e41ebff6cb563c49","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "4b0aa2b30c5c260ed1f972839f87a3d296009e2f"} 814s git-debrebase get_differs 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 b1864bd8afc87ad426fcbbd8540a4c80279a3656 = 0x2 814s git-debrebase classify 64efa6cded3fc4da385f8ed4bd8c72164c1c914d $t=b1864bd8afc87ad426fcbbd8540a4c80279a3656 @p 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45/0x2 814s git-debrebase = Upstream {"Hdr" => "tree b1864bd8afc87ad426fcbbd8540a4c80279a3656\nparent 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "64efa6cded3fc4da385f8ed4bd8c72164c1c914d","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "b1864bd8afc87ad426fcbbd8540a4c80279a3656"} 814s git-debrebase get_differs 420fa3b34303353709bcfbcf88ccc4e272f5ee48 769be9cfb8c28b832d0ec488622c5667ed519f28 = 0x20 814s git-debrebase classify 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 $t=769be9cfb8c28b832d0ec488622c5667ed519f28 @p 420fa3b34303353709bcfbcf88ccc4e272f5ee48/0x20 814s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48"}],"Hdr" => "tree 769be9cfb8c28b832d0ec488622c5667ed519f28\nparent 420fa3b34303353709bcfbcf88ccc4e272f5ee48\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "769be9cfb8c28b832d0ec488622c5667ed519f28"} 814s git-debrebase get_differs 4926fc77fd0b974ce5a2892ad46669ed4ec14edb 20cecf3273318f661b690042b6dffcd736d51f2c = 0x20 814s git-debrebase classify 420fa3b34303353709bcfbcf88ccc4e272f5ee48 $t=20cecf3273318f661b690042b6dffcd736d51f2c @p 4926fc77fd0b974ce5a2892ad46669ed4ec14edb/0x20 814s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Ix" => 0}],"Hdr" => "tree 20cecf3273318f661b690042b6dffcd736d51f2c\nparent 4926fc77fd0b974ce5a2892ad46669ed4ec14edb\nauthor dgit test git user 1530000006 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "420fa3b34303353709bcfbcf88ccc4e272f5ee48","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 2)\n","Tree" => "20cecf3273318f661b690042b6dffcd736d51f2c"} 814s git-debrebase get_differs 6184b930def645d1f8da8cb6a91475445cbb817d f8729cb27135ae6bffa9d78f8bb4b61df98b5472 = 0x20 814s git-debrebase classify 4926fc77fd0b974ce5a2892ad46669ed4ec14edb $t=f8729cb27135ae6bffa9d78f8bb4b61df98b5472 @p 6184b930def645d1f8da8cb6a91475445cbb817d/0x20 814s git-debrebase = Packaging {"Tree" => "f8729cb27135ae6bffa9d78f8bb4b61df98b5472","Msg" => "MIXED add both() (subcommands refs/heads/stitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "4926fc77fd0b974ce5a2892ad46669ed4ec14edb","Hdr" => "tree f8729cb27135ae6bffa9d78f8bb4b61df98b5472\nparent 6184b930def645d1f8da8cb6a91475445cbb817d\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Parents" => [{"Differs" => 32,"CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Ix" => 0}],"Type" => "Packaging"} 814s git-debrebase get_differs 6b98ac2fc854dc69f9cabc904a8e43328f649f41 69fbadef84ec066bfb790ed1a69c2572d34d097e = 0x20 814s git-debrebase classify 6184b930def645d1f8da8cb6a91475445cbb817d $t=69fbadef84ec066bfb790ed1a69c2572d34d097e @p 6b98ac2fc854dc69f9cabc904a8e43328f649f41/0x20 814s git-debrebase = Packaging {"Parents" => [{"CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","CommitId" => "6184b930def645d1f8da8cb6a91475445cbb817d","Hdr" => "tree 69fbadef84ec066bfb790ed1a69c2572d34d097e\nparent 6b98ac2fc854dc69f9cabc904a8e43328f649f41\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000008 +0100\n","Tree" => "69fbadef84ec066bfb790ed1a69c2572d34d097e","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-laundered 1)\n"} 814s git-debrebase get_differs bef5ccd302033398655e3e4e8896fba41691d0b2 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 814s git-debrebase classify 6b98ac2fc854dc69f9cabc904a8e43328f649f41 $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p bef5ccd302033398655e3e4e8896fba41691d0b2/0x10 814s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent bef5ccd302033398655e3e4e8896fba41691d0b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "6b98ac2fc854dc69f9cabc904a8e43328f649f41","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"}]} 814s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 814s git-debrebase classify bef5ccd302033398655e3e4e8896fba41691d0b2 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 814s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000008 +0100\n","CommitId" => "bef5ccd302033398655e3e4e8896fba41691d0b2"} 814s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 814s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 814s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 814s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor"} 814s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 7 proc 15 pm 0 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 814s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 814s git-debrebase WALK BUILD bef5ccd302033398655e3e4e8896fba41691d0b2 Debian (rewriting=0) 814s git-debrebase WALK BUILD 6b98ac2fc854dc69f9cabc904a8e43328f649f41 Debian (rewriting=0) 814s git-debrebase WALK BUILD 6184b930def645d1f8da8cb6a91475445cbb817d Debian (rewriting=0) 814s git-debrebase WALK BUILD 4926fc77fd0b974ce5a2892ad46669ed4ec14edb Debian (rewriting=0) 814s git-debrebase WALK BUILD 420fa3b34303353709bcfbcf88ccc4e272f5ee48 Debian (rewriting=0) 814s git-debrebase WALK BUILD 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 Debian (rewriting=0) 814s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 814s git-debrebase WALK BUILD 64efa6cded3fc4da385f8ed4bd8c72164c1c914d Upstream (rewriting=0) 814s git-debrebase WALK BUILD b0291461cc529ff9fa4060b3e41ebff6cb563c49 Upstream (rewriting=0) 814s git-debrebase WALK BUILD 302b5f6d03d17e2448d79f8b0c55fa8412a01be9 Upstream (rewriting=0) 814s git-debrebase WALK BUILD cda5ac6f8c9ae0afba09b32d661cfe801d5e8555 Upstream (rewriting=0) 814s git-debrebase WALK BUILD 3025551c1e030f25c60bdabaab789745e585f391 Upstream (rewriting=0) 814s git-debrebase WALK BUILD 6512f5b89fd98e0ecdf99b7d376b3094c41f54d4 Upstream (rewriting=0) 814s git-debrebase WALK BUILD dab3cc0fcfead932f6714305cfb670067c157804 Upstream (rewriting=0) 814s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 814s git-debrebase get_differs dab3cc0fcfead932f6714305cfb670067c157804 64d2fdf7628f675981360f0dce3aaaa227b0676a = 0 814s git-debrebase *** WALK RETURN dab3cc0fcfead932f6714305cfb670067c157804 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 814s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 814s git-debrebase gbp_pq_export bw 5ab5b1447a9776a9c2d0c9bdb9a73f9409c29d45 dab3cc0fcfead932f6714305cfb670067c157804 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 815s git-debrebase get_differs 64d2fdf7628f675981360f0dce3aaaa227b0676a c2291d120a12b2aae559cc4d1ac6940b480e39af = 0x4 815s git-debrebase >= update HEAD c2291d120a12b2aae559cc4d1ac6940b480e39af 64d2fdf7628f675981360f0dce3aaaa227b0676a 815s git-debrebase >$ 815s HEAD is now at c2291d1 Commit patch queue (exported by git-debrebase) 815s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 815s ' 815s + peel=peel-make-patches-stitched-laundered 815s + git checkout -b peel-make-patches-stitched-laundered 815s Switched to a new branch 'peel-make-patches-stitched-laundered' 815s + t-clean-on-branch peel-make-patches-stitched-laundered 815s + t-output '## peel-make-patches-stitched-laundered' git status -b --porcelain 815s + printf '%s\n' '## peel-make-patches-stitched-laundered' 815s + shift 815s + git status -b --porcelain 815s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 815s + : '---------- make-patches stitched-laundered sPft ----------' 815s + '[' xsPft '!=' x ']' 815s + : '---- make-patches stitched-laundered ...sPft ----' 815s + make_check sPft 815s + case "$1" in 815s + t-refs-notexist refs/ffq-prev/heads/work-make-patches-stitched-laundered 815s + local val 815s + for g in $* 815s ++ t-git-get-ref refs/ffq-prev/heads/work-make-patches-stitched-laundered 815s ++ local ref=refs/ffq-prev/heads/work-make-patches-stitched-laundered 815s ++ case "$ref" in 815s ++ git show-ref -d refs/ffq-prev/heads/work-make-patches-stitched-laundered 815s ++ perl -ne ' 815s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-make-patches-stitched-laundered\E(?:\^\{\})?$#; 815s END { print "$x\n" if length $x; } 815s ' 815s ++ test 1 = 1 815s + val= 815s + '[' x '!=' x ']' 815s + t-refs-same-start 815s + unset t_ref_val 815s + t_ref_names=() 815s + t-refs-same refs/debrebase-last/heads/work-make-patches-stitched-laundered refs/debrebase-last/heads/stitched-laundered 815s + local g 815s + for g in $* 815s + t-ref-same refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s + local name=refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s + local val 815s ++ t-git-get-ref refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s ++ local ref=refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s ++ case "$ref" in 815s ++ git show-ref -d refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s ++ perl -ne ' 815s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-make-patches-stitched-laundered\E(?:\^\{\})?$#; 815s END { print "$x\n" if length $x; } 815s ' 815s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + t-ref-same-val refs/debrebase-last/heads/work-make-patches-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + local name=refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + case "${t_ref_val-unset}" in 815s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + t_ref_names+=("$name") 815s + for g in $* 815s + t-ref-same refs/debrebase-last/heads/stitched-laundered 815s + local name=refs/debrebase-last/heads/stitched-laundered 815s + local val 815s ++ t-git-get-ref refs/debrebase-last/heads/stitched-laundered 815s ++ local ref=refs/debrebase-last/heads/stitched-laundered 815s ++ case "$ref" in 815s ++ git show-ref -d refs/debrebase-last/heads/stitched-laundered 815s ++ perl -ne ' 815s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/stitched-laundered\E(?:\^\{\})?$#; 815s END { print "$x\n" if length $x; } 815s ' 815s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + t-ref-same-val refs/debrebase-last/heads/stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + local name=refs/debrebase-last/heads/stitched-laundered 815s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + case "${t_ref_val-unset}" in 815s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + t_ref_names+=("$name") 815s + t-has-ancestor HEAD refs/debrebase-last/heads/work-make-patches-stitched-laundered 815s + local now 815s ++ git rev-parse HEAD 815s + now=c2291d120a12b2aae559cc4d1ac6940b480e39af 815s + local ancestor 815s ++ git rev-parse 'HEAD^{}' 815s + ancestor=c2291d120a12b2aae559cc4d1ac6940b480e39af 815s + local mbase 815s ++ t-git-merge-base c2291d120a12b2aae559cc4d1ac6940b480e39af c2291d120a12b2aae559cc4d1ac6940b480e39af 815s ++ git merge-base c2291d120a12b2aae559cc4d1ac6940b480e39af c2291d120a12b2aae559cc4d1ac6940b480e39af 815s + mbase=c2291d120a12b2aae559cc4d1ac6940b480e39af 815s + '[' xc2291d120a12b2aae559cc4d1ac6940b480e39af '!=' xc2291d120a12b2aae559cc4d1ac6940b480e39af ']' 815s + checkletters=Pft 815s + '[' xPft '!=' x ']' 815s + : '---- make-patches stitched-laundered ...Pft ----' 815s + make_check Pft 815s + case "$1" in 815s + t-dgit -wgf --quilt=nofix quilt-fixup 815s + local dgit=dgit 815s + pwd 815s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 815s + : ' 815s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 815s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 815s | git rev-parse --show-toplevel 815s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 815s | git config -z --get-regexp --local '.*' 815s | git config -z --get-regexp --local '.*' 815s | git config -z --get-regexp --global '.*' 815s | git config -z --get-regexp --system '.*' 815s format 3.0 (quilt), quilt mode nofix 815s Format `3.0 (quilt)', need to check/update patch stack 815s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 815s => `' 815s + git diff --quiet HEAD 815s + git clean -xdff 815s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 815s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 815s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 815s | git rev-parse 'HEAD~0' 815s => `c2291d120a12b2aae559cc4d1ac6940b480e39af' 815s | git symbolic-ref -q HEAD 815s => `refs/heads/peel-make-patches-stitched-laundered' 815s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 815s CD work 815s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 815s + git reset -q --hard c2291d120a12b2aae559cc4d1ac6940b480e39af 815s examining quilt state (multiple patches, nofix mode) 815s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 815s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 815s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 815s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 815s CD fake 815s | find -name .git -prune -print0 815s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 815s + git checkout -f c2291d120a12b2aae559cc4d1ac6940b480e39af -- debian 815s + git add -Af . 815s | git write-tree 815s => `cf7723837423b89bee4a40933d910c12cafd6edb' 815s fake orig tree object cf7723837423b89bee4a40933d910c12cafd6edb 815s CD .. 815s + git reset -q --hard c2291d120a12b2aae559cc4d1ac6940b480e39af 815s CD ../fake 815s + git add -Af . 815s | git write-tree 815s => `2b673ea0e208ca3a73f92c92d84de00c8e730b68' 815s fake o+d/p tree object cf7723837423b89bee4a40933d910c12cafd6edb 815s CD ../work 815s | git ls-tree --name-only -z c2291d120a12b2aae559cc4d1ac6940b480e39af 815s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 815s | git diff-tree -z --no-renames -r cf7723837423b89bee4a40933d910c12cafd6edb c2291d120a12b2aae559cc4d1ac6940b480e39af 815s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc ae034e0da3c9277b6490861216eae02dad46ff53 M\x00src.c\x00' 815s quiltify_trees_differ cf7723837423b89bee4a40933d910c12cafd6edb c2291d120a12b2aae559cc4d1ac6940b480e39af => 1 815s | git diff-tree -z --no-renames --name-only -r c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 815s => `' 815s quiltify_trees_differ c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 0 815s | git diff-tree -z --no-renames --name-only -r cf7723837423b89bee4a40933d910c12cafd6edb 2b673ea0e208ca3a73f92c92d84de00c8e730b68 815s => `lib.c\x00new-upstream-file\x00src.c\x00' 815s quiltify_trees_differ cf7723837423b89bee4a40933d910c12cafd6edb 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 1 815s differences @dl ## ## == == == ==. 815s dgit: base trees orig=cf7723837423b89bee4a o+d/p=2b673ea0e208ca3a73f9 815s dgit: quilt differences: src: ## orig ## gitignores: == orig == 815s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 815s starting quiltify (multiple patches, nofix mode) 815s | git ls-tree --name-only c2291d120a12b2aae559cc4d1ac6940b480e39af -- debian/rules debian/control 815s => `debian/control'... 815s quiltify investigate c2291d120a12b2aae559cc4d1ac6940b480e39af 815s | git diff-tree -z --no-renames --name-only c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 815s => `' 815s quiltify_trees_differ c2291d120a12b2aae559cc4d1ac6940b480e39af 2b673ea0e208ca3a73f92c92d84de00c8e730b68 => 0 815s search finished hooray! 815s quiltify linearisation planning successful, executing... 815s + git checkout -q master 815s | git status --ignored --porcelain 815s => `?? .pc/' 815s nothing quilty to commit, ok. 815s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 815s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 815s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 815s ' 815s + egrep . 815s + git diff HEAD~ debian/patches 815s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 815s new file mode 100644 815s index 0000000..0405708 815s --- /dev/null 815s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 815s @@ -0,0 +1,16 @@ 815s +From: Ian Jackson 815s +Date: Sun, 6 Dec 2015 23:50:08 +0000 815s +Subject: Add a new upstream file 815s + 815s +--- 815s + new-upstream-file | 1 + 815s + 1 file changed, 1 insertion(+) 815s + create mode 100644 new-upstream-file 815s + 815s +diff --git a/new-upstream-file b/new-upstream-file 815s +new file mode 100644 815s +index 0000000..a2d670b 815s +--- /dev/null 815s ++++ b/new-upstream-file 815s +@@ -0,0 +1 @@ 815s ++Add a file 815s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 815s new file mode 100644 815s index 0000000..0e04924 815s --- /dev/null 815s +++ b/debian/patches/0002-Edit-the-.c-file.patch 815s @@ -0,0 +1,15 @@ 815s +From: Ian Jackson 815s +Date: Sun, 6 Dec 2015 23:50:39 +0000 815s +Subject: Edit the .c file 815s + 815s +--- 815s + src.c | 2 +- 815s + 1 file changed, 1 insertion(+), 1 deletion(-) 815s + 815s +diff --git a/src.c b/src.c 815s +index 05437c5..6cc28de 100644 815s +--- a/src.c 815s ++++ b/src.c 815s +@@ -1 +1 @@ 815s +-main(){} 815s ++main(void){} 815s diff --git a/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s new file mode 100644 815s index 0000000..154685d 815s --- /dev/null 815s +++ b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s @@ -0,0 +1,15 @@ 815s +From: dgit test git user 815s +Date: Tue, 26 Jun 2018 09:00:03 +0100 815s +Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 1) 815s + 815s +--- 815s + src.c | 1 + 815s + 1 file changed, 1 insertion(+) 815s + 815s +diff --git a/src.c b/src.c 815s +index 6cc28de..41fcfa1 100644 815s +--- a/src.c 815s ++++ b/src.c 815s +@@ -1 +1,2 @@ 815s + main(void){} 815s ++// upstream subcommands refs/heads/stitched-laundered 1 815s diff --git a/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s new file mode 100644 815s index 0000000..541a797 815s --- /dev/null 815s +++ b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s @@ -0,0 +1,17 @@ 815s +From: dgit test git user 815s +Date: Tue, 26 Jun 2018 09:00:03 +0100 815s +Subject: MIXED add both() (subcommands refs/heads/stitched-laundered 1) 815s + 815s +[git-debrebase split: mixed commit: upstream part] 815s +--- 815s + src.c | 1 + 815s + 1 file changed, 1 insertion(+) 815s + 815s +diff --git a/src.c b/src.c 815s +index 41fcfa1..3a10090 100644 815s +--- a/src.c 815s ++++ b/src.c 815s +@@ -1,2 +1,3 @@ 815s + main(void){} 815s + // upstream subcommands refs/heads/stitched-laundered 1 815s ++// both! subcommands refs/heads/stitched-laundered 1 815s diff --git a/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s new file mode 100644 815s index 0000000..a34c666 815s --- /dev/null 815s +++ b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s @@ -0,0 +1,17 @@ 815s +From: dgit test git user 815s +Date: Tue, 26 Jun 2018 09:00:06 +0100 815s +Subject: UPSTREAM edit src.c (subcommands refs/heads/stitched-laundered 2) 815s + 815s +--- 815s + src.c | 1 + 815s + 1 file changed, 1 insertion(+) 815s + 815s +diff --git a/src.c b/src.c 815s +index 3a10090..2a513ab 100644 815s +--- a/src.c 815s ++++ b/src.c 815s +@@ -1,3 +1,4 @@ 815s + main(void){} 815s + // upstream subcommands refs/heads/stitched-laundered 1 815s + // both! subcommands refs/heads/stitched-laundered 1 815s ++// upstream subcommands refs/heads/stitched-laundered 2 815s diff --git a/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s new file mode 100644 815s index 0000000..2b26363 815s --- /dev/null 815s +++ b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s @@ -0,0 +1,18 @@ 815s +From: dgit test git user 815s +Date: Tue, 26 Jun 2018 09:00:06 +0100 815s +Subject: MIXED add both() (subcommands refs/heads/stitched-laundered 2) 815s + 815s +[git-debrebase split: mixed commit: upstream part] 815s +--- 815s + src.c | 1 + 815s + 1 file changed, 1 insertion(+) 815s + 815s +diff --git a/src.c b/src.c 815s +index 2a513ab..ae034e0 100644 815s +--- a/src.c 815s ++++ b/src.c 815s +@@ -2,3 +2,4 @@ main(void){} 815s + // upstream subcommands refs/heads/stitched-laundered 1 815s + // both! subcommands refs/heads/stitched-laundered 1 815s + // upstream subcommands refs/heads/stitched-laundered 2 815s ++// both! subcommands refs/heads/stitched-laundered 2 815s diff --git a/debian/patches/series b/debian/patches/series 815s new file mode 100644 815s index 0000000..7972c30 815s --- /dev/null 815s +++ b/debian/patches/series 815s @@ -0,0 +1,7 @@ 815s +0001-Add-a-new-upstream-file.patch 815s +0002-Edit-the-.c-file.patch 815s +subdir/addnewups 815s +0004-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s +0005-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s +0006-UPSTREAM-edit-src.c-subcommands-refs-heads-stitched-.patch 815s +0007-MIXED-add-both-subcommands-refs-heads-stitched-laund.patch 815s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 815s new file mode 100644 815s index 0000000..1acc2e8 815s --- /dev/null 815s +++ b/debian/patches/subdir/addnewups 815s @@ -0,0 +1,16 @@ 815s +From: Ian Jackson 815s +Date: Sat, 4 Jun 2016 22:09:32 +0100 815s +Subject: Add another new upstream file 815s + 815s +--- 815s + lib.c | 1 + 815s + 1 file changed, 1 insertion(+) 815s + create mode 100644 lib.c 815s + 815s +diff --git a/lib.c b/lib.c 815s +new file mode 100644 815s +index 0000000..e026ed3 815s +--- /dev/null 815s ++++ b/lib.c 815s +@@ -0,0 +1 @@ 815s ++void function(void){} 815s + t-gdr-made-patches 815s + git log -n1 --pretty=format:%B 815s + egrep '^\[git-debrebase' 815s [git-debrebase make-patches: export and commit patches] 815s + git diff --quiet HEAD~ -- :. ':!debian/patches' 815s + git reset --hard HEAD~ 815s HEAD is now at 64d2fdf Declare fast forward / record previous work 815s + checkletters=ft 815s + '[' xft '!=' x ']' 815s + : '---- make-patches stitched-laundered ...ft ----' 815s + make_check ft 815s + case "$1" in 815s + t-has-ancestor HEAD refs/heads/before-work-make-patches-stitched-laundered 815s + local now 815s ++ git rev-parse HEAD 815s + now=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + local ancestor 815s ++ git rev-parse 'HEAD^{}' 815s + ancestor=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + local mbase 815s ++ t-git-merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 815s ++ git merge-base 64d2fdf7628f675981360f0dce3aaaa227b0676a 64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + mbase=64d2fdf7628f675981360f0dce3aaaa227b0676a 815s + '[' x64d2fdf7628f675981360f0dce3aaaa227b0676a '!=' x64d2fdf7628f675981360f0dce3aaaa227b0676a ']' 815s + checkletters=t 815s + '[' xt '!=' x ']' 815s + : '---- make-patches stitched-laundered ...t ----' 815s + make_check t 815s + case "$1" in 815s + git diff --quiet HEAD refs/heads/before-work-make-patches-stitched-laundered 815s + checkletters= 815s + '[' x '!=' x ']' 815s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 815s + work=work-make-patches-stitched-mixed 815s + : '---------- make-patches stitched-mixed ----------' 815s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 815s + git update-ref --stdin 815s + sed s/stitched-mixed/work-make-patches-stitched-mixed/ 815s + git checkout work-make-patches-stitched-mixed 815s Switched to branch 'work-make-patches-stitched-mixed' 815s + checkletters='F:Patch export produced patch amendments' 815s + shift 815s + before=before-work-make-patches-stitched-mixed 815s + git branch before-work-make-patches-stitched-mixed 815s + local xopts= 815s + case "$checkletters" in 815s + case "$checkletters" in 815s + case "$checkletters" in 815s + case "$checkletters" in 815s + t-expect-fail 'F:Patch export produced patch amendments' t-git-debrebase make-patches 815s + local 'mpat=F:Patch export produced patch amendments' 815s + shift 815s + set +o pipefail 815s + LC_MESSAGES=C 815s + LANGUAGE=C 815s + t-git-debrebase make-patches 815s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 815s + local gdr=git-debrebase 815s + : ' 815s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 815s + git-debrebase --dgit=dgit -D make-patches 815s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 815s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 815s git-debrebase = Mixed {"Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Parents" => [{"Differs" => 34,"CommitId" => "7091adece516711371505e702f87d9973010f25b","Ix" => 0}],"CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","Type" => "Mixed","Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504"} 815s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (5e0bf3cea3c715230b96aca41156852390014b98) 815s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 815s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 815s git-debrebase = Upstream {"Tree" => "6066466a7bfccd9539954883312605a59c5b4502","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "7091adece516711371505e702f87d9973010f25b","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"}],"Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 815s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 815s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 815s git-debrebase = Packaging {"Parents" => [{"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Type" => "Packaging","Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"} 815s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 815s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 815s git-debrebase = AddPatches {"Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3","Type" => "AddPatches","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f"}],"Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n"} 815s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 815s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 815s git-debrebase = Mixed {"Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","Type" => "Mixed","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Differs" => 34,"Ix" => 0}]} 815s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (0a3febb41892833b131ed8ca6958d68efc7f925f) 815s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 815s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 815s git-debrebase = Upstream {"Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Parents" => [{"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Differs" => 2,"Ix" => 0}],"Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n"} 815s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 815s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 815s git-debrebase = Packaging {"Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Differs" => 32,"Ix" => 0}],"Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b","Type" => "Packaging","CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n"} 815s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 815s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 815s git-debrebase = AddPatches {"Type" => "AddPatches","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e"}],"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 815s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 815s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Parents" => [{"Differs" => 16,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Ix" => 0}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 815s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 815s git-debrebase = Changelog {"Type" => "Changelog","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Parents" => [{"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Differs" => 16,"Ix" => 0}],"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 815s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 815s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 815s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 8,"Ix" => 1,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Pseudomerge","Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"},"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 815s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 815s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 815s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 815s git-debrebase: snag detected (-funclean-ordering): packaging change (772b2a1d3dacffb5498a61b7c9518d57d439e1ca) follows upstream change (eg 178896af44c5b02e05a3442df6c33233b6acb807) 815s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 815s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 815s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Differs" => 2,"Ix" => 0}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 815s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 815s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}]} 815s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 815s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 815s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 815s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Ix" => 1,"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 815s git-debrebase *** WALK 5e0bf3cea3c715230b96aca41156852390014b98 0 - 815s git-debrebase get_differs 7091adece516711371505e702f87d9973010f25b 50e48c643e8c0e3794bbfe42b45ab72549dda504 = 0x22 815s git-debrebase classify 5e0bf3cea3c715230b96aca41156852390014b98 $t=50e48c643e8c0e3794bbfe42b45ab72549dda504 @p 7091adece516711371505e702f87d9973010f25b/0x22 815s git-debrebase = Mixed {"Tree" => "50e48c643e8c0e3794bbfe42b45ab72549dda504","Type" => "Mixed","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "5e0bf3cea3c715230b96aca41156852390014b98","Parents" => [{"Differs" => 34,"CommitId" => "7091adece516711371505e702f87d9973010f25b","Ix" => 0}],"Hdr" => "tree 50e48c643e8c0e3794bbfe42b45ab72549dda504\nparent 7091adece516711371505e702f87d9973010f25b\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n"} 815s git-debrebase get_differs 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 6066466a7bfccd9539954883312605a59c5b4502 = 0x2 815s git-debrebase classify 7091adece516711371505e702f87d9973010f25b $t=6066466a7bfccd9539954883312605a59c5b4502 @p 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1/0x2 815s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"}],"Hdr" => "tree 6066466a7bfccd9539954883312605a59c5b4502\nparent 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "7091adece516711371505e702f87d9973010f25b","Tree" => "6066466a7bfccd9539954883312605a59c5b4502","Type" => "Upstream"} 815s git-debrebase get_differs a5e2aaa2551f9e331d30511eb4356a22c939e752 0cbb6dcc737dae60cb32b3675f13a2dbfc737647 = 0x20 815s git-debrebase classify 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 $t=0cbb6dcc737dae60cb32b3675f13a2dbfc737647 @p a5e2aaa2551f9e331d30511eb4356a22c939e752/0x20 815s git-debrebase = Packaging {"Parents" => [{"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 0cbb6dcc737dae60cb32b3675f13a2dbfc737647\nparent a5e2aaa2551f9e331d30511eb4356a22c939e752\nauthor dgit test git user 1530000013 +0100\ncommitter dgit test git user 1530000013 +0100\n","Tree" => "0cbb6dcc737dae60cb32b3675f13a2dbfc737647","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 2)\n","CommitId" => "8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1"} 815s git-debrebase get_differs 0a3febb41892833b131ed8ca6958d68efc7f925f 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 = 0x4 815s git-debrebase classify a5e2aaa2551f9e331d30511eb4356a22c939e752 $t=0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3 @p 0a3febb41892833b131ed8ca6958d68efc7f925f/0x4 815s git-debrebase = AddPatches {"Hdr" => "tree 0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3\nparent 0a3febb41892833b131ed8ca6958d68efc7f925f\nauthor dgit test git user 1530000011 +0100\ncommitter dgit test git user 1530000011 +0100\n","Parents" => [{"Differs" => 4,"CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Ix" => 0}],"CommitId" => "a5e2aaa2551f9e331d30511eb4356a22c939e752","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Type" => "AddPatches","Tree" => "0ffe5dde68ea8d3cf1c1b0248e137105104dbcb3"} 815s git-debrebase get_differs c848bc784454d4635b6a71ea59b65b373615e8e4 cb27fe0206f700a55e3ec45caa3b80b9d71ed691 = 0x22 815s git-debrebase classify 0a3febb41892833b131ed8ca6958d68efc7f925f $t=cb27fe0206f700a55e3ec45caa3b80b9d71ed691 @p c848bc784454d4635b6a71ea59b65b373615e8e4/0x22 815s git-debrebase = Mixed {"Type" => "Mixed","Tree" => "cb27fe0206f700a55e3ec45caa3b80b9d71ed691","CommitId" => "0a3febb41892833b131ed8ca6958d68efc7f925f","Msg" => "MIXED add both() (subcommands refs/heads/stitched-mixed 1)\n","Hdr" => "tree cb27fe0206f700a55e3ec45caa3b80b9d71ed691\nparent c848bc784454d4635b6a71ea59b65b373615e8e4\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4"}]} 815s git-debrebase get_differs 772b2a1d3dacffb5498a61b7c9518d57d439e1ca af40286d15dcd54aed3b8586be973b89dfad2ee8 = 0x2 815s git-debrebase classify c848bc784454d4635b6a71ea59b65b373615e8e4 $t=af40286d15dcd54aed3b8586be973b89dfad2ee8 @p 772b2a1d3dacffb5498a61b7c9518d57d439e1ca/0x2 815s git-debrebase = Upstream {"CommitId" => "c848bc784454d4635b6a71ea59b65b373615e8e4","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/stitched-mixed 1)\n","Tree" => "af40286d15dcd54aed3b8586be973b89dfad2ee8","Type" => "Upstream","Hdr" => "tree af40286d15dcd54aed3b8586be973b89dfad2ee8\nparent 772b2a1d3dacffb5498a61b7c9518d57d439e1ca\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Ix" => 0}]} 815s git-debrebase get_differs 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf eadc003377c95410215ba90c8b32bc80c122ce2b = 0x20 815s git-debrebase classify 772b2a1d3dacffb5498a61b7c9518d57d439e1ca $t=eadc003377c95410215ba90c8b32bc80c122ce2b @p 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf/0x20 815s git-debrebase = Packaging {"Hdr" => "tree eadc003377c95410215ba90c8b32bc80c122ce2b\nparent 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf\nauthor dgit test git user 1530000010 +0100\ncommitter dgit test git user 1530000010 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf"}],"CommitId" => "772b2a1d3dacffb5498a61b7c9518d57d439e1ca","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/stitched-mixed 1)\n","Type" => "Packaging","Tree" => "eadc003377c95410215ba90c8b32bc80c122ce2b"} 815s git-debrebase get_differs 4af0243f9227b0d695fbff38df345aca23969e2e 607612c46d7ea5b66697b830f1a50f069061d460 = 0x4 815s git-debrebase classify 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf $t=607612c46d7ea5b66697b830f1a50f069061d460 @p 4af0243f9227b0d695fbff38df345aca23969e2e/0x4 815s git-debrebase = AddPatches {"Parents" => [{"CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Differs" => 4,"Ix" => 0}],"Hdr" => "tree 607612c46d7ea5b66697b830f1a50f069061d460\nparent 4af0243f9227b0d695fbff38df345aca23969e2e\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Commit patch queue (exported by git-debrebase)\n\n[git-debrebase make-patches: export and commit patches]\n","CommitId" => "6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf","Tree" => "607612c46d7ea5b66697b830f1a50f069061d460","Type" => "AddPatches"} 815s git-debrebase get_differs 2d8cdac9efc756fc8ff36123b09240f379cf77b2 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 815s git-debrebase classify 4af0243f9227b0d695fbff38df345aca23969e2e $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p 2d8cdac9efc756fc8ff36123b09240f379cf77b2/0x10 815s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2"}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent 2d8cdac9efc756fc8ff36123b09240f379cf77b2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "4af0243f9227b0d695fbff38df345aca23969e2e","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog"} 815s git-debrebase get_differs 0bcedd364c245298b6ec08d8f29abf69e34b6e5b ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 815s git-debrebase classify 2d8cdac9efc756fc8ff36123b09240f379cf77b2 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p 0bcedd364c245298b6ec08d8f29abf69e34b6e5b/0x10 815s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent 0bcedd364c245298b6ec08d8f29abf69e34b6e5b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b"}],"CommitId" => "2d8cdac9efc756fc8ff36123b09240f379cf77b2","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db"} 815s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0 815s git-debrebase get_differs 45ea71a69fa522ce760afdab8a420200443753e9 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x8 815s git-debrebase classify 0bcedd364c245298b6ec08d8f29abf69e34b6e5b $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 178896af44c5b02e05a3442df6c33233b6acb807/0 45ea71a69fa522ce760afdab8a420200443753e9/0x8 815s git-debrebase = Pseudomerge {"Parents" => [{"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 8,"CommitId" => "45ea71a69fa522ce760afdab8a420200443753e9"}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 178896af44c5b02e05a3442df6c33233b6acb807\nparent 45ea71a69fa522ce760afdab8a420200443753e9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare ff from dgit archive view\n\n[git-debrebase pseudomerge: import-from-gbp]\n","CommitId" => "0bcedd364c245298b6ec08d8f29abf69e34b6e5b","Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Overwritten" => [$VAR1->{"Parents"}[1]]} 815s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 815s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 815s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 815s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 815s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 815s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 815s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 815s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 815s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 815s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 815s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 815s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","OrigParents" => [{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 815s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 9 proc 19 pm 0 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 815s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 20 815s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 815s git-debrebase WALK BUILD 2d8cdac9efc756fc8ff36123b09240f379cf77b2 Debian (rewriting=0) 815s git-debrebase WALK REWRITING NOW cl=HASH(0x55d06286d788) procd=HASH(0x55d06286d8a8) 815s git-debrebase WALK BUILD 4af0243f9227b0d695fbff38df345aca23969e2e Debian (rewriting=1) 815s git-debrebase WALK BUILD 772b2a1d3dacffb5498a61b7c9518d57d439e1ca Debian (rewriting=1) 815s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 815s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Debian (rewriting=1) 815s git-debrebase WALK BUILD 8240b51e9fe30e8f1f84ffa784bcb96d40d4f3f1 Debian (rewriting=1) 815s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 815s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Debian (rewriting=1) 815s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 815s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=1) 815s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=1) 815s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=1) 815s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 815s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 815s git-debrebase WALK BUILD c848bc784454d4635b6a71ea59b65b373615e8e4 Upstream (rewriting=1) 815s git-debrebase WALK BUILD 0a3febb41892833b131ed8ca6958d68efc7f925f Upstream (rewriting=1) 815s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 815s git-debrebase WALK BUILD 7091adece516711371505e702f87d9973010f25b Upstream (rewriting=1) 816s git-debrebase WALK BUILD 5e0bf3cea3c715230b96aca41156852390014b98 Upstream (rewriting=1) 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase get_differs 97a91c40026ff6a52a5cc7d020dda82048f2e77d 5e0bf3cea3c715230b96aca41156852390014b98 = 0x4 816s git-debrebase *** WALK RETURN 97a91c40026ff6a52a5cc7d020dda82048f2e77d e7d45cf6ecfa83b4fd6418de6b88f8471799e588 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase gbp_pq_export bw e7d45cf6ecfa83b4fd6418de6b88f8471799e588 97a91c40026ff6a52a5cc7d020dda82048f2e77d 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase get_differs 5e0bf3cea3c715230b96aca41156852390014b98 11b91ab8d256b1f506e17b2b74c080a50963cd9c = 0xc 816s 816s git-debrebase: error: Patch export produced patch amendments (abandoned output commit 11b91ab8d256b1f506e17b2b74c080a50963cd9c). Try laundering first. 816s + local 'ps=7 0' 816s + set -o pipefail 816s + case $ps in 816s + t-grep-mpat 'F:Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 816s + local 'mpat=F:Patch export produced patch amendments' 816s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 816s + local grepper=fgrep 816s + case "$mpat" in 816s + case "$mpat" in 816s + grepper=fgrep 816s + mpat='Patch export produced patch amendments' 816s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 816s git-debrebase: error: Patch export produced patch amendments (abandoned output commit 11b91ab8d256b1f506e17b2b74c080a50963cd9c). Try laundering first. 816s + continue 816s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 816s + work=work-make-patches-unstitched-laundered 816s + : '---------- make-patches unstitched-laundered ----------' 816s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 816s + git update-ref --stdin 816s + sed s/unstitched-laundered/work-make-patches-unstitched-laundered/ 816s + git checkout work-make-patches-unstitched-laundered 816s Switched to branch 'work-make-patches-unstitched-laundered' 816s + checkletters=uPft 816s + shift 816s + before=before-work-make-patches-unstitched-laundered 816s + git branch before-work-make-patches-unstitched-laundered 816s + local xopts= 816s + case "$checkletters" in 816s + case "$checkletters" in 816s + case "$checkletters" in 816s + case "$checkletters" in 816s + t-git-debrebase make-patches 816s + local gdr=git-debrebase 816s + : ' 816s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 816s + git-debrebase --dgit=dgit -D make-patches 816s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 816s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 816s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Ix" => 0}],"CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f","Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n"} 816s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 816s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 816s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Parents" => [{"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Ix" => 0,"Differs" => 2}]} 816s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 816s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 816s git-debrebase = Upstream {"Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Parents" => [{"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Differs" => 2}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 816s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 816s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","Parents" => [{"Differs" => 2,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Ix" => 0}]} 816s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 816s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 816s git-debrebase = Upstream {"Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}],"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777"} 816s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 816s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 816s git-debrebase = Upstream {"Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0}],"Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1"} 816s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 816s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 816s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 816s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 816s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 816s git-debrebase = Packaging {"Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762"} 816s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 816s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 816s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Differs" => 32}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 816s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 816s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 816s git-debrebase = Packaging {"Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Differs" => 32}],"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89"} 816s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 816s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 816s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Ix" => 0}],"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging"} 816s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 816s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 816s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Parents" => [{"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Differs" => 16}]} 816s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 816s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 816s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 816s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 816s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 816s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 816s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Type" => "Anchor","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 816s git-debrebase *** WALK 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 0 - 816s git-debrebase get_differs fb2b176dd5509310e0f163d0610814f1f7b8a1be a793ccf963d9b840e8da8bbeb338e8c100d4ae9b = 0x2 816s git-debrebase classify 5472c89e9f96508ec91185b6f57e8a1875ea7a4f $t=a793ccf963d9b840e8da8bbeb338e8c100d4ae9b @p fb2b176dd5509310e0f163d0610814f1f7b8a1be/0x2 816s git-debrebase = Upstream {"Hdr" => "tree a793ccf963d9b840e8da8bbeb338e8c100d4ae9b\nparent fb2b176dd5509310e0f163d0610814f1f7b8a1be\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: upstream part]\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be"}],"Tree" => "a793ccf963d9b840e8da8bbeb338e8c100d4ae9b","CommitId" => "5472c89e9f96508ec91185b6f57e8a1875ea7a4f"} 816s git-debrebase get_differs eb582a38ee36ac6a11c7c876ca3013ed426e76f4 2557e5e35623e252056b2a2739bf28e9e21990da = 0x2 816s git-debrebase classify fb2b176dd5509310e0f163d0610814f1f7b8a1be $t=2557e5e35623e252056b2a2739bf28e9e21990da @p eb582a38ee36ac6a11c7c876ca3013ed426e76f4/0x2 816s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4"}],"Tree" => "2557e5e35623e252056b2a2739bf28e9e21990da","CommitId" => "fb2b176dd5509310e0f163d0610814f1f7b8a1be","Hdr" => "tree 2557e5e35623e252056b2a2739bf28e9e21990da\nparent eb582a38ee36ac6a11c7c876ca3013ed426e76f4\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2)\n","Type" => "Upstream"} 816s git-debrebase get_differs b79d513107e3cff19d401deb87cc3e6c4809966e b7f010fe9abad46ba03717dae508f316b67e0b1e = 0x2 816s git-debrebase classify eb582a38ee36ac6a11c7c876ca3013ed426e76f4 $t=b7f010fe9abad46ba03717dae508f316b67e0b1e @p b79d513107e3cff19d401deb87cc3e6c4809966e/0x2 816s git-debrebase = Upstream {"CommitId" => "eb582a38ee36ac6a11c7c876ca3013ed426e76f4","Tree" => "b7f010fe9abad46ba03717dae508f316b67e0b1e","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e"}],"Type" => "Upstream","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree b7f010fe9abad46ba03717dae508f316b67e0b1e\nparent b79d513107e3cff19d401deb87cc3e6c4809966e\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs 853334aca9591577e4a921adddf5b2cab3fb1ab8 92caf0714abf3ae8067d9b139899482c0b383a5d = 0x2 816s git-debrebase classify b79d513107e3cff19d401deb87cc3e6c4809966e $t=92caf0714abf3ae8067d9b139899482c0b383a5d @p 853334aca9591577e4a921adddf5b2cab3fb1ab8/0x2 816s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8"}],"Tree" => "92caf0714abf3ae8067d9b139899482c0b383a5d","CommitId" => "b79d513107e3cff19d401deb87cc3e6c4809966e","Hdr" => "tree 92caf0714abf3ae8067d9b139899482c0b383a5d\nparent 853334aca9591577e4a921adddf5b2cab3fb1ab8\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Upstream"} 816s git-debrebase get_differs e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 a739347a29bbb5db1703de82a6953a0ac0cc1777 = 0x2 816s git-debrebase classify 853334aca9591577e4a921adddf5b2cab3fb1ab8 $t=a739347a29bbb5db1703de82a6953a0ac0cc1777 @p e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1/0x2 816s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree a739347a29bbb5db1703de82a6953a0ac0cc1777\nparent e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Tree" => "a739347a29bbb5db1703de82a6953a0ac0cc1777","CommitId" => "853334aca9591577e4a921adddf5b2cab3fb1ab8","Parents" => [{"Differs" => 2,"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Ix" => 0}]} 816s git-debrebase get_differs 6ff5320a54f70fe413a138a89b1f5fd0f237f730 6a680f472d21025cf593e5e68738b46cc0cf12d5 = 0x2 816s git-debrebase classify e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 $t=6a680f472d21025cf593e5e68738b46cc0cf12d5 @p 6ff5320a54f70fe413a138a89b1f5fd0f237f730/0x2 816s git-debrebase = Upstream {"Parents" => [{"CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Ix" => 0,"Differs" => 2}],"CommitId" => "e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1","Tree" => "6a680f472d21025cf593e5e68738b46cc0cf12d5","Hdr" => "tree 6a680f472d21025cf593e5e68738b46cc0cf12d5\nparent 6ff5320a54f70fe413a138a89b1f5fd0f237f730\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 816s git-debrebase get_differs 86248dea3770451139d1a57015bd9b36aa1ed39c 967132c54ba679bab3250ffd973e6c5b05514150 = 0x2 816s git-debrebase classify 6ff5320a54f70fe413a138a89b1f5fd0f237f730 $t=967132c54ba679bab3250ffd973e6c5b05514150 @p 86248dea3770451139d1a57015bd9b36aa1ed39c/0x2 816s git-debrebase = Upstream {"Tree" => "967132c54ba679bab3250ffd973e6c5b05514150","CommitId" => "6ff5320a54f70fe413a138a89b1f5fd0f237f730","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Hdr" => "tree 967132c54ba679bab3250ffd973e6c5b05514150\nparent 86248dea3770451139d1a57015bd9b36aa1ed39c\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs f2db5dc7e25f34f0f34d04d0160f912a76b3667d da38f8e6fce0c1ec5260f529241630e06077f762 = 0x20 816s git-debrebase classify 86248dea3770451139d1a57015bd9b36aa1ed39c $t=da38f8e6fce0c1ec5260f529241630e06077f762 @p f2db5dc7e25f34f0f34d04d0160f912a76b3667d/0x20 816s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Differs" => 32}],"Tree" => "da38f8e6fce0c1ec5260f529241630e06077f762","CommitId" => "86248dea3770451139d1a57015bd9b36aa1ed39c","Hdr" => "tree da38f8e6fce0c1ec5260f529241630e06077f762\nparent f2db5dc7e25f34f0f34d04d0160f912a76b3667d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 2)\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging"} 816s git-debrebase get_differs 301cc9756d79fc379acfed35ff33c0785f2e1b7d 9309b604b1cfc5f830f7c89fb085803097e6dd21 = 0x20 816s git-debrebase classify f2db5dc7e25f34f0f34d04d0160f912a76b3667d $t=9309b604b1cfc5f830f7c89fb085803097e6dd21 @p 301cc9756d79fc379acfed35ff33c0785f2e1b7d/0x20 816s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Ix" => 0}],"CommitId" => "f2db5dc7e25f34f0f34d04d0160f912a76b3667d","Tree" => "9309b604b1cfc5f830f7c89fb085803097e6dd21","Hdr" => "tree 9309b604b1cfc5f830f7c89fb085803097e6dd21\nparent 301cc9756d79fc379acfed35ff33c0785f2e1b7d\nauthor dgit test git user 1530000020 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Packaging","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 2)\n"} 816s git-debrebase get_differs 515e62b8d591fcc68597383b955d898db71abc6c b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 = 0x20 816s git-debrebase classify 301cc9756d79fc379acfed35ff33c0785f2e1b7d $t=b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89 @p 515e62b8d591fcc68597383b955d898db71abc6c/0x20 816s git-debrebase = Packaging {"CommitId" => "301cc9756d79fc379acfed35ff33c0785f2e1b7d","Tree" => "b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c"}],"Type" => "Packaging","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-laundered 1)\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree b7a6c8cd7c0b1ea96eb6c094842225b47e64fa89\nparent 515e62b8d591fcc68597383b955d898db71abc6c\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f = 0x20 816s git-debrebase classify 515e62b8d591fcc68597383b955d898db71abc6c $t=3886ef611af6ec303c7cff68d0dbac2f4cc6c32f @p 809643e5389def220ea36d61f2d3dd504603e95a/0x20 816s git-debrebase = Packaging {"Tree" => "3886ef611af6ec303c7cff68d0dbac2f4cc6c32f","CommitId" => "515e62b8d591fcc68597383b955d898db71abc6c","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-laundered 1)\n","Type" => "Packaging","Hdr" => "tree 3886ef611af6ec303c7cff68d0dbac2f4cc6c32f\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor dgit test git user 1530000017 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 816s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 816s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0}],"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 816s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 816s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 816s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 816s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 816s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 816s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Ix" => 1}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 816s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 5 upp 6 proc 13 pm -1 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 14 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 816s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 816s git-debrebase WALK BUILD 515e62b8d591fcc68597383b955d898db71abc6c Debian (rewriting=0) 816s git-debrebase WALK BUILD 301cc9756d79fc379acfed35ff33c0785f2e1b7d Debian (rewriting=0) 816s git-debrebase WALK BUILD f2db5dc7e25f34f0f34d04d0160f912a76b3667d Debian (rewriting=0) 816s git-debrebase WALK BUILD 86248dea3770451139d1a57015bd9b36aa1ed39c Debian (rewriting=0) 816s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 816s git-debrebase WALK BUILD 6ff5320a54f70fe413a138a89b1f5fd0f237f730 Upstream (rewriting=0) 816s git-debrebase WALK BUILD e1c74f7d2891ed47b2d6bd843a86fef9acaceaf1 Upstream (rewriting=0) 816s git-debrebase WALK BUILD 853334aca9591577e4a921adddf5b2cab3fb1ab8 Upstream (rewriting=0) 816s git-debrebase WALK BUILD b79d513107e3cff19d401deb87cc3e6c4809966e Upstream (rewriting=0) 816s git-debrebase WALK BUILD eb582a38ee36ac6a11c7c876ca3013ed426e76f4 Upstream (rewriting=0) 816s git-debrebase WALK BUILD fb2b176dd5509310e0f163d0610814f1f7b8a1be Upstream (rewriting=0) 816s git-debrebase WALK BUILD 5472c89e9f96508ec91185b6f57e8a1875ea7a4f Upstream (rewriting=0) 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f = 0 816s git-debrebase *** WALK RETURN 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 86248dea3770451139d1a57015bd9b36aa1ed39c 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase gbp_pq_export bw 86248dea3770451139d1a57015bd9b36aa1ed39c 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 816s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s git-debrebase get_differs 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 635f565e82edea90ebe97c024b3c4f6cad96eea2 = 0x4 816s git-debrebase >= update HEAD 635f565e82edea90ebe97c024b3c4f6cad96eea2 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 816s git-debrebase >$ 816s HEAD is now at 635f565 Commit patch queue (exported by git-debrebase) 816s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 816s ' 816s + peel=peel-make-patches-unstitched-laundered 816s + git checkout -b peel-make-patches-unstitched-laundered 816s Switched to a new branch 'peel-make-patches-unstitched-laundered' 816s + t-clean-on-branch peel-make-patches-unstitched-laundered 816s + t-output '## peel-make-patches-unstitched-laundered' git status -b --porcelain 816s + printf '%s\n' '## peel-make-patches-unstitched-laundered' 816s + shift 816s + git status -b --porcelain 816s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 816s + : '---------- make-patches unstitched-laundered uPft ----------' 816s + '[' xuPft '!=' x ']' 816s + : '---- make-patches unstitched-laundered ...uPft ----' 816s + make_check uPft 816s + case "$1" in 816s + t-git-get-ref refs/ffq-prev/heads/work-make-patches-unstitched-laundered 816s + local ref=refs/ffq-prev/heads/work-make-patches-unstitched-laundered 816s + case "$ref" in 816s + git show-ref -d refs/ffq-prev/heads/work-make-patches-unstitched-laundered 816s + perl -ne ' 816s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-make-patches-unstitched-laundered\E(?:\^\{\})?$#; 816s END { print "$x\n" if length $x; } 816s ' 816s 5c6280b3d52c002248dd7f608e1adb63f1295538 816s + t-refs-notexist refs/debrebase-last/heads/work-make-patches-unstitched-laundered 816s + local val 816s + for g in $* 816s ++ t-git-get-ref refs/debrebase-last/heads/work-make-patches-unstitched-laundered 816s ++ local ref=refs/debrebase-last/heads/work-make-patches-unstitched-laundered 816s ++ case "$ref" in 816s ++ perl -ne ' 816s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-make-patches-unstitched-laundered\E(?:\^\{\})?$#; 816s END { print "$x\n" if length $x; } 816s ++ git show-ref -d refs/debrebase-last/heads/work-make-patches-unstitched-laundered 816s ' 816s ++ test 1 = 1 816s + val= 816s + '[' x '!=' x ']' 816s + checkletters=Pft 816s + '[' xPft '!=' x ']' 816s + : '---- make-patches unstitched-laundered ...Pft ----' 816s + make_check Pft 816s + case "$1" in 816s + t-dgit -wgf --quilt=nofix quilt-fixup 816s + local dgit=dgit 816s + pwd 816s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 816s + : ' 816s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 816s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 816s | git rev-parse --show-toplevel 816s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 816s | git config -z --get-regexp --local '.*' 816s | git config -z --get-regexp --local '.*' 816s | git config -z --get-regexp --global '.*' 816s | git config -z --get-regexp --system '.*' 816s format 3.0 (quilt), quilt mode nofix 816s Format `3.0 (quilt)', need to check/update patch stack 816s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 816s => `' 816s + git diff --quiet HEAD 816s + git clean -xdff 816s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 816s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 816s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 816s | git rev-parse 'HEAD~0' 816s => `635f565e82edea90ebe97c024b3c4f6cad96eea2' 816s | git symbolic-ref -q HEAD 816s => `refs/heads/peel-make-patches-unstitched-laundered' 816s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 816s CD work 816s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 816s + git reset -q --hard 635f565e82edea90ebe97c024b3c4f6cad96eea2 816s examining quilt state (multiple patches, nofix mode) 816s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 816s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 816s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 816s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 816s CD fake 816s | find -name .git -prune -print0 816s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 816s + git checkout -f 635f565e82edea90ebe97c024b3c4f6cad96eea2 -- debian 816s + git add -Af . 816s | git write-tree 816s => `886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e' 816s fake orig tree object 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 817s CD .. 817s + git reset -q --hard 635f565e82edea90ebe97c024b3c4f6cad96eea2 817s CD ../fake 817s + git add -Af . 817s | git write-tree 817s => `445886c352b204b21cc3851f2592ea89bfea0d32' 817s fake o+d/p tree object 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 817s CD ../work 817s | git ls-tree --name-only -z 635f565e82edea90ebe97c024b3c4f6cad96eea2 817s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 817s | git diff-tree -z --no-renames -r 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 635f565e82edea90ebe97c024b3c4f6cad96eea2 817s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc b5b29076d7ec7c08bbb34ac3ef5adb211153e775 M\x00src.c\x00' 817s quiltify_trees_differ 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 635f565e82edea90ebe97c024b3c4f6cad96eea2 => 1 817s | git diff-tree -z --no-renames --name-only -r 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 817s => `' 817s quiltify_trees_differ 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 => 0 817s | git diff-tree -z --no-renames --name-only -r 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 445886c352b204b21cc3851f2592ea89bfea0d32 817s => `lib.c\x00new-upstream-file\x00src.c\x00' 817s quiltify_trees_differ 886bd8d28c21b5bf5fb4c8fe27e9307ec39d953e 445886c352b204b21cc3851f2592ea89bfea0d32 => 1 817s differences @dl ## ## == == == ==. 817s dgit: base trees orig=886bd8d28c21b5bf5fb4 o+d/p=445886c352b204b21cc3 817s dgit: quilt differences: src: ## orig ## gitignores: == orig == 817s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 817s starting quiltify (multiple patches, nofix mode) 817s | git ls-tree --name-only 635f565e82edea90ebe97c024b3c4f6cad96eea2 -- debian/rules debian/control 817s => `debian/control'... 817s quiltify investigate 635f565e82edea90ebe97c024b3c4f6cad96eea2 817s | git diff-tree -z --no-renames --name-only 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 817s => `' 817s quiltify_trees_differ 635f565e82edea90ebe97c024b3c4f6cad96eea2 445886c352b204b21cc3851f2592ea89bfea0d32 => 0 817s search finished hooray! 817s quiltify linearisation planning successful, executing... 817s + git checkout -q master 817s | git status --ignored --porcelain 817s => `?? .pc/' 817s nothing quilty to commit, ok. 817s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 817s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 817s ' 817s + git diff HEAD~ debian/patches 817s + egrep . 817s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 817s new file mode 100644 817s index 0000000..0405708 817s --- /dev/null 817s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 817s @@ -0,0 +1,16 @@ 817s +From: Ian Jackson 817s +Date: Sun, 6 Dec 2015 23:50:08 +0000 817s +Subject: Add a new upstream file 817s + 817s +--- 817s + new-upstream-file | 1 + 817s + 1 file changed, 1 insertion(+) 817s + create mode 100644 new-upstream-file 817s + 817s +diff --git a/new-upstream-file b/new-upstream-file 817s +new file mode 100644 817s +index 0000000..a2d670b 817s +--- /dev/null 817s ++++ b/new-upstream-file 817s +@@ -0,0 +1 @@ 817s ++Add a file 817s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 817s new file mode 100644 817s index 0000000..0e04924 817s --- /dev/null 817s +++ b/debian/patches/0002-Edit-the-.c-file.patch 817s @@ -0,0 +1,15 @@ 817s +From: Ian Jackson 817s +Date: Sun, 6 Dec 2015 23:50:39 +0000 817s +Subject: Edit the .c file 817s + 817s +--- 817s + src.c | 2 +- 817s + 1 file changed, 1 insertion(+), 1 deletion(-) 817s + 817s +diff --git a/src.c b/src.c 817s +index 05437c5..6cc28de 100644 817s +--- a/src.c 817s ++++ b/src.c 817s +@@ -1 +1 @@ 817s +-main(){} 817s ++main(void){} 817s diff --git a/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s new file mode 100644 817s index 0000000..bf7ce7d 817s --- /dev/null 817s +++ b/debian/patches/0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s @@ -0,0 +1,15 @@ 817s +From: dgit test git user 817s +Date: Tue, 26 Jun 2018 09:00:17 +0100 817s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 1) 817s + 817s +--- 817s + src.c | 1 + 817s + 1 file changed, 1 insertion(+) 817s + 817s +diff --git a/src.c b/src.c 817s +index 6cc28de..9d0bbc1 100644 817s +--- a/src.c 817s ++++ b/src.c 817s +@@ -1 +1,2 @@ 817s + main(void){} 817s ++// upstream subcommands refs/heads/unstitched-laundered 1 817s diff --git a/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s new file mode 100644 817s index 0000000..6878785 817s --- /dev/null 817s +++ b/debian/patches/0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s @@ -0,0 +1,17 @@ 817s +From: dgit test git user 817s +Date: Tue, 26 Jun 2018 09:00:17 +0100 817s +Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 1) 817s + 817s +[git-debrebase split: mixed commit: upstream part] 817s +--- 817s + src.c | 1 + 817s + 1 file changed, 1 insertion(+) 817s + 817s +diff --git a/src.c b/src.c 817s +index 9d0bbc1..501347a 100644 817s +--- a/src.c 817s ++++ b/src.c 817s +@@ -1,2 +1,3 @@ 817s + main(void){} 817s + // upstream subcommands refs/heads/unstitched-laundered 1 817s ++// both! subcommands refs/heads/unstitched-laundered 1 817s diff --git a/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s new file mode 100644 817s index 0000000..0ff481e 817s --- /dev/null 817s +++ b/debian/patches/0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s @@ -0,0 +1,17 @@ 817s +From: dgit test git user 817s +Date: Tue, 26 Jun 2018 09:00:20 +0100 817s +Subject: UPSTREAM edit src.c (subcommands refs/heads/unstitched-laundered 2) 817s + 817s +--- 817s + src.c | 1 + 817s + 1 file changed, 1 insertion(+) 817s + 817s +diff --git a/src.c b/src.c 817s +index 501347a..2ba1e58 100644 817s +--- a/src.c 817s ++++ b/src.c 817s +@@ -1,3 +1,4 @@ 817s + main(void){} 817s + // upstream subcommands refs/heads/unstitched-laundered 1 817s + // both! subcommands refs/heads/unstitched-laundered 1 817s ++// upstream subcommands refs/heads/unstitched-laundered 2 817s diff --git a/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s new file mode 100644 817s index 0000000..195adf9 817s --- /dev/null 817s +++ b/debian/patches/0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s @@ -0,0 +1,18 @@ 817s +From: dgit test git user 817s +Date: Tue, 26 Jun 2018 09:00:20 +0100 817s +Subject: MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 817s + 817s +[git-debrebase split: mixed commit: upstream part] 817s +--- 817s + src.c | 1 + 817s + 1 file changed, 1 insertion(+) 817s + 817s +diff --git a/src.c b/src.c 817s +index 2ba1e58..b5b2907 100644 817s +--- a/src.c 817s ++++ b/src.c 817s +@@ -2,3 +2,4 @@ main(void){} 817s + // upstream subcommands refs/heads/unstitched-laundered 1 817s + // both! subcommands refs/heads/unstitched-laundered 1 817s + // upstream subcommands refs/heads/unstitched-laundered 2 817s ++// both! subcommands refs/heads/unstitched-laundered 2 817s diff --git a/debian/patches/series b/debian/patches/series 817s new file mode 100644 817s index 0000000..27635f6 817s --- /dev/null 817s +++ b/debian/patches/series 817s @@ -0,0 +1,7 @@ 817s +0001-Add-a-new-upstream-file.patch 817s +0002-Edit-the-.c-file.patch 817s +subdir/addnewups 817s +0004-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s +0005-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s +0006-UPSTREAM-edit-src.c-subcommands-refs-heads-unstitche.patch 817s +0007-MIXED-add-both-subcommands-refs-heads-unstitched-lau.patch 817s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 817s new file mode 100644 817s index 0000000..1acc2e8 817s --- /dev/null 817s +++ b/debian/patches/subdir/addnewups 817s @@ -0,0 +1,16 @@ 817s +From: Ian Jackson 817s +Date: Sat, 4 Jun 2016 22:09:32 +0100 817s +Subject: Add another new upstream file 817s + 817s +--- 817s + lib.c | 1 + 817s + 1 file changed, 1 insertion(+) 817s + create mode 100644 lib.c 817s + 817s +diff --git a/lib.c b/lib.c 817s +new file mode 100644 817s +index 0000000..e026ed3 817s +--- /dev/null 817s ++++ b/lib.c 817s +@@ -0,0 +1 @@ 817s ++void function(void){} 817s + t-gdr-made-patches 817s + git log -n1 --pretty=format:%B 817s + egrep '^\[git-debrebase' 817s [git-debrebase make-patches: export and commit patches] 817s + git diff --quiet HEAD~ -- :. ':!debian/patches' 817s + git reset --hard HEAD~ 817s HEAD is now at 5472c89 MIXED add both() (subcommands refs/heads/unstitched-laundered 2) 817s + checkletters=ft 817s + '[' xft '!=' x ']' 817s + : '---- make-patches unstitched-laundered ...ft ----' 817s + make_check ft 817s + case "$1" in 817s + t-has-ancestor HEAD refs/heads/before-work-make-patches-unstitched-laundered 817s + local now 817s ++ git rev-parse HEAD 817s + now=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 817s + local ancestor 817s ++ git rev-parse 'HEAD^{}' 817s + ancestor=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 817s + local mbase 817s ++ t-git-merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 817s ++ git merge-base 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 817s + mbase=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 817s + '[' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f '!=' x5472c89e9f96508ec91185b6f57e8a1875ea7a4f ']' 817s + checkletters=t 817s + '[' xt '!=' x ']' 817s + : '---- make-patches unstitched-laundered ...t ----' 817s + make_check t 817s + case "$1" in 817s + git diff --quiet HEAD refs/heads/before-work-make-patches-unstitched-laundered 817s + checkletters= 817s + '[' x '!=' x ']' 817s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 817s + work=work-make-patches-unstitched-mixed 817s + : '---------- make-patches unstitched-mixed ----------' 817s + sed s/unstitched-mixed/work-make-patches-unstitched-mixed/ 817s + git update-ref --stdin 817s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 817s + git checkout work-make-patches-unstitched-mixed 817s Switched to branch 'work-make-patches-unstitched-mixed' 817s + checkletters='F:Patch export produced patch amendments' 817s + shift 817s + before=before-work-make-patches-unstitched-mixed 817s + git branch before-work-make-patches-unstitched-mixed 817s + local xopts= 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + t-expect-fail 'F:Patch export produced patch amendments' t-git-debrebase make-patches 817s + local 'mpat=F:Patch export produced patch amendments' 817s + shift 817s + set +o pipefail 817s + LC_MESSAGES=C 817s + LANGUAGE=C 817s + t-git-debrebase make-patches 817s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 817s + local gdr=git-debrebase 817s + : ' 817s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 817s + git-debrebase --dgit=dgit -D make-patches 817s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 817s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 817s git-debrebase = Mixed {"CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Mixed","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Parents" => [{"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Ix" => 0,"Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n"} 817s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (9b56b9c2600dc10b9eec97d535d89870476de971) 817s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 817s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 817s git-debrebase = Upstream {"Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Type" => "Upstream"} 817s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 817s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 817s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386"}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n"} 817s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 817s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 817s git-debrebase = AddPatches {"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","Type" => "AddPatches","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Parents" => [{"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Ix" => 0,"Differs" => 4}]} 817s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 817s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 817s git-debrebase = Mixed {"Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Differs" => 34,"Ix" => 0}],"Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449","Type" => "Mixed"} 817s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (6e00b9cbfb2ac78131496aadb210310e5b4b6a84) 817s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 817s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 817s git-debrebase = Upstream {"Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433"}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"} 817s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 817s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 817s git-debrebase = Packaging {"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32,"Ix" => 0}],"Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc"} 817s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 817s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 817s git-debrebase = Upstream {"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 817s git-debrebase: snag detected (-funclean-ordering): packaging change (a4efcc9f58a06f20c5de1258de24211048e99433) follows upstream change (eg 9f40936eece8f6452df026cc64200db82005a166) 817s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 817s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 817s git-debrebase = Upstream {"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2"}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b"} 817s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 817s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 817s git-debrebase = Upstream {"Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Differs" => 2,"Ix" => 0}],"Type" => "Upstream","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2"} 817s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 817s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 817s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n"} 817s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 817s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 817s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 817s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 817s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 817s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 817s git-debrebase = Anchor {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 817s git-debrebase *** WALK 9b56b9c2600dc10b9eec97d535d89870476de971 0 - 817s git-debrebase get_differs 5668ce44fba4db3f42ac837f0104a9335a819367 bec3a99f595d6254a65c51aa0160db363a70a9f9 = 0x22 817s git-debrebase classify 9b56b9c2600dc10b9eec97d535d89870476de971 $t=bec3a99f595d6254a65c51aa0160db363a70a9f9 @p 5668ce44fba4db3f42ac837f0104a9335a819367/0x22 817s git-debrebase = Mixed {"CommitId" => "9b56b9c2600dc10b9eec97d535d89870476de971","Hdr" => "tree bec3a99f595d6254a65c51aa0160db363a70a9f9\nparent 5668ce44fba4db3f42ac837f0104a9335a819367\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","Type" => "Mixed","Tree" => "bec3a99f595d6254a65c51aa0160db363a70a9f9","Parents" => [{"CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Differs" => 34,"Ix" => 0}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 2)\n"} 817s git-debrebase get_differs 5360dd228488e99ffa3d55e906ddc0de1c111c4e cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 = 0x2 817s git-debrebase classify 5668ce44fba4db3f42ac837f0104a9335a819367 $t=cd4c1550c7da8a4cd81ed765f7a91f2c58843a39 @p 5360dd228488e99ffa3d55e906ddc0de1c111c4e/0x2 817s git-debrebase = Upstream {"Hdr" => "tree cd4c1550c7da8a4cd81ed765f7a91f2c58843a39\nparent 5360dd228488e99ffa3d55e906ddc0de1c111c4e\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "5668ce44fba4db3f42ac837f0104a9335a819367","Tree" => "cd4c1550c7da8a4cd81ed765f7a91f2c58843a39","Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 817s git-debrebase get_differs d525d15277201d3a1cb95e2a82545c25ba458386 1e25a192cedaf5e20ce34baba2c091c4a579d05c = 0x20 817s git-debrebase classify 5360dd228488e99ffa3d55e906ddc0de1c111c4e $t=1e25a192cedaf5e20ce34baba2c091c4a579d05c @p d525d15277201d3a1cb95e2a82545c25ba458386/0x20 817s git-debrebase = Packaging {"Hdr" => "tree 1e25a192cedaf5e20ce34baba2c091c4a579d05c\nparent d525d15277201d3a1cb95e2a82545c25ba458386\nauthor dgit test git user 1530000027 +0100\ncommitter dgit test git user 1530000027 +0100\n","CommitId" => "5360dd228488e99ffa3d55e906ddc0de1c111c4e","Tree" => "1e25a192cedaf5e20ce34baba2c091c4a579d05c","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 2)\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386"}],"Type" => "Packaging"} 817s git-debrebase get_differs 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 e6c6c599f5b52414c68918fbedd2a0a4abe68178 = 0x4 817s git-debrebase classify d525d15277201d3a1cb95e2a82545c25ba458386 $t=e6c6c599f5b52414c68918fbedd2a0a4abe68178 @p 6e00b9cbfb2ac78131496aadb210310e5b4b6a84/0x4 817s git-debrebase = AddPatches {"Hdr" => "tree e6c6c599f5b52414c68918fbedd2a0a4abe68178\nparent 6e00b9cbfb2ac78131496aadb210310e5b4b6a84\nauthor dgit test git user 1530000025 +0100\ncommitter dgit test git user 1530000025 +0100\n","CommitId" => "d525d15277201d3a1cb95e2a82545c25ba458386","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84"}],"Msg" => "Commit Debian 3.0 (quilt) metadata\n\n[dgit (9.15) quilt-fixup]\n","Tree" => "e6c6c599f5b52414c68918fbedd2a0a4abe68178","Type" => "AddPatches"} 817s git-debrebase get_differs 5138bd8205d6eeb162d87a2d085746c0c305261c 4d870e59c3a21c2e6202b59474df673e46ef6449 = 0x22 817s git-debrebase classify 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 $t=4d870e59c3a21c2e6202b59474df673e46ef6449 @p 5138bd8205d6eeb162d87a2d085746c0c305261c/0x22 817s git-debrebase = Mixed {"CommitId" => "6e00b9cbfb2ac78131496aadb210310e5b4b6a84","Hdr" => "tree 4d870e59c3a21c2e6202b59474df673e46ef6449\nparent 5138bd8205d6eeb162d87a2d085746c0c305261c\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Type" => "Mixed","Parents" => [{"CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c","Ix" => 0,"Differs" => 34}],"Msg" => "MIXED add both() (subcommands refs/heads/unstitched-mixed 1)\n","Tree" => "4d870e59c3a21c2e6202b59474df673e46ef6449"} 817s git-debrebase get_differs a4efcc9f58a06f20c5de1258de24211048e99433 844b1f5bbb72eb4b4f0090c7207f78fc565e083f = 0x2 817s git-debrebase classify 5138bd8205d6eeb162d87a2d085746c0c305261c $t=844b1f5bbb72eb4b4f0090c7207f78fc565e083f @p a4efcc9f58a06f20c5de1258de24211048e99433/0x2 817s git-debrebase = Upstream {"Tree" => "844b1f5bbb72eb4b4f0090c7207f78fc565e083f","Parents" => [{"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Differs" => 2,"Ix" => 0}],"Msg" => "UPSTREAM edit src.c (subcommands refs/heads/unstitched-mixed 1)\n","Type" => "Upstream","Hdr" => "tree 844b1f5bbb72eb4b4f0090c7207f78fc565e083f\nparent a4efcc9f58a06f20c5de1258de24211048e99433\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","CommitId" => "5138bd8205d6eeb162d87a2d085746c0c305261c"} 817s git-debrebase get_differs 9f40936eece8f6452df026cc64200db82005a166 1b9dba384382fd10423f44e82b75e4a495de36dc = 0x20 817s git-debrebase classify a4efcc9f58a06f20c5de1258de24211048e99433 $t=1b9dba384382fd10423f44e82b75e4a495de36dc @p 9f40936eece8f6452df026cc64200db82005a166/0x20 817s git-debrebase = Packaging {"CommitId" => "a4efcc9f58a06f20c5de1258de24211048e99433","Hdr" => "tree 1b9dba384382fd10423f44e82b75e4a495de36dc\nparent 9f40936eece8f6452df026cc64200db82005a166\nauthor dgit test git user 1530000024 +0100\ncommitter dgit test git user 1530000024 +0100\n","Type" => "Packaging","Tree" => "1b9dba384382fd10423f44e82b75e4a495de36dc","Msg" => "DEBIAN add zorkmid (subcommands refs/heads/unstitched-mixed 1)\n","Parents" => [{"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Differs" => 32,"Ix" => 0}]} 817s git-debrebase get_differs ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x2 817s git-debrebase classify 9f40936eece8f6452df026cc64200db82005a166 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b/0x2 817s git-debrebase = Upstream {"CommitId" => "9f40936eece8f6452df026cc64200db82005a166","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Parents" => [{"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Differs" => 2,"Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 817s git-debrebase get_differs eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 25c7c42f7266a808c15feeac38bb0cc7c861ed56 = 0x2 817s git-debrebase classify ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b $t=25c7c42f7266a808c15feeac38bb0cc7c861ed56 @p eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2/0x2 817s git-debrebase = Upstream {"CommitId" => "ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b","Hdr" => "tree 25c7c42f7266a808c15feeac38bb0cc7c861ed56\nparent eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2"}],"Tree" => "25c7c42f7266a808c15feeac38bb0cc7c861ed56"} 817s git-debrebase get_differs 809643e5389def220ea36d61f2d3dd504603e95a 0163f07d35eebcd058425aa0dd1766b7d27d207c = 0x2 817s git-debrebase classify eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 $t=0163f07d35eebcd058425aa0dd1766b7d27d207c @p 809643e5389def220ea36d61f2d3dd504603e95a/0x2 817s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "0163f07d35eebcd058425aa0dd1766b7d27d207c","Type" => "Upstream","Hdr" => "tree 0163f07d35eebcd058425aa0dd1766b7d27d207c\nparent 809643e5389def220ea36d61f2d3dd504603e95a\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000022 +0100\n","CommitId" => "eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2"} 817s git-debrebase get_differs a9e43d48f464a00d90f17184927401111ff9a8ed b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 817s git-debrebase classify 809643e5389def220ea36d61f2d3dd504603e95a $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p a9e43d48f464a00d90f17184927401111ff9a8ed/0x10 817s git-debrebase = Changelog {"CommitId" => "809643e5389def220ea36d61f2d3dd504603e95a","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent a9e43d48f464a00d90f17184927401111ff9a8ed\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed"}]} 817s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 817s git-debrebase classify a9e43d48f464a00d90f17184927401111ff9a8ed $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x10 817s git-debrebase = Changelog {"CommitId" => "a9e43d48f464a00d90f17184927401111ff9a8ed","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000022 +0100\n","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 817s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 817s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 817s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 817s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 817s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw 7 upp 7 proc 15 pm -1 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 16 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase WALK BUILD a9e43d48f464a00d90f17184927401111ff9a8ed Debian (rewriting=0) 817s git-debrebase WALK BUILD 809643e5389def220ea36d61f2d3dd504603e95a Debian (rewriting=0) 817s git-debrebase WALK BUILD a4efcc9f58a06f20c5de1258de24211048e99433 Debian (rewriting=0) 817s git-debrebase WALK REWRITING NOW cl=HASH(0x5557461d4f30) procd=HASH(0x5557461d24c0) 817s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 817s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Debian (rewriting=1) 817s git-debrebase WALK BUILD 5360dd228488e99ffa3d55e906ddc0de1c111c4e Debian (rewriting=1) 817s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 817s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Debian (rewriting=1) 817s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 817s git-debrebase WALK BUILD eaf80f6e3b5c81f1a4d7e86d1fbc979d25029de2 Upstream (rewriting=1) 817s git-debrebase WALK BUILD ee5cf316a2b3d1635bb22c0d75e2caee0dcc252b Upstream (rewriting=1) 817s git-debrebase WALK BUILD 9f40936eece8f6452df026cc64200db82005a166 Upstream (rewriting=1) 817s git-debrebase WALK BUILD 5138bd8205d6eeb162d87a2d085746c0c305261c Upstream (rewriting=1) 817s git-debrebase WALK BUILD 6e00b9cbfb2ac78131496aadb210310e5b4b6a84 Upstream (rewriting=1) 817s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 817s git-debrebase WALK BUILD 5668ce44fba4db3f42ac837f0104a9335a819367 Upstream (rewriting=1) 817s git-debrebase WALK BUILD 9b56b9c2600dc10b9eec97d535d89870476de971 Upstream (rewriting=1) 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase get_differs 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 9b56b9c2600dc10b9eec97d535d89870476de971 = 0x4 817s git-debrebase *** WALK RETURN 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 72e35041bfbd2d841ef8d4b4bf24616be30909ce 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase gbp_pq_export bw 72e35041bfbd2d841ef8d4b4bf24616be30909ce 7b7a1b7fa599fa015a8ee11d8165aa7a379c32fb 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase get_differs 9b56b9c2600dc10b9eec97d535d89870476de971 ad852cd21fb1937523d9bf22b223a04ee6f5114f = 0xc 817s 817s git-debrebase: error: Patch export produced patch amendments (abandoned output commit ad852cd21fb1937523d9bf22b223a04ee6f5114f). Try laundering first. 817s + local 'ps=7 0' 817s + set -o pipefail 817s + case $ps in 817s + t-grep-mpat 'F:Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 817s + local 'mpat=F:Patch export produced patch amendments' 817s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 817s + local grepper=fgrep 817s + case "$mpat" in 817s + case "$mpat" in 817s + grepper=fgrep 817s + mpat='Patch export produced patch amendments' 817s + fgrep -e 'Patch export produced patch amendments' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 817s git-debrebase: error: Patch export produced patch amendments (abandoned output commit ad852cd21fb1937523d9bf22b223a04ee6f5114f). Try laundering first. 817s + continue 817s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 817s + work=work-make-patches-raw-converted-from-gbp 817s + : '---------- make-patches raw-converted-from-gbp ----------' 817s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 817s + git update-ref --stdin 817s + sed s/raw-converted-from-gbp/work-make-patches-raw-converted-from-gbp/ 817s + git checkout work-make-patches-raw-converted-from-gbp 817s Switched to branch 'work-make-patches-raw-converted-from-gbp' 817s + checkletters=Pn 817s + shift 817s + before=before-work-make-patches-raw-converted-from-gbp 817s + git branch before-work-make-patches-raw-converted-from-gbp 817s + local xopts= 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + case "$checkletters" in 817s + t-git-debrebase make-patches 817s + local gdr=git-debrebase 817s + : ' 817s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 817s + git-debrebase --dgit=dgit -D make-patches 817s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 817s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 817s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807"} 817s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 817s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 817s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a"}],"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da"} 817s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 817s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 817s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Ix" => 0,"Differs" => 2}],"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 817s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 817s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 817s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 817s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291","Differs" => 48}],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor"} 817s git-debrebase *** WALK 178896af44c5b02e05a3442df6c33233b6acb807 0 - 817s git-debrebase get_differs 58ae772018d91f0e38c14362f55fbe0a9bfe03da 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 817s git-debrebase classify 178896af44c5b02e05a3442df6c33233b6acb807 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 58ae772018d91f0e38c14362f55fbe0a9bfe03da/0x2 817s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 58ae772018d91f0e38c14362f55fbe0a9bfe03da\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Ix" => 0}],"CommitId" => "178896af44c5b02e05a3442df6c33233b6acb807","Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 817s git-debrebase get_differs 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 817s git-debrebase classify 58ae772018d91f0e38c14362f55fbe0a9bfe03da $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a/0x2 817s git-debrebase = Upstream {"CommitId" => "58ae772018d91f0e38c14362f55fbe0a9bfe03da","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Ix" => 0,"Differs" => 2}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream"} 817s git-debrebase get_differs 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 817s git-debrebase classify 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6/0x2 817s git-debrebase = Upstream {"CommitId" => "4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream"} 817s git-debrebase get_differs cb0034db655d97285f64f8b69e80542b2d612491 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 817s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 817s git-debrebase classify 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p cb0034db655d97285f64f8b69e80542b2d612491/0 923df13cd47c1ac87a6a0646124ace159c3d8291/0x30 817s git-debrebase = Anchor {"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent cb0034db655d97285f64f8b69e80542b2d612491\nparent 923df13cd47c1ac87a6a0646124ace159c3d8291\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "cb0034db655d97285f64f8b69e80542b2d612491"},{"Differs" => 48,"Ix" => 1,"CommitId" => "923df13cd47c1ac87a6a0646124ace159c3d8291"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "48b4f455ee54f02565ac6299bb6ecb2234bdd5e6"} 817s git-debrebase *** WALK prep done cur=48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 brw -1 upp 2 proc 3 pm -1 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase WALK REBUILD 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 4 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 817s git-debrebase WALK BUILD 4dfde1af9e9e3d8b36d8a29fe887bb9b8f37b58a Upstream (rewriting=0) 817s git-debrebase WALK BUILD 58ae772018d91f0e38c14362f55fbe0a9bfe03da Upstream (rewriting=0) 817s git-debrebase WALK BUILD 178896af44c5b02e05a3442df6c33233b6acb807 Upstream (rewriting=0) 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 178896af44c5b02e05a3442df6c33233b6acb807 = 0 817s git-debrebase *** WALK RETURN 178896af44c5b02e05a3442df6c33233b6acb807 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase gbp_pq_export bw 48b4f455ee54f02565ac6299bb6ecb2234bdd5e6 178896af44c5b02e05a3442df6c33233b6acb807 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 817s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s git-debrebase get_differs 178896af44c5b02e05a3442df6c33233b6acb807 e0f023f5738f52a4d547f9c2779dd1d19d0c0767 = 0x4 817s git-debrebase >= update HEAD e0f023f5738f52a4d547f9c2779dd1d19d0c0767 178896af44c5b02e05a3442df6c33233b6acb807 817s git-debrebase >$ 817s HEAD is now at e0f023f Commit patch queue (exported by git-debrebase) 817s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 817s ' 817s + peel=peel-make-patches-raw-converted-from-gbp 817s + git checkout -b peel-make-patches-raw-converted-from-gbp 817s Switched to a new branch 'peel-make-patches-raw-converted-from-gbp' 817s + t-clean-on-branch peel-make-patches-raw-converted-from-gbp 817s + t-output '## peel-make-patches-raw-converted-from-gbp' git status -b --porcelain 817s + printf '%s\n' '## peel-make-patches-raw-converted-from-gbp' 817s + shift 817s + git status -b --porcelain 817s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 817s + : '---------- make-patches raw-converted-from-gbp Pn ----------' 817s + '[' xPn '!=' x ']' 817s + : '---- make-patches raw-converted-from-gbp ...Pn ----' 817s + make_check Pn 817s + case "$1" in 817s + t-dgit -wgf --quilt=nofix quilt-fixup 817s + local dgit=dgit 817s + pwd 817s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 817s + : ' 817s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 817s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --quilt=nofix quilt-fixup 817s | git rev-parse --show-toplevel 817s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 817s | git config -z --get-regexp --local '.*' 817s | git config -z --get-regexp --local '.*' 817s | git config -z --get-regexp --global '.*' 817s | git config -z --get-regexp --system '.*' 817s format 3.0 (quilt), quilt mode nofix 817s Format `3.0 (quilt)', need to check/update patch stack 817s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 817s => `' 817s + git diff --quiet HEAD 818s + git clean -xdff 818s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 818s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 818s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 818s | git rev-parse 'HEAD~0' 818s => `e0f023f5738f52a4d547f9c2779dd1d19d0c0767' 818s | git symbolic-ref -q HEAD 818s => `refs/heads/peel-make-patches-raw-converted-from-gbp' 818s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 818s CD work 818s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 818s + git reset -q --hard e0f023f5738f52a4d547f9c2779dd1d19d0c0767 818s examining quilt state (multiple patches, nofix mode) 818s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 818s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 818s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 818s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 818s CD fake 818s | find -name .git -prune -print0 818s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 818s + git checkout -f e0f023f5738f52a4d547f9c2779dd1d19d0c0767 -- debian 818s + git add -Af . 818s | git write-tree 818s => `b2f98a26237de17a003353d4dd6f500a70e60b1e' 818s fake orig tree object b2f98a26237de17a003353d4dd6f500a70e60b1e 818s CD .. 818s + git reset -q --hard e0f023f5738f52a4d547f9c2779dd1d19d0c0767 818s CD ../fake 818s + git add -Af . 818s | git write-tree 818s => `1dccdc0a0411608175805fedb100e27034079e64' 818s fake o+d/p tree object b2f98a26237de17a003353d4dd6f500a70e60b1e 818s CD ../work 818s | git ls-tree --name-only -z e0f023f5738f52a4d547f9c2779dd1d19d0c0767 818s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 818s | git diff-tree -z --no-renames -r b2f98a26237de17a003353d4dd6f500a70e60b1e e0f023f5738f52a4d547f9c2779dd1d19d0c0767 818s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 818s quiltify_trees_differ b2f98a26237de17a003353d4dd6f500a70e60b1e e0f023f5738f52a4d547f9c2779dd1d19d0c0767 => 1 818s | git diff-tree -z --no-renames --name-only -r e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 818s => `' 818s quiltify_trees_differ e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 => 0 818s | git diff-tree -z --no-renames --name-only -r b2f98a26237de17a003353d4dd6f500a70e60b1e 1dccdc0a0411608175805fedb100e27034079e64 818s => `lib.c\x00new-upstream-file\x00src.c\x00' 818s quiltify_trees_differ b2f98a26237de17a003353d4dd6f500a70e60b1e 1dccdc0a0411608175805fedb100e27034079e64 => 1 818s differences @dl ## ## == == == ==. 818s dgit: base trees orig=b2f98a26237de17a0033 o+d/p=1dccdc0a041160817580 818s dgit: quilt differences: src: ## orig ## gitignores: == orig == 818s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 818s starting quiltify (multiple patches, nofix mode) 818s | git ls-tree --name-only e0f023f5738f52a4d547f9c2779dd1d19d0c0767 -- debian/rules debian/control 818s => `debian/control'... 818s quiltify investigate e0f023f5738f52a4d547f9c2779dd1d19d0c0767 818s | git diff-tree -z --no-renames --name-only e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 818s => `' 818s quiltify_trees_differ e0f023f5738f52a4d547f9c2779dd1d19d0c0767 1dccdc0a0411608175805fedb100e27034079e64 => 0 818s search finished hooray! 818s quiltify linearisation planning successful, executing... 818s + git checkout -q master 818s | git status --ignored --porcelain 818s => `?? .pc/' 818s nothing quilty to commit, ok. 818s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 818s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + git diff HEAD~ debian/patches 818s + egrep . 818s diff --git a/debian/patches/0001-Add-a-new-upstream-file.patch b/debian/patches/0001-Add-a-new-upstream-file.patch 818s new file mode 100644 818s index 0000000..0405708 818s --- /dev/null 818s +++ b/debian/patches/0001-Add-a-new-upstream-file.patch 818s @@ -0,0 +1,16 @@ 818s +From: Ian Jackson 818s +Date: Sun, 6 Dec 2015 23:50:08 +0000 818s +Subject: Add a new upstream file 818s + 818s +--- 818s + new-upstream-file | 1 + 818s + 1 file changed, 1 insertion(+) 818s + create mode 100644 new-upstream-file 818s + 818s +diff --git a/new-upstream-file b/new-upstream-file 818s +new file mode 100644 818s +index 0000000..a2d670b 818s +--- /dev/null 818s ++++ b/new-upstream-file 818s +@@ -0,0 +1 @@ 818s ++Add a file 818s diff --git a/debian/patches/0002-Edit-the-.c-file.patch b/debian/patches/0002-Edit-the-.c-file.patch 818s new file mode 100644 818s index 0000000..0e04924 818s --- /dev/null 818s +++ b/debian/patches/0002-Edit-the-.c-file.patch 818s @@ -0,0 +1,15 @@ 818s +From: Ian Jackson 818s +Date: Sun, 6 Dec 2015 23:50:39 +0000 818s +Subject: Edit the .c file 818s + 818s +--- 818s + src.c | 2 +- 818s + 1 file changed, 1 insertion(+), 1 deletion(-) 818s + 818s +diff --git a/src.c b/src.c 818s +index 05437c5..6cc28de 100644 818s +--- a/src.c 818s ++++ b/src.c 818s +@@ -1 +1 @@ 818s +-main(){} 818s ++main(void){} 818s diff --git a/debian/patches/series b/debian/patches/series 818s new file mode 100644 818s index 0000000..9e8f739 818s --- /dev/null 818s +++ b/debian/patches/series 818s @@ -0,0 +1,3 @@ 818s +0001-Add-a-new-upstream-file.patch 818s +0002-Edit-the-.c-file.patch 818s +subdir/addnewups 818s diff --git a/debian/patches/subdir/addnewups b/debian/patches/subdir/addnewups 818s new file mode 100644 818s index 0000000..1acc2e8 818s --- /dev/null 818s +++ b/debian/patches/subdir/addnewups 818s @@ -0,0 +1,16 @@ 818s +From: Ian Jackson 818s +Date: Sat, 4 Jun 2016 22:09:32 +0100 818s +Subject: Add another new upstream file 818s + 818s +--- 818s + lib.c | 1 + 818s + 1 file changed, 1 insertion(+) 818s + create mode 100644 lib.c 818s + 818s +diff --git a/lib.c b/lib.c 818s +new file mode 100644 818s +index 0000000..e026ed3 818s +--- /dev/null 818s ++++ b/lib.c 818s +@@ -0,0 +1 @@ 818s ++void function(void){} 818s + t-gdr-made-patches 818s + git log -n1 --pretty=format:%B 818s + egrep '^\[git-debrebase' 818s [git-debrebase make-patches: export and commit patches] 818s + git diff --quiet HEAD~ -- :. ':!debian/patches' 818s + git reset --hard HEAD~ 818s HEAD is now at 178896a Add another new upstream file 818s + checkletters=n 818s + '[' xn '!=' x ']' 818s + : '---- make-patches raw-converted-from-gbp ...n ----' 818s + make_check n 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-make-patches-raw-converted-from-gbp refs/heads/peel-make-patches-raw-converted-from-gbp 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-make-patches-raw-converted-from-gbp 818s + local name=refs/heads/before-work-make-patches-raw-converted-from-gbp 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-make-patches-raw-converted-from-gbp 818s ++ local ref=refs/heads/before-work-make-patches-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-make-patches-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-make-patches-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t-ref-same-val refs/heads/before-work-make-patches-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 818s + local name=refs/heads/before-work-make-patches-raw-converted-from-gbp 818s + local val=178896af44c5b02e05a3442df6c33233b6acb807 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-make-patches-raw-converted-from-gbp 818s + local name=refs/heads/peel-make-patches-raw-converted-from-gbp 818s + local val 818s ++ t-git-get-ref refs/heads/peel-make-patches-raw-converted-from-gbp 818s ++ local ref=refs/heads/peel-make-patches-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-make-patches-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-make-patches-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t-ref-same-val refs/heads/peel-make-patches-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 818s + local name=refs/heads/peel-make-patches-raw-converted-from-gbp 818s + local val=178896af44c5b02e05a3442df6c33233b6acb807 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t_ref_names+=("$name") 818s + checkletters= 818s + '[' x '!=' x ']' 818s + subcmd forget-was-ever-debrebase nA nA nA nA nA 818s + local subcmd=forget-was-ever-debrebase 818s + shift 818s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 818s + work=work-forget-was-ever-debrebase-stitched-laundered 818s + : '---------- forget-was-ever-debrebase stitched-laundered ----------' 818s + git for-each-ref '**/stitched-laundered' '**/stitched-laundered/**' '--format=create %(refname) %(objectname)' 818s + git update-ref --stdin 818s + sed s/stitched-laundered/work-forget-was-ever-debrebase-stitched-laundered/ 818s + git checkout work-forget-was-ever-debrebase-stitched-laundered 818s Switched to branch 'work-forget-was-ever-debrebase-stitched-laundered' 818s + checkletters=nA 818s + shift 818s + before=before-work-forget-was-ever-debrebase-stitched-laundered 818s + git branch before-work-forget-was-ever-debrebase-stitched-laundered 818s + local xopts= 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + t-git-debrebase forget-was-ever-debrebase 818s + local gdr=git-debrebase 818s + : ' 818s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 818s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 818s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-stitched-laundered 818s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 818s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 818s git-debrebase >$ 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + peel=peel-forget-was-ever-debrebase-stitched-laundered 818s + git checkout -b peel-forget-was-ever-debrebase-stitched-laundered 818s Switched to a new branch 'peel-forget-was-ever-debrebase-stitched-laundered' 818s + t-clean-on-branch peel-forget-was-ever-debrebase-stitched-laundered 818s + t-output '## peel-forget-was-ever-debrebase-stitched-laundered' git status -b --porcelain 818s + printf '%s\n' '## peel-forget-was-ever-debrebase-stitched-laundered' 818s + shift 818s + git status -b --porcelain 818s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 818s + : '---------- forget-was-ever-debrebase stitched-laundered nA ----------' 818s + '[' xnA '!=' x ']' 818s + : '---- forget-was-ever-debrebase stitched-laundered ...nA ----' 818s + make_check nA 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-laundered 818s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s + local val 818s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-laundered 818s + local val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=64d2fdf7628f675981360f0dce3aaaa227b0676a 818s + t_ref_names+=("$name") 818s + checkletters=A 818s + '[' xA '!=' x ']' 818s + : '---- forget-was-ever-debrebase stitched-laundered ...A ----' 818s + make_check A 818s + case "$1" in 818s + t-refs-notexist refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 818s + local val 818s + for g in $* 818s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + for g in $* 818s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + checkletters= 818s + '[' x '!=' x ']' 818s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 818s + work=work-forget-was-ever-debrebase-stitched-mixed 818s + : '---------- forget-was-ever-debrebase stitched-mixed ----------' 818s + git for-each-ref '**/stitched-mixed' '**/stitched-mixed/**' '--format=create %(refname) %(objectname)' 818s + git update-ref --stdin 818s + sed s/stitched-mixed/work-forget-was-ever-debrebase-stitched-mixed/ 818s + git checkout work-forget-was-ever-debrebase-stitched-mixed 818s Switched to branch 'work-forget-was-ever-debrebase-stitched-mixed' 818s + checkletters=nA 818s + shift 818s + before=before-work-forget-was-ever-debrebase-stitched-mixed 818s + git branch before-work-forget-was-ever-debrebase-stitched-mixed 818s + local xopts= 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + t-git-debrebase forget-was-ever-debrebase 818s + local gdr=git-debrebase 818s + : ' 818s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 818s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 818s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-stitched-mixed 818s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 818s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 818s git-debrebase >$ 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + peel=peel-forget-was-ever-debrebase-stitched-mixed 818s + git checkout -b peel-forget-was-ever-debrebase-stitched-mixed 818s Switched to a new branch 'peel-forget-was-ever-debrebase-stitched-mixed' 818s + t-clean-on-branch peel-forget-was-ever-debrebase-stitched-mixed 818s + t-output '## peel-forget-was-ever-debrebase-stitched-mixed' git status -b --porcelain 818s + printf '%s\n' '## peel-forget-was-ever-debrebase-stitched-mixed' 818s + shift 818s + git status -b --porcelain 818s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 818s + : '---------- forget-was-ever-debrebase stitched-mixed nA ----------' 818s + '[' xnA '!=' x ']' 818s + : '---- forget-was-ever-debrebase stitched-mixed ...nA ----' 818s + make_check nA 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=5e0bf3cea3c715230b96aca41156852390014b98 818s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-stitched-mixed 818s + local val=5e0bf3cea3c715230b96aca41156852390014b98 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s + local val 818s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=5e0bf3cea3c715230b96aca41156852390014b98 818s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 5e0bf3cea3c715230b96aca41156852390014b98 818s + local name=refs/heads/peel-forget-was-ever-debrebase-stitched-mixed 818s + local val=5e0bf3cea3c715230b96aca41156852390014b98 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=5e0bf3cea3c715230b96aca41156852390014b98 818s + t_ref_names+=("$name") 818s + checkletters=A 818s + '[' xA '!=' x ']' 818s + : '---- forget-was-ever-debrebase stitched-mixed ...A ----' 818s + make_check A 818s + case "$1" in 818s + t-refs-notexist refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 818s + local val 818s + for g in $* 818s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + for g in $* 818s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-stitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + checkletters= 818s + '[' x '!=' x ']' 818s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 818s + work=work-forget-was-ever-debrebase-unstitched-laundered 818s + : '---------- forget-was-ever-debrebase unstitched-laundered ----------' 818s + git for-each-ref '**/unstitched-laundered' '**/unstitched-laundered/**' '--format=create %(refname) %(objectname)' 818s + git update-ref --stdin 818s + sed s/unstitched-laundered/work-forget-was-ever-debrebase-unstitched-laundered/ 818s + git checkout work-forget-was-ever-debrebase-unstitched-laundered 818s Switched to branch 'work-forget-was-ever-debrebase-unstitched-laundered' 818s + checkletters=nA 818s + shift 818s + before=before-work-forget-was-ever-debrebase-unstitched-laundered 818s + git branch before-work-forget-was-ever-debrebase-unstitched-laundered 818s + local xopts= 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + t-git-debrebase forget-was-ever-debrebase 818s + local gdr=git-debrebase 818s + : ' 818s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 818s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 818s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s git-debrebase >$ 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + peel=peel-forget-was-ever-debrebase-unstitched-laundered 818s + git checkout -b peel-forget-was-ever-debrebase-unstitched-laundered 818s Switched to a new branch 'peel-forget-was-ever-debrebase-unstitched-laundered' 818s + t-clean-on-branch peel-forget-was-ever-debrebase-unstitched-laundered 818s + t-output '## peel-forget-was-ever-debrebase-unstitched-laundered' git status -b --porcelain 818s + printf '%s\n' '## peel-forget-was-ever-debrebase-unstitched-laundered' 818s + shift 818s + git status -b --porcelain 818s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 818s + : '---------- forget-was-ever-debrebase unstitched-laundered nA ----------' 818s + '[' xnA '!=' x ']' 818s + : '---- forget-was-ever-debrebase unstitched-laundered ...nA ----' 818s + make_check nA 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-laundered 818s + local val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s + local val 818s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-laundered 818s + local val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=5472c89e9f96508ec91185b6f57e8a1875ea7a4f 818s + t_ref_names+=("$name") 818s + checkletters=A 818s + '[' xA '!=' x ']' 818s + : '---- forget-was-ever-debrebase unstitched-laundered ...A ----' 818s + make_check A 818s + case "$1" in 818s + t-refs-notexist refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s + local val 818s + for g in $* 818s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + for g in $* 818s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ case "$ref" in 818s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-laundered\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + checkletters= 818s + '[' x '!=' x ']' 818s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 818s + work=work-forget-was-ever-debrebase-unstitched-mixed 818s + : '---------- forget-was-ever-debrebase unstitched-mixed ----------' 818s + git for-each-ref '**/unstitched-mixed' '**/unstitched-mixed/**' '--format=create %(refname) %(objectname)' 818s + git update-ref --stdin 818s + sed s/unstitched-mixed/work-forget-was-ever-debrebase-unstitched-mixed/ 818s + git checkout work-forget-was-ever-debrebase-unstitched-mixed 818s Switched to branch 'work-forget-was-ever-debrebase-unstitched-mixed' 818s + checkletters=nA 818s + shift 818s + before=before-work-forget-was-ever-debrebase-unstitched-mixed 818s + git branch before-work-forget-was-ever-debrebase-unstitched-mixed 818s + local xopts= 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + t-git-debrebase forget-was-ever-debrebase 818s + local gdr=git-debrebase 818s + : ' 818s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 818s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 818s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s git-debrebase >$ 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + peel=peel-forget-was-ever-debrebase-unstitched-mixed 818s + git checkout -b peel-forget-was-ever-debrebase-unstitched-mixed 818s Switched to a new branch 'peel-forget-was-ever-debrebase-unstitched-mixed' 818s + t-clean-on-branch peel-forget-was-ever-debrebase-unstitched-mixed 818s + t-output '## peel-forget-was-ever-debrebase-unstitched-mixed' git status -b --porcelain 818s + printf '%s\n' '## peel-forget-was-ever-debrebase-unstitched-mixed' 818s + shift 818s + git status -b --porcelain 818s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 818s + : '---------- forget-was-ever-debrebase unstitched-mixed nA ----------' 818s + '[' xnA '!=' x ']' 818s + : '---- forget-was-ever-debrebase unstitched-mixed ...nA ----' 818s + make_check nA 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 9b56b9c2600dc10b9eec97d535d89870476de971 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-unstitched-mixed 818s + local val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s + local val 818s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 9b56b9c2600dc10b9eec97d535d89870476de971 818s + local name=refs/heads/peel-forget-was-ever-debrebase-unstitched-mixed 818s + local val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=9b56b9c2600dc10b9eec97d535d89870476de971 818s + t_ref_names+=("$name") 818s + checkletters=A 818s + '[' xA '!=' x ']' 818s + : '---- forget-was-ever-debrebase unstitched-mixed ...A ----' 818s + make_check A 818s + case "$1" in 818s + t-refs-notexist refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s + local val 818s + for g in $* 818s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + for g in $* 818s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ case "$ref" in 818s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-unstitched-mixed\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + checkletters= 818s + '[' x '!=' x ']' 818s + for startbranch in {stitched,unstitched}-{laundered,mixed} raw-converted-from-gbp 818s + work=work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + : '---------- forget-was-ever-debrebase raw-converted-from-gbp ----------' 818s + git for-each-ref '**/raw-converted-from-gbp' '**/raw-converted-from-gbp/**' '--format=create %(refname) %(objectname)' 818s + git update-ref --stdin 818s + sed s/raw-converted-from-gbp/work-forget-was-ever-debrebase-raw-converted-from-gbp/ 818s + git checkout work-forget-was-ever-debrebase-raw-converted-from-gbp 818s Switched to branch 'work-forget-was-ever-debrebase-raw-converted-from-gbp' 818s + checkletters=nA 818s + shift 818s + before=before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + git branch before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local xopts= 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + case "$checkletters" in 818s + t-git-debrebase forget-was-ever-debrebase 818s + local gdr=git-debrebase 818s + : ' 818s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 818s + git-debrebase --dgit=dgit -D forget-was-ever-debrebase 818s git-debrebase ffq_prev_branchinfo branch current refs/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s git-debrebase >= delete refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s git-debrebase >= delete refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s git-debrebase >$ 818s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 818s ' 818s + peel=peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + git checkout -b peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s Switched to a new branch 'peel-forget-was-ever-debrebase-raw-converted-from-gbp' 818s + t-clean-on-branch peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + t-output '## peel-forget-was-ever-debrebase-raw-converted-from-gbp' git status -b --porcelain 818s + printf '%s\n' '## peel-forget-was-ever-debrebase-raw-converted-from-gbp' 818s + shift 818s + git status -b --porcelain 818s + diff /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.want /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.got 818s + : '---------- forget-was-ever-debrebase raw-converted-from-gbp nA ----------' 818s + '[' xnA '!=' x ']' 818s + : '---- forget-was-ever-debrebase raw-converted-from-gbp ...nA ----' 818s + make_check nA 818s + case "$1" in 818s + t-refs-same-start 818s + unset t_ref_val 818s + t_ref_names=() 818s + t-refs-same refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local g 818s + for g in $* 818s + t-ref-same refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local val 818s ++ t-git-get-ref refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ local ref=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t-ref-same-val refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 818s + local name=refs/heads/before-work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local val=178896af44c5b02e05a3442df6c33233b6acb807 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t_ref_names+=("$name") 818s + for g in $* 818s + t-ref-same refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local name=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local val 818s ++ t-git-get-ref refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ local ref=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s + val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t-ref-same-val refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 178896af44c5b02e05a3442df6c33233b6acb807 818s + local name=refs/heads/peel-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local val=178896af44c5b02e05a3442df6c33233b6acb807 818s + case "${t_ref_val-unset}" in 818s + t_ref_val=178896af44c5b02e05a3442df6c33233b6acb807 818s + t_ref_names+=("$name") 818s + checkletters=A 818s + '[' xA '!=' x ']' 818s + : '---- forget-was-ever-debrebase raw-converted-from-gbp ...A ----' 818s + make_check A 818s + case "$1" in 818s + t-refs-notexist refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s + local val 818s + for g in $* 818s ++ t-git-get-ref refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ local ref=refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/ffq-prev/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + for g in $* 818s ++ t-git-get-ref refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ local ref=refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ case "$ref" in 818s ++ git show-ref -d refs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp 818s ++ perl -ne ' 818s $x = $1 if m#^(\w+) \Qrefs/debrebase-last/heads/work-forget-was-ever-debrebase-raw-converted-from-gbp\E(?:\^\{\})?$#; 818s END { print "$x\n" if length $x; } 818s ' 818s ++ test 1 = 1 818s + val= 818s + '[' x '!=' x ']' 818s + checkletters= 818s + '[' x '!=' x ']' 818s + t-ok 818s + : ======================================== 818s + t-check-only-bpd 818s + '[' .. = .. ']' 818s + return 818s + t-fscks 818s + shopt -s nullglob 818s + for d in $tmp/*/.git $tmp/git/*.git 818s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 818s + t-git-fsck 818s ++ git rev-parse --git-dir 818s + local fsckerrs=.git/dgit-test-fsck.errs 818s + set +e 818s + LC_MESSAGES=C 818s + git fsck --no-dangling --strict 818s + tee .git/dgit-test-fsck.errs 818s + ps='0 0' 818s + set -e 818s + local pats 818s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 818s + test '0 0' = '0 0' 818s + pats+=(-e 'notice: HEAD points to an unborn branch') 818s + pats+=(-e 'notice: No default references') 818s + set +e 818s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 818s + rc=1 818s + set -e 818s + case $rc in 818s + for d in $tmp/*/.git $tmp/git/*.git 818s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 818s + t-git-fsck 818s ++ git rev-parse --git-dir 818s + local fsckerrs=./dgit-test-fsck.errs 818s + set +e 818s + LC_MESSAGES=C 818s + git fsck --no-dangling --strict 818s + tee ./dgit-test-fsck.errs 818s notice: HEAD points to an unborn branch (master) 818s + ps='0 0' 818s + set -e 818s + local pats 818s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 818s + test '0 0' = '0 0' 818s + pats+=(-e 'notice: HEAD points to an unborn branch') 818s + pats+=(-e 'notice: No default references') 818s + set +e 818s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 818s + rc=1 818s + set -e 818s + case $rc in 818s + t-save-artifacts 818s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts 818s + '[' x/tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts = x ']' 818s + '[' xtmp = x ']' 818s + GZIP=-1v 818s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-subcommands-artifacts/gdr-subcommands.tar.gz '--exclude=*.tar' . 818s gzip: warning: GZIP environment variable is deprecated; use an alias or script 818s 82.8% 818s + echo ok. 818s ok. 818s + rc=0 818s + set +x 818s + set +e 818s + pwd 818s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 818s + '[' x '!=' x ']' 818s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 818s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 818s + set -e 818s + test 0 = 0 819s autopkgtest [12:31:53]: test gdr-subcommands: -----------------------] 819s autopkgtest [12:31:53]: test gdr-subcommands: - - - - - - - - - - results - - - - - - - - - - 819s gdr-subcommands PASS 819s autopkgtest [12:31:53]: test gdr-unprocessable: preparing testbed 819s Reading package lists... 819s Building dependency tree... 819s Reading state information... 820s Starting pkgProblemResolver with broken count: 0 820s Starting 2 pkgProblemResolver with broken count: 0 820s Done 820s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 820s autopkgtest [12:31:54]: test gdr-unprocessable: [----------------------- 820s ++ set -o pipefail 820s ++ . tests/lib-core 820s ++ . tests/lib-restricts 820s ++ trap ' 820s rc=$? 820s set +x 820s test $rc = 0 || echo " 820s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 820s 820s Most relevant logs are just before assignment rc=$rc 820s Will now do cleanup etc. 820s " 820s set -x 820s set +e 820s pwd 820s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 820s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 820s set -e 820s test $rc = 0 || t-report-failure 820s ' EXIT 820s ++ t-filter-out-git-hyphen-dir 820s ++ local pathent 820s +++ type -p git-rev-parse 820s +++ : 820s ++ pathent= 820s ++ case "$pathent" in 820s ++ return 820s ++ t-set-intree 820s ++ '[' x = x ']' 820s ++ return 820s ++ : -D 820s ++ export DGIT_TEST_DEBUG 820s ++ : x 820s ++ export DGIT_TEST_DEBPUSH_DEBUG 820s ++ : 820s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 820s ++ GIT_COMMITTER_DATE='1530000000 +0100' 820s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 820s ++ GIT_AUTHOR_DATE='1530000000 +0100' 820s ++ export LC_CTYPE=C.UTF-8 820s ++ LC_CTYPE=C.UTF-8 820s ++ unset CDPATH 820s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 820s ++ FILTER_BRANCH_SQUELCH_WARNING=1 820s +++ pwd 820s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 820s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ testname=gdr-unprocessable 820s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ bpd=.. 820s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 820s ++ '[' x '!=' x ']' 820s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s +++ pwd 820s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ t-set-using-tmp 820s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 820s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 820s ++ export 'DEBFULLNAME=dgit test git user' 820s ++ DEBFULLNAME='dgit test git user' 820s ++ git config --global user.email dgit-test@debian.example.net 820s ++ git config --global user.name 'dgit test git user' 820s ++ git config --global protocol.ext.allow always 820s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 820s ++ env -0 820s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 820s ++ export DEBCHANGE_VENDOR=dpkg 820s ++ DEBCHANGE_VENDOR=dpkg 820s ++ unset VISUAL 820s ++ unset GIT_EDITOR 820s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 820s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 820s ++ cat 820s ++ schroot=build 820s ++ : aq 820s ++ : archive/test-dummy 820s ++ : sid:unstable 820s ++ t-git-config dgit.default.old-dsc-distro test-dummy 820s ++ git config --global dgit.default.old-dsc-distro test-dummy 820s ++ for import in ${autoimport-gnupg} 820s ++ case "$0" in 820s ++ t-setup-import gnupg 820s ++ local setupname=gnupg 820s ++ local setupsrc 820s ++ local lock 820s ++ '[' x = x ']' 820s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 820s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 820s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 820s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 820s cd "$1"; shift 820s setupname="$1"; shift 820s simport="$1"; shift 820s if [ -e "$simport" ]; then exit 0; fi 820s env - "$@" \ 820s "tests/setup/$setupname" 820s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 820s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 820s + shift 820s + setupname=gnupg 820s + shift 820s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 820s + shift 820s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 820s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-unprocessable -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-unprocessable' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 820s ++ set -o pipefail 820s ++ . tests/lib-core 820s ++ . tests/lib-restricts 820s ++ trap ' 820s rc=$? 820s set +x 820s test $rc = 0 || echo " 820s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 820s 820s Most relevant logs are just before assignment rc=$rc 820s Will now do cleanup etc. 820s " 820s set -x 820s set +e 820s pwd 820s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 820s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 820s set -e 820s test $rc = 0 || t-report-failure 820s ' EXIT 820s ++ t-filter-out-git-hyphen-dir 820s ++ local pathent 820s +++ type -p git-rev-parse 820s +++ : 820s ++ pathent= 820s ++ case "$pathent" in 820s ++ return 820s ++ t-set-intree 820s ++ '[' x = x ']' 820s ++ return 820s ++ : -D 820s ++ export DGIT_TEST_DEBUG 820s ++ : x 820s ++ export DGIT_TEST_DEBPUSH_DEBUG 820s ++ : 820s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 820s ++ GIT_COMMITTER_DATE='1530000000 +0100' 820s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 820s ++ GIT_AUTHOR_DATE='1530000000 +0100' 820s ++ export LC_CTYPE=C.UTF-8 820s ++ LC_CTYPE=C.UTF-8 820s ++ unset CDPATH 820s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 820s ++ FILTER_BRANCH_SQUELCH_WARNING=1 820s +++ pwd 820s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 820s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ testname=gnupg 820s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 820s ++ bpd=.. 820s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 820s ++ '[' x '!=' x ']' 820s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s +++ pwd 820s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ t-set-using-tmp 820s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 820s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 820s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 820s ++ export 'DEBFULLNAME=dgit test git user' 820s ++ DEBFULLNAME='dgit test git user' 820s ++ git config --global user.email dgit-test@debian.example.net 820s ++ git config --global user.name 'dgit test git user' 820s ++ git config --global protocol.ext.allow always 820s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 820s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 820s ++ export DEBCHANGE_VENDOR=dpkg 820s ++ DEBCHANGE_VENDOR=dpkg 820s ++ unset VISUAL 820s ++ unset GIT_EDITOR 820s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 820s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 820s ++ cat 820s ++ schroot=build 820s ++ : aq 820s ++ : archive/test-dummy 820s ++ : sid:unstable 820s ++ t-git-config dgit.default.old-dsc-distro test-dummy 820s ++ git config --global dgit.default.old-dsc-distro test-dummy 820s ++ for import in ${autoimport-gnupg} 820s ++ case "$0" in 820s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 820s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 820s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 820s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 820s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 820s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 820s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 820s + setup=' 820s export GNUPGHOME=$tmp/gnupg 820s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 820s 820s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 820s ssb rsa2048 2013-11-17 [E] 820s 820s sec rsa2048 2014-01-26 [SC] 820s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 820s uid [ultimate] Populus Romanus (test key) 820s ssb rsa2048 2014-01-26 [E] 820s 820s sec rsa2048 2014-01-26 [SC] 820s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 820s uid [ unknown] Hannibal (test key) 820s ssb rsa2048 2014-01-26 [E] 820s 821s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 821s export GNUPGHOME=$tmp/gnupg 821s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 821s 821s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 821s delete mode 100644 debian/source/format 821s + git tag v1.0 821s + : 'fake up that our quilt-tip was descended from upstream' 821s + git checkout quilt-tip 821s Switched to branch 'quilt-tip' 821s + git merge --no-edit -s ours upstream 821s Merge made by the 'ours' strategy. 821s + : 'fake up that our quilt-tip had the patch queue in it' 821s + git checkout patch-queue/quilt-tip 821s Switched to branch 'patch-queue/quilt-tip' 821s + gbp pq export 821s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 821s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 821s + git add debian/patches 821s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 821s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 821s 4 files changed, 50 insertions(+) 821s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 821s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 821s create mode 100644 debian/patches/series 821s create mode 100644 debian/patches/subdir/addnewups 821s + : 'make branch names more conventional' 821s + git branch -D master 821s Deleted branch master (was 17d67db). 821s + git branch -m quilt-tip master 821s + not-gdr-processable origin 821s + git branch gdr-unprocessable/origin 821s + t-git-debrebase analyse 821s + local gdr=git-debrebase 821s + : ' 821s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 821s + git-debrebase --dgit=dgit -D analyse 821s + grep 'Unknown Unprocessable' 821s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 821s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 821s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 821s git-debrebase = AddPatches {"Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445"} 821s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 821s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 821s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 821s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Contributor" => {"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","Parents" => [$VAR1->{"Contributor"},{"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]]} 821s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 821s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 821s git-debrebase = Upstream {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","Parents" => [{"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 821s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 821s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 821s git-debrebase = Mixed {"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0,"Differs" => 50}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed"} 821s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 821s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 821s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 821s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 821s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 821s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 821s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 821s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 821s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 821s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 821s git-debrebase ** Unknown 821s git-debrebase *** WALK BOMB unrecognised 821s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 821s ' 821s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 821s + : 'fake up an upstream 2.0' 821s + git branch make-upstream upstream 821s + t-make-new-upstream-tarball 2.0 821s + local uv=2.0 821s + git checkout make-upstream 821s Switched to branch 'make-upstream' 821s + echo 'upstream 2.0' 821s + git commit -a -m 'upstream 2.0 tarball' 821s [make-upstream 4db56a8] upstream 2.0 tarball 821s 1 file changed, 1 insertion(+) 821s + t-make-orig example 2.0 make-upstream 821s + local p=example 821s + local v=2.0 821s + local tag=make-upstream 821s + ust=example_2.0.orig.tar.gz 821s + GZIP=-1 821s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 821s gzip: warning: GZIP environment variable is deprecated; use an alias or script 821s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 821s + git branch -D quilt-tip-2 821s Deleted branch quilt-tip-2 (was 99fcab4). 821s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 821s + git branch -D gitish-only 821s Deleted branch gitish-only (was 2b2ddc8). 821s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 821s + git branch -D quilt-tip-1.1 821s Deleted branch quilt-tip-1.1 (was 7fc34be). 821s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 821s + git branch -D patch-queue/quilt-tip 821s Deleted branch patch-queue/quilt-tip (was d843a68). 821s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 821s + git branch -D indep-arch 821s Deleted branch indep-arch (was e215729). 821s + : 'see what gbp import-orig does' 821s + git checkout master 821s Switched to branch 'master' 821s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 821s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 821s gbp:info: Source package is example 821s gbp:info: Upstream version is 2.0 821s gbp:info: Replacing upstream source on 'master' 821s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 821s + not-gdr-processable merge 821s + git branch gdr-unprocessable/merge 821s + t-git-debrebase analyse 821s + local gdr=git-debrebase 821s + : ' 821s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 821s + git-debrebase --dgit=dgit -D analyse 821s + grep 'Unknown Unprocessable' 821s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 821s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 821s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 821s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 821s git-debrebase ** Unknown 821s git-debrebase *** WALK BOMB unrecognised 821s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 821s ' 821s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 821s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 821s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 821s + DEBEMAIL=dgit-tests@example.org 821s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 821s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 821s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 821s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 821s 1 file changed, 6 insertions(+) 821s + t-dch-commit-r 821s + t-dch-r-rune t-dch-commit 821s + local cmd=t-dch-commit 821s + shift 821s + local suite=unstable 821s + t-dch-commit -r -D unstable '' 821s + t-debchange -r -D unstable '' 821s + DEBEMAIL=dgit-tests@example.org 821s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 821s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 821s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 821s libdistro-info-perl is not installed, Debian release names are not known. 821s libdistro-info-perl is not installed, Ubuntu release names are not known. 821s + git commit -m 'dch -r -D unstable ' debian/changelog 821s [master f31021f] dch -r -D unstable 821s 1 file changed, 3 insertions(+), 2 deletions(-) 821s + echo garbage 821s + git add debian/patches/garbage 821s + git commit -m 'add garbage' debian/patches/garbage 821s [master eb10718] add garbage 821s 1 file changed, 1 insertion(+) 821s create mode 100644 debian/patches/garbage 821s + t-archive-none example 821s + t-select-package example 821s + p=example 821s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 821s + t-archive-none-aq 821s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 821s + : 821s + local 'jsondelim=[' 821s + local suitespec 821s + for suitespec in $suitespecs 821s + local suite=sid 821s + local sname=unstable 821s + t-aq-archive-updated sid example 821s + local suite=sid 821s + local p=example 821s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 821s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 821s + perl -wne ' 821s use JSON; 821s use strict; 821s our @v; 821s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 821s push @v, { 821s "version" => "$1", 821s "sha256sum" => "$2", 821s "component" => "$3", 821s "filename" => "$4", 821s }; 821s END { 821s my $json = JSON->new->canonical(); 821s print $json->encode(\@v) or die $!; 821s } 821s ' 821s + t-aq-archive-updated new example 821s + local suite=new 821s + local p=example 821s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 821s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 821s + perl -wne ' 821s use JSON; 821s use strict; 821s our @v; 821s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 821s push @v, { 821s "version" => "$1", 821s "sha256sum" => "$2", 821s "component" => "$3", 821s "filename" => "$4", 821s }; 821s END { 821s my $json = JSON->new->canonical(); 821s print $json->encode(\@v) or die $!; 821s } 821s ' 821s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 821s + cat 821s + jsondelim=' },' 821s + cat 821s + t-git-none 821s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 821s + set -e 821s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 821s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 821s + t-dgit -wgf --gbp push-source --new 821s + local dgit=dgit 821s + pwd 821s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 821s + : ' 821s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 821s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 822s | git rev-parse --show-toplevel 822s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 822s | git config -z --get-regexp --local '.*' 822s | git config -z --get-regexp --local '.*' 822s | git config -z --get-regexp --global '.*' 822s | git config -z --get-regexp --system '.*' 822s format 3.0 (quilt), quilt mode gbp 822s Format `3.0 (quilt)', need to check/update patch stack 822s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 822s => `' 822s + git diff --quiet HEAD 822s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 822s canonical suite name for unstable is sid 822s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 822s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 822s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 822s | git rev-parse 'HEAD~0' 822s => `eb10718ab213ccfa83613ebbddefbffda941a548' 822s | git symbolic-ref -q HEAD 822s => `refs/heads/master' 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 822s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 822s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 822s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 822s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 822s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e70b02ff8f5313f769b07ee1ea9af66445299f885cca832361a349c69f31600f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 822s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 822s >(no reflog) 822s splitbrain cache miss 822s CD work 822s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 822s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 822s + git checkout -q -b dgit-view 822s examining quilt state (multiple patches, gbp mode) 822s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 822s CD fake 822s | find -name .git -prune -print0 822s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 822s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 822s + git add -Af . 822s | git write-tree 822s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 822s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 822s CD .. 822s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 822s CD ../fake 822s + git add -Af . 822s | git write-tree 822s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 822s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 822s CD ../work 822s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 822s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 822s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 822s => `' 822s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 822s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 822s => `lib.c\x00new-upstream-file\x00src.c\x00' 822s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 822s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 822s => `lib.c\x00new-upstream-file\x00src.c\x00' 822s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 822s differences @dl == ## ## == == ==. 822s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 822s dgit: quilt differences: src: == orig ## gitignores: == orig == 822s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 822s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 822s => `1530000000 +0000' 822s dgit view: creating patches-applied version using gbp pq 822s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 822s + git update-ref refs/heads/dgit-view HEAD 822s + git checkout -q dgit-view 822s | git rev-parse 'HEAD~0' 822s => `45ea71a69fa522ce760afdab8a420200443753e9' 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 822s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 822s => `' 822s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e70b02ff8f5313f769b07ee1ea9af66445299f885cca832361a349c69f31600f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 822s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 822s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 822s | git rev-parse 'HEAD~0' 822s => `eb10718ab213ccfa83613ebbddefbffda941a548' 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 822s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 822s dpkg-source: info: using source format '3.0 (quilt)' 822s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 822s dpkg-source: info: using patch list from debian/patches/series 822s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 822s dpkg-source: info: building example in example_2.0-1.dsc 822s CD work 822s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 822s package seems new, not specifying -v 822s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 822s dpkg-genchanges: info: not including original source code in upload 822s CD .. 822s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 822s renaming (Files) example_2.0.orig.tar.gz 822s renaming (Files) example_2.0-1.debian.tar.xz 822s renaming (dsc) example_2.0-1.dsc 822s renaming (changes) example_2.0-1_source.changes 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 822s actually entering push 822s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 822s => `0' 822s + git config remote.dgit.skipdefaultupdate true 822s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 822s get_archive_dsc: nothing in archive, returning undef 822s no version available from the archive 822s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 822s => `' 822s previous reference hash= 822s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 822s => `' 822s fetch_from_archive: lastfetch= 822s nothing found! 822s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 822s + git check-ref-format archive/test-dummy/2.0-1 822s | git symbolic-ref -q HEAD 822s => `refs/heads/master' 822s | git rev-parse 'HEAD~0' 822s => `eb10718ab213ccfa83613ebbddefbffda941a548' 822s ffq_prev_branchinfo branch current refs/heads/master 822s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 822s => `' 822s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 822s => `' 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 822s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 822s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 822s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 822s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 822s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - e70b02ff8f5313f769b07ee1ea9af66445299f885cca832361a349c69f31600f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 822s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 822s CD work 822s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 822s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 822s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 822s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 822s splitbrain_pseudomerge... 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 822s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 822s => `' 822s + git diff --quiet HEAD 822s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 822s => `' 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 822s checking that example_2.0-1.dsc corresponds to HEAD 822s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 822s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 822s dpkg-source: info: extracting example in example-2.0 822s dpkg-source: info: unpacking example_2.0.orig.tar.gz 822s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 822s dpkg-source: info: using patch list from debian/patches/series 822s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 822s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 822s dpkg-source: info: applying subdir/addnewups 822s CD example-2.0 822s | find -name .git -prune -print0 822s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 822s + git add -Af . 822s | git write-tree 822s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 822s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 822s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 822s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 822s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 822s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 822s files_compare_inputs example_2.0-1.dsc 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 822s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 822s files_compare_inputs example_2.0-1.dsc Files 822s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 822s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 822s files_compare_inputs example_2.0-1_source.changes 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 822s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 822s files_compare_inputs example_2.0-1_source.changes Files 822s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 822s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 822s checking origs needed (2.0)... 822s checking origs needed placement 'devel extra'... 822s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 822s origs example_2.0.orig.tar.gz is_orig 822s -| sh -ec 'cd "$1"; shift 822s 822s find -name "$1" -print0 | 822s xargs -0r sha256sum 822s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 822s origs example_2.0.orig.tar.gz $#$have=-1 822s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 822s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 822s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 822s push_tagwants: $VAR1 = [ 822s '2.0-1', 822s '45ea71a69fa522ce760afdab8a420200443753e9', 822s 'eb10718ab213ccfa83613ebbddefbffda941a548', 822s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 822s ]; 822s $VAR2 = [ 822s { 822s 'TfSuffix' => '', 822s 'View' => 'dgit', 822s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9', 822s 'Tag' => 'archive/test-dummy/2.0-1', 822s 'Tfn' => sub { "DUMMY" }, 822s 'TagFn' => sub { "DUMMY" } 822s }, 822s { 822s 'Tag' => 'test-dummy/2.0-1', 822s 'Tfn' => sub { "DUMMY" }, 822s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 822s 'View' => 'maint', 822s 'TagFn' => sub { "DUMMY" }, 822s 'TfSuffix' => '-maintview' 822s } 822s ]; 822s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 822s => `1530000000 +0000' 822s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 823s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 823s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 823s => `0da596c5de055e5878793603d0d0cecacb18a1ea' 823s + git verify-tag 0da596c5de055e5878793603d0d0cecacb18a1ea 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s gpg: Signature made Mon Mar 31 12:31:57 2025 UTC 823s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 823s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 823s gpg: WARNING: This key is not certified with a trusted signature! 823s gpg: There is no indication that the signature belongs to the owner. 823s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 823s + git update-ref refs/tags/archive/test-dummy/2.0-1 0da596c5de055e5878793603d0d0cecacb18a1ea 823s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 823s => `831449485b56fb5bb05cba99489c8b39790c5f91' 823s + git verify-tag 831449485b56fb5bb05cba99489c8b39790c5f91 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s gpg: Signature made Mon Mar 31 12:31:57 2025 UTC 823s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 823s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 823s gpg: WARNING: This key is not certified with a trusted signature! 823s gpg: There is no indication that the signature belongs to the owner. 823s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 823s + git update-ref refs/tags/test-dummy/2.0-1 831449485b56fb5bb05cba99489c8b39790c5f91 823s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 823s => `0' 823s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 823s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 823s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 823s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 823s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 823s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 823s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 823s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 823s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s 823s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 823s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 823s 823s Successfully signed dsc, changes files 823s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 823s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 823s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 823s D: Setting host argument. 823s Checking signature on .changes 823s Checking signature on .dsc 823s Uploading to test-dummy (via local to localhost): 823s Successfully uploaded packages. 823s dgit ok: pushed and uploaded 2.0-1 823s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 823s del_lrfetchrefs... 823s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 823s ' 823s + t-salsa-add-remote 823s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 823s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 823s + set -e 823s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 823s + git init --bare 823s hint: Using 'master' as the name for the initial branch. This default branch name 823s hint: is subject to change. To configure the initial branch name to use in all 823s hint: of your new repositories, which will suppress this warning, call: 823s hint: 823s hint: git config --global init.defaultBranch 823s hint: 823s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 823s hint: 'development'. The just-created branch can be renamed via this command: 823s hint: 823s hint: git branch -m 823s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 823s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 823s + git push --set-upstream origin master 823s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 823s * [new branch] master -> master 823s Branch 'master' set up to track remote branch 'master' from 'origin'. 823s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 823s + local 'mpat=E:identical in upstream files' 823s + shift 823s + set +o pipefail 823s + LC_MESSAGES=C 823s + LANGUAGE=C 823s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 823s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 823s + local gdr=git-debrebase 823s + : ' 823s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 823s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 823s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 823s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 823s docs/README | 1 + 823s 1 file changed, 1 insertion(+) 823s 823s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 823s git-debrebase: identical in upstream files. See diffstat above, or run 823s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 823s + local 'ps=255 0' 823s + set -o pipefail 823s + case $ps in 823s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 823s + local 'mpat=E:identical in upstream files' 823s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 823s + local grepper=fgrep 823s + case "$mpat" in 823s + case "$mpat" in 823s + grepper=egrep 823s + mpat='identical in upstream files' 823s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 823s git-debrebase: identical in upstream files. See diffstat above, or run 823s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 823s + local 'mpat=E:Unused patch file garbage will be discarded' 823s + shift 823s + set +o pipefail 823s + LC_MESSAGES=C 823s + LANGUAGE=C 823s + t-git-debrebase -fupstream-has-debian convert-from-gbp 823s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 823s + local gdr=git-debrebase 823s + : ' 823s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 823s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 823s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 823s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 823s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 823s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 824s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 824s $VAR2 = bless( do{\(my $o = { 824s 'drop_empty' => 0, 824s 'allow_pgp' => 1, 824s 'is_pgp_signed' => 0, 824s 'name' => 'debian/changelog, entry no.1', 824s 'in_order' => [ 824s 'Source', 824s 'Version', 824s 'Distribution', 824s 'Urgency', 824s 'Maintainer', 824s 'Timestamp', 824s 'Date', 824s 'Changes' 824s ], 824s 'keep_duplicate' => 0, 824s 'out_order' => [], 824s 'fields' => { 824s 'Source' => 'example', 824s 'Version' => '2.0-1', 824s 'Distribution' => 'unstable', 824s 'Urgency' => 'medium', 824s 'Maintainer' => 'dgit test git user ', 824s 'Timestamp' => '1530000000', 824s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 824s 'Changes' => ' 824s example (2.0-1) unstable; urgency=medium 824s 824s [ Ian Jackson ] 824s * new upstream (did gbp import-orig)' 824s }, 824s 'allow_duplicate' => 0 824s })}, 'Dpkg::Control::Hash' ); 824s last finished-looking changelog entry: (2.0-1) unstable 824s will stitch in dgit view, archive/test-dummy/2.0-1 824s git-debrebase: snags: 1 overriden by individual -f options 824s 824s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 824s + local 'ps=255 0' 824s + set -o pipefail 824s + case $ps in 824s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 824s + local 'mpat=E:Unused patch file garbage will be discarded' 824s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 824s + local grepper=fgrep 824s + case "$mpat" in 824s + case "$mpat" in 824s + grepper=egrep 824s + mpat='Unused patch file garbage will be discarded' 824s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 824s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 824s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 824s + local gdr=git-debrebase 824s + : ' 824s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 824s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 824s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 824s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 824s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 824s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 824s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 824s $VAR2 = bless( do{\(my $o = { 824s 'allow_pgp' => 1, 824s 'in_order' => [ 824s 'Source', 824s 'Version', 824s 'Distribution', 824s 'Urgency', 824s 'Maintainer', 824s 'Timestamp', 824s 'Date', 824s 'Changes' 824s ], 824s 'drop_empty' => 0, 824s 'allow_duplicate' => 0, 824s 'fields' => { 824s 'Source' => 'example', 824s 'Version' => '2.0-1', 824s 'Distribution' => 'unstable', 824s 'Urgency' => 'medium', 824s 'Maintainer' => 'dgit test git user ', 824s 'Timestamp' => '1530000000', 824s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 824s 'Changes' => ' 824s example (2.0-1) unstable; urgency=medium 824s 824s [ Ian Jackson ] 824s * new upstream (did gbp import-orig)' 824s }, 824s 'keep_duplicate' => 0, 824s 'name' => 'debian/changelog, entry no.1', 824s 'is_pgp_signed' => 0, 824s 'out_order' => [] 824s })}, 'Dpkg::Control::Hash' ); 824s last finished-looking changelog entry: (2.0-1) unstable 824s will stitch in dgit view, archive/test-dummy/2.0-1 824s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 824s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 824s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 824s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 824s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 824s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 824s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 824s git-debrebase ffq check_specs * 824s git-debrebase ffq merge master 824s git-debrebase ffq check_remote origin remote fetch/merge branch 824s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 824s OK, you are ahead of refs/remotes/origin/master 824s git-debrebase ffq check_remote undef remote push branch 824s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 824s OK, you are ahead of refs/remotes/dgit/dgit/sid 824s git-debrebase: snags: 2 overriden by individual -f options 824s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 824s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 824s git-debrebase >$ 824s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 824s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 824s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 824s ' 824s + git branch converted-from-gbp 824s + v=2.0-2 824s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 824s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 824s + DEBEMAIL=dgit-tests@example.org 824s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 824s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 824s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 824s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 824s 1 file changed, 6 insertions(+) 824s + t-dch-commit-r 824s + t-dch-r-rune t-dch-commit 824s + local cmd=t-dch-commit 824s + shift 824s + local suite=unstable 824s + t-dch-commit -r -D unstable '' 824s + t-debchange -r -D unstable '' 824s + DEBEMAIL=dgit-tests@example.org 824s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 824s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 824s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 824s libdistro-info-perl is not installed, Debian release names are not known. 824s libdistro-info-perl is not installed, Ubuntu release names are not known. 824s + git commit -m 'dch -r -D unstable ' debian/changelog 824s [master 4af0243] dch -r -D unstable 824s 1 file changed, 1 insertion(+), 1 deletion(-) 824s + t-dgit -wgf push-source --new 824s + local dgit=dgit 824s + pwd 824s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 824s + : ' 824s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 824s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 824s | git rev-parse --show-toplevel 824s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 824s | git config -z --get-regexp --local '.*' 824s | git config -z --get-regexp --local '.*' 824s | git config -z --get-regexp --global '.*' 824s | git config -z --get-regexp --system '.*' 824s format 3.0 (quilt), quilt mode linear 824s Format `3.0 (quilt)', need to check/update patch stack 824s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 824s => `' 824s + git diff --quiet HEAD 824s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 824s canonical suite name for unstable is sid 824s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 824s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 824s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 824s | git rev-parse 'HEAD~0' 824s => `4af0243f9227b0d695fbff38df345aca23969e2e' 824s | git symbolic-ref -q HEAD 824s => `refs/heads/master' 824s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 824s CD work 824s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 824s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 824s examining quilt state (multiple patches, linear mode) 824s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 824s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 824s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 824s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 825s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 825s | git rev-parse 'HEAD~0' 825s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 825s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 825s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 825s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 825s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 825s CD fake 825s | find -name .git -prune -print0 825s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 825s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 825s + git add -Af . 825s | git write-tree 825s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 825s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 825s CD .. 825s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s CD ../fake 825s + git add -Af . 825s | git write-tree 825s => `607612c46d7ea5b66697b830f1a50f069061d460' 825s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 825s CD ../work 825s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 825s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 825s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 825s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 825s => `' 825s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 825s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 825s => `lib.c\x00new-upstream-file\x00src.c\x00' 825s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 825s differences @dl ## ## == == == ==. 825s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 825s dgit: quilt differences: src: ## orig ## gitignores: == orig == 825s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 825s starting quiltify (multiple patches, linear mode) 825s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 825s => `debian/control'... 825s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 825s => `' 825s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 825s search finished hooray! 825s quiltify linearisation planning successful, executing... 825s + git checkout -q master 825s | git status --ignored --porcelain 825s => `?? .pc/' 825s nothing quilty to commit, ok. 825s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 825s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 825s | git rev-parse 'HEAD~0' 825s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 825s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 825s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 825s CD work 825s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 825s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s CD .. 825s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 825s dpkg-source: info: using source format '3.0 (quilt)' 825s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 825s dpkg-source: info: using patch list from debian/patches/series 825s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 825s dpkg-source: info: building example in example_2.0-2.dsc 825s CD work 825s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 825s package seems new, not specifying -v 825s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 825s dpkg-genchanges: info: not including original source code in upload 825s CD .. 825s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 825s renaming (Files) example_2.0.orig.tar.gz 825s renaming (Files) example_2.0-2.debian.tar.xz 825s renaming (dsc) example_2.0-2.dsc 825s renaming (changes) example_2.0-2_source.changes 825s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 825s actually entering push 825s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 825s => `1' 825s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 825s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 825s git_lrfetch_sane iteration 0 825s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 825s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 825s => 0da596c5de055e5878793603d0d0cecacb18a1ea refs/tags/archive/test-dummy/2.0-1 825s => 831449485b56fb5bb05cba99489c8b39790c5f91 refs/tags/test-dummy/2.0-1 825s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 825s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 825s | git for-each-ref refs/dgit-fetch/test-dummy 825s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 825s |> 0da596c5de055e5878793603d0d0cecacb18a1ea tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 825s |> 831449485b56fb5bb05cba99489c8b39790c5f91 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 825s git_lrfetch_sane: tidying any old suite lrfetchrefs 825s | git for-each-ref refs/dgit-fetch/sid 825s git_lrfetch_sane: git fetch --no-insane emulation complete 825s $VAR1 = { 825s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 825s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => '831449485b56fb5bb05cba99489c8b39790c5f91', 825s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '0da596c5de055e5878793603d0d0cecacb18a1ea' 825s }; 825s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 825s |> 0da596c5de055e5878793603d0d0cecacb18a1ea tag refs/tags/archive/test-dummy/2.0-1 825s currently refs/tags/archive/test-dummy/2.0-1=0da596c5de055e5878793603d0d0cecacb18a1ea 825s |> 831449485b56fb5bb05cba99489c8b39790c5f91 tag refs/tags/test-dummy/2.0-1 825s currently refs/tags/test-dummy/2.0-1=831449485b56fb5bb05cba99489c8b39790c5f91 825s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 825s |> 0da596c5de055e5878793603d0d0cecacb18a1ea tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 825s offered refs/tags/archive/test-dummy/2.0-1=0da596c5de055e5878793603d0d0cecacb18a1ea 825s |> 831449485b56fb5bb05cba99489c8b39790c5f91 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 825s offered refs/tags/test-dummy/2.0-1=831449485b56fb5bb05cba99489c8b39790c5f91 825s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 825s get_archive_dsc: nothing in archive, returning undef 825s no version available from the archive 825s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 825s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 825s 825s Package not found in the archive, but has allegedly been pushed using dgit. 825s Perhaps the upload is stuck in incoming. Using the version from git. 825s 825s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s fetch mergeinfos: 825s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 825s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 825s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 825s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 825s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 825s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 825s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 825s + git check-ref-format archive/test-dummy/2.0-2 825s | git symbolic-ref -q HEAD 825s => `refs/heads/master' 825s | git rev-parse 'HEAD~0' 825s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 825s ffq_prev_branchinfo branch current refs/heads/master 825s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 825s => `' 825s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 825s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 825s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 825s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 825s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 825s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 825s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 825s | git status --ignored --porcelain 825s => `' 825s nothing quilty to commit, ok. 825s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 825s => `' 825s + git diff --quiet HEAD 825s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 825s => `45ea71a69fa522ce760afdab8a420200443753e9' 825s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 825s => `' 825s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 825s checking that example_2.0-2.dsc corresponds to HEAD 825s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 825s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 825s dpkg-source: info: extracting example in example-2.0 825s dpkg-source: info: unpacking example_2.0.orig.tar.gz 825s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 825s dpkg-source: info: using patch list from debian/patches/series 825s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 825s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 825s dpkg-source: info: applying subdir/addnewups 825s CD example-2.0 825s | find -name .git -prune -print0 825s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 825s + git add -Af . 825s | git write-tree 825s => `607612c46d7ea5b66697b830f1a50f069061d460' 825s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 825s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 825s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 825s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 825s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 825s files_compare_inputs example_2.0-2.dsc 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 825s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 825s files_compare_inputs example_2.0-2.dsc Files 825s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 825s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 825s files_compare_inputs example_2.0-2_source.changes 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 825s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 825s files_compare_inputs example_2.0-2_source.changes Files 825s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 825s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 825s checking origs needed (2.0)... 825s checking origs needed placement 'devel extra'... 825s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 825s origs example_2.0.orig.tar.gz is_orig 825s -| sh -ec 'cd "$1"; shift 825s 825s find -name "$1" -print0 | 825s xargs -0r sha256sum 825s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 825s origs example_2.0.orig.tar.gz $#$have=-1 825s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 825s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 825s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 825s push_tagwants: $VAR1 = [ 825s '2.0-2', 825s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 825s undef, 825s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 825s ]; 825s $VAR2 = [ 825s { 825s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 825s 'Tfn' => sub { "DUMMY" }, 825s 'TagFn' => sub { "DUMMY" }, 825s 'TfSuffix' => '', 825s 'View' => 'dgit', 825s 'Tag' => 'archive/test-dummy/2.0-2' 825s }, 825s { 825s 'TagFn' => sub { "DUMMY" }, 825s 'TfSuffix' => '-dgit', 825s 'View' => 'dgit', 825s 'Tag' => 'test-dummy/2.0-2', 825s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 825s 'Tfn' => sub { "DUMMY" } 825s } 825s ]; 825s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 825s => `1530000000 +0000' 825s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 825s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 826s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 826s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 826s => `b3a26bb96d3b6e609880c13b509239525603746e' 826s + git verify-tag b3a26bb96d3b6e609880c13b509239525603746e 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s gpg: Signature made Mon Mar 31 12:31:59 2025 UTC 826s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 826s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 826s gpg: WARNING: This key is not certified with a trusted signature! 826s gpg: There is no indication that the signature belongs to the owner. 826s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 826s + git update-ref refs/tags/archive/test-dummy/2.0-2 b3a26bb96d3b6e609880c13b509239525603746e 826s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 826s => `3fa7d2e1319ecbb071f7102a8527bf161712b96e' 826s + git verify-tag 3fa7d2e1319ecbb071f7102a8527bf161712b96e 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s gpg: Signature made Mon Mar 31 12:32:00 2025 UTC 826s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 826s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 826s gpg: WARNING: This key is not certified with a trusted signature! 826s gpg: There is no indication that the signature belongs to the owner. 826s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 826s + git update-ref refs/tags/test-dummy/2.0-2 3fa7d2e1319ecbb071f7102a8527bf161712b96e 826s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 826s => `1' 826s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 826s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 826s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 826s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 826s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 826s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 826s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 826s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s 826s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 826s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 826s 826s Successfully signed dsc, changes files 826s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 826s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 826s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 826s D: Setting host argument. 826s Checking signature on .changes 826s Checking signature on .dsc 826s Package includes an .orig.tar.gz file although the debian revision suggests 826s that it might not be required. Multiple uploads of the .orig.tar.gz may be 826s rejected by the upload queue management software. 826s Uploading to test-dummy (via local to localhost): 826s Successfully uploaded packages. 826s dgit ok: pushed and uploaded 2.0-2 826s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 826s del_lrfetchrefs... 826s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 826s del_lrfetchrefs: 0da596c5de055e5878793603d0d0cecacb18a1ea refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 826s del_lrfetchrefs: 831449485b56fb5bb05cba99489c8b39790c5f91 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 826s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 826s ' 826s + git push 826s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 826s eb10718..6b22dd5 master -> master 826s + cd .. 826s + t-archive-process-incoming sid 826s + local suite=sid 826s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 826s + t-archive-query sid 826s + local suite=sid 826s + local dscf=main/example_2.0-2.dsc 826s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 826s + local suite=sid 826s + local p=example 826s + local v=2.0-2 826s + local dscf=main/example_2.0-2.dsc 826s + local sha 826s ++ sha256sum 826s + sha='0c6e2a01a9611bb564d00c3adecb502088346fe69b99005662bc82f5995c96f0 -' 826s + echo '2.0-2 0c6e2a01a9611bb564d00c3adecb502088346fe69b99005662bc82f5995c96f0 main/example_2.0-2.dsc' 826s + t-aq-archive-updated sid example 826s + local suite=sid 826s + local p=example 826s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 826s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 826s + perl -wne ' 826s use JSON; 826s use strict; 826s our @v; 826s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 826s push @v, { 826s "version" => "$1", 826s "sha256sum" => "$2", 826s "component" => "$3", 826s "filename" => "$4", 826s }; 826s END { 826s my $json = JSON->new->canonical(); 826s print $json->encode(\@v) or die $!; 826s } 826s ' 826s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 826s ++ echo git mirror aq 826s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 826s . $troot/lib-gdr 826s t-tstunt-parsechangelog 826s p=example 826s t-git-next-date 826s ' 826s + local savevars= 826s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 826s + local 'importeval= 826s . $troot/lib-gdr 826s t-tstunt-parsechangelog 826s p=example 826s t-git-next-date 826s ' 826s + local import=IMPORT.gdr-convert-gbp 826s + exec 826s + local vn 826s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 826s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 826s print STDERR "saving-exporting $vn\n"; 826s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 826s or die $!; 826s } 826s ' 826s saving-exporting DGIT_TEST_REAL_DEBCHANGE 826s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 826s saving-exporting DGIT_TEST_REAL_GPG_AGENT 826s saving-exporting DGIT_TEST_REAL_GPG 826s + set -e 826s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 826s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 826s + printf '\n%s\n' ' 826s . $troot/lib-gdr 826s t-tstunt-parsechangelog 826s p=example 826s t-git-next-date 826s ' 826s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 826s + rc=0 826s + set +x 826s + set +e 826s + pwd 826s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 826s + '[' x '!=' x ']' 826s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 826s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 826s + set -e 826s + test 0 = 0 826s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 826s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 826s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 826s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 826s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 826s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 826s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 826s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 826s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 826s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 826s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 826s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 826s +++ : -D 826s +++ export GDR_TEST_DEBUG 826s +++ t-tstunt debchange 826s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s +++ local var=PATH 826s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s +++ eval ' 826s case "$PATH" in 826s "$tstunt:"*) ;; 826s *":$tstunt:"*) ;; 826s "") PATH="$tstunt" ;; 826s *) PATH="$tstunt:$PATH" ;; 826s esac 826s export PATH 826s ' 826s ++++ case "$PATH" in 826s ++++ export PATH 826s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s +++ local var=PERLLIB 826s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s +++ eval ' 826s case "$PERLLIB" in 826s "$tstunt:"*) ;; 826s *":$tstunt:"*) ;; 826s "") PERLLIB="$tstunt" ;; 826s *) PERLLIB="$tstunt:$PERLLIB" ;; 826s esac 826s export PERLLIB 826s ' 826s ++++ case "$PERLLIB" in 826s ++++ export PERLLIB 826s +++ local f 826s +++ for f in "$@" 826s +++ t-tstunt--save-real debchange 826s +++ local f=debchange 826s +++ case "$f" in 826s +++ local rc 826s +++ local real 826s +++ set +e 826s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 826s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 826s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s ++++ type -p debchange 826s +++ real=/usr/bin/debchange 826s +++ rc=0 826s +++ set -e 826s +++ case $rc in 826s +++ local varname=debchange 826s +++ varname=DGIT_TEST_REAL_DEBCHANGE 826s +++ eval ' 826s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 826s export DGIT_TEST_REAL_DEBCHANGE 826s ' 826s ++++ : /usr/bin/debchange 826s ++++ export DGIT_TEST_REAL_DEBCHANGE 826s +++ f=./debchange 826s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 826s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 826s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 826s ++ t-tstunt-parsechangelog 826s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 826s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s ++ local var=PATH 826s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s ++ eval ' 826s case "$PATH" in 826s "$tstunt:"*) ;; 826s *":$tstunt:"*) ;; 826s "") PATH="$tstunt" ;; 826s *) PATH="$tstunt:$PATH" ;; 826s esac 826s export PATH 826s ' 826s +++ case "$PATH" in 826s +++ export PATH 826s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s ++ local var=PERLLIB 826s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 826s ++ eval ' 826s case "$PERLLIB" in 826s "$tstunt:"*) ;; 826s *":$tstunt:"*) ;; 826s "") PERLLIB="$tstunt" ;; 826s *) PERLLIB="$tstunt:$PERLLIB" ;; 826s esac 826s export PERLLIB 826s ' 826s +++ case "$PERLLIB" in 826s +++ export PERLLIB 826s ++ local f 826s ++ for f in "$@" 826s ++ t-tstunt--save-real dpkg-parsechangelog 826s ++ local f=dpkg-parsechangelog 826s ++ case "$f" in 826s ++ local rc 826s ++ local real 826s ++ set +e 826s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 826s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 826s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 826s +++ type -p dpkg-parsechangelog 826s ++ real=/usr/bin/dpkg-parsechangelog 826s ++ rc=0 826s ++ set -e 826s ++ case $rc in 826s ++ local varname=dpkg_parsechangelog 826s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 826s ++ eval ' 826s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 826s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 826s ' 826s +++ : /usr/bin/dpkg-parsechangelog 826s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 826s ++ f=./dpkg-parsechangelog 826s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 826s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 826s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 826s ++ for f in "$@" 826s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 826s ++ local f=Dpkg/Changelog/Parse.pm 826s ++ case "$f" in 826s ++ return 826s ++ f=./Dpkg/Changelog/Parse.pm 826s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 826s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 826s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 826s ++ p=example 826s ++ t-git-next-date 826s ++ GIT_COMMITTER_DATE='1530000001 +0100' 826s ++ GIT_AUTHOR_DATE='1530000001 +0100' 826s + cd example 826s + t-dgit setup-mergechangelogs 826s + local dgit=dgit 826s + pwd 826s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 826s + : ' 826s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 826s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-mergechangelogs 826s | git rev-parse --show-toplevel 826s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 826s | git config -z --get-regexp --local '.*' 826s | git config -z --get-regexp --local '.*' 826s | git config -z --get-regexp --global '.*' 826s | git config -z --get-regexp --system '.*' 826s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 826s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 826s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 826s ' 826s + mfmt='found unprocessable commit.*%s' 826s + subcmd 826s + cmd=("$@") 826s + branch merge 'general two-parent merge' 826s + branch=merge 826s + git checkout gdr-unprocessable/merge 826s Switched to branch 'gdr-unprocessable/merge' 826s + msgcore='general two-parent merge' 826s + expected- 826s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 826s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 826s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 826s + shift 826s + set +o pipefail 826s + LC_MESSAGES=C 826s + LANGUAGE=C 826s + cmd 826s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 826s + t-git-debrebase 826s + local gdr=git-debrebase 826s + : ' 826s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 826s + git-debrebase --dgit=dgit -D 826s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 827s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 827s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 827s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*general two-parent merge' 827s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s + branch origin 'origin commit' 827s + branch=origin 827s + git checkout gdr-unprocessable/origin 827s Switched to branch 'gdr-unprocessable/origin' 827s + msgcore='origin commit' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'origin commit' 827s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 827s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 827s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 827s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches"} 827s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 827s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 827s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 827s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Contributor" => {"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [$VAR1->{"Contributor"},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1,"Differs" => 48}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Overwritten" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 827s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 827s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 827s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Msg" => "Add *.o to .gitignore\n"} 827s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 827s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 827s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "Mixed"} 827s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 827s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 827s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging"} 827s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 827s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 827s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Parents" => [{"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0,"Differs" => 32}],"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 827s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 827s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 827s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Msg" => "WIP\n"} 827s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*origin commit' 827s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s + subcmd quick 827s + cmd=("$@") 827s + branch merge 'general two-parent merge' 827s + branch=merge 827s + git checkout gdr-unprocessable/merge 827s Switched to branch 'gdr-unprocessable/merge' 827s + msgcore='general two-parent merge' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 827s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase quick 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D quick 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 827s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 827s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 827s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*general two-parent merge' 827s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s + branch origin 'origin commit' 827s + branch=origin 827s + git checkout gdr-unprocessable/origin 827s Switched to branch 'gdr-unprocessable/origin' 827s + msgcore='origin commit' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'origin commit' 827s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase quick 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D quick 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 827s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 827s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 827s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 827s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 827s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 827s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 827s git-debrebase = Pseudomerge {"Overwritten" => [{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Type" => "Pseudomerge","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 827s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 827s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 827s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Type" => "Upstream"} 827s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 827s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 827s git-debrebase = Mixed {"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Type" => "Mixed","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n"} 827s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 827s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 827s git-debrebase = Packaging {"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n"} 827s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 827s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 827s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 827s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 827s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 827s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 827s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*origin commit' 827s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s + subcmd new-upstream 2.0 upstream/2.0 827s + cmd=("$@") 827s + branch merge 'general two-parent merge' 827s + branch=merge 827s + git checkout gdr-unprocessable/merge 827s Switched to branch 'gdr-unprocessable/merge' 827s + msgcore='general two-parent merge' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 827s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase new-upstream 2.0 upstream/2.0 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D new-upstream 2.0 upstream/2.0 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 0 - 827s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 827s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 827s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*general two-parent merge' 827s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; general two-parent merge: (commit de5adc8d36110abf62d562d9a1985a4796748ece) (d.0x2 0x34) 827s + branch origin 'origin commit' 827s + branch=origin 827s + git checkout gdr-unprocessable/origin 827s Switched to branch 'gdr-unprocessable/origin' 827s + msgcore='origin commit' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'origin commit' 827s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase new-upstream 2.0 upstream/2.0 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D new-upstream 2.0 upstream/2.0 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s git-debrebase ffq check_specs * 827s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 827s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 827s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 827s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4,"Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 827s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 827s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 827s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 827s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 827s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 827s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 827s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n"} 827s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 827s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 827s git-debrebase = Mixed {"Type" => "Mixed","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 827s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 827s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 827s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 827s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 827s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 827s git-debrebase = Packaging {"Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 827s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 827s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 827s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Msg" => "WIP\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging"} 827s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 827s git-debrebase ** Unknown 827s git-debrebase *** WALK BOMB unrecognised 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*origin commit' 827s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 827s + subcmd make-patches 827s + cmd=("$@") 827s + branch merge 'general two-parent merge' 827s + branch=merge 827s + git checkout gdr-unprocessable/merge 827s Switched to branch 'gdr-unprocessable/merge' 827s + msgcore='general two-parent merge' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 827s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase make-patches 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D make-patches 827s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 827s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 827s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 827s git-debrebase ** Unknown 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 827s 827s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*general two-parent merge' 827s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 827s + branch origin 'origin commit' 827s + branch=origin 827s + git checkout gdr-unprocessable/origin 827s Switched to branch 'gdr-unprocessable/origin' 827s + msgcore='origin commit' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'origin commit' 827s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase make-patches 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D make-patches 827s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 827s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 827s git-debrebase = AddPatches {"Type" => "AddPatches","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4,"Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 827s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 827s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 827s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 827s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Type" => "Pseudomerge","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 827s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 827s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 827s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n"} 827s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 827s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 827s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"Type" => "Mixed","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 827s git-debrebase: snag detected (-funclean-mixed): found mixed upstream/packaging commit (ccfa28ce24478c3336e77e709106a16a158ac7eb) 827s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 827s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 827s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging"} 827s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 827s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 827s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 827s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 827s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 827s git-debrebase = Packaging {"Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32}],"Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 827s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 827s git-debrebase ** Unknown 827s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 827s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 827s 827s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 827s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 827s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 827s + local 'ps=255 0' 827s + set -o pipefail 827s + case $ps in 827s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local 'mpat=E:found unprocessable commit.*origin commit' 827s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + local grepper=fgrep 827s + case "$mpat" in 827s + case "$mpat" in 827s + grepper=egrep 827s + mpat='found unprocessable commit.*origin commit' 827s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 827s + subcmd breakwater 827s + cmd=("$@") 827s + branch merge 'general two-parent merge' 827s + branch=merge 827s + git checkout gdr-unprocessable/merge 827s Switched to branch 'gdr-unprocessable/merge' 827s + msgcore='general two-parent merge' 827s + expected- 827s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 827s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 827s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 827s + shift 827s + set +o pipefail 827s + LC_MESSAGES=C 827s + LANGUAGE=C 827s + cmd 827s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 827s + t-git-debrebase breakwater 827s + local gdr=git-debrebase 827s + : ' 827s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 827s + git-debrebase --dgit=dgit -D breakwater 828s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 828s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 828s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 828s git-debrebase ** Unknown 828s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 828s 828s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 828s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 828s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 828s + local 'ps=255 0' 828s + set -o pipefail 828s + case $ps in 828s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 828s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local grepper=fgrep 828s + case "$mpat" in 828s + case "$mpat" in 828s + grepper=egrep 828s + mpat='found unprocessable commit.*general two-parent merge' 828s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 828s + branch origin 'origin commit' 828s + branch=origin 828s + git checkout gdr-unprocessable/origin 828s Switched to branch 'gdr-unprocessable/origin' 828s + msgcore='origin commit' 828s + expected- 828s ++ printf 'found unprocessable commit.*%s' 'origin commit' 828s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 828s + local 'mpat=E:found unprocessable commit.*origin commit' 828s + shift 828s + set +o pipefail 828s + LC_MESSAGES=C 828s + LANGUAGE=C 828s + cmd 828s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + t-git-debrebase breakwater 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D breakwater 828s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 828s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 828s git-debrebase = AddPatches {"Parents" => [{"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Type" => "AddPatches"} 828s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 828s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 828s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 828s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0],"Msg" => "Merge branch 'upstream' into quilt-tip\n"} 828s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 828s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 828s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 828s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 828s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 828s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Type" => "Mixed","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 828s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 828s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 828s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n"} 828s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 828s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 828s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Type" => "Packaging"} 828s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 828s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 828s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 828s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 828s git-debrebase ** Unknown 828s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 828s 828s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 828s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 828s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 828s + local 'ps=255 0' 828s + set -o pipefail 828s + case $ps in 828s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local 'mpat=E:found unprocessable commit.*origin commit' 828s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local grepper=fgrep 828s + case "$mpat" in 828s + case "$mpat" in 828s + grepper=egrep 828s + mpat='found unprocessable commit.*origin commit' 828s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 828s + subcmd anchor 828s + cmd=("$@") 828s + branch merge 'general two-parent merge' 828s + branch=merge 828s + git checkout gdr-unprocessable/merge 828s Switched to branch 'gdr-unprocessable/merge' 828s + msgcore='general two-parent merge' 828s + expected- 828s ++ printf 'found unprocessable commit.*%s' 'general two-parent merge' 828s + t-expect-fail 'E:found unprocessable commit.*general two-parent merge' cmd 828s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 828s + shift 828s + set +o pipefail 828s + LC_MESSAGES=C 828s + LANGUAGE=C 828s + cmd 828s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + t-git-debrebase anchor 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D anchor 828s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 828s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 828s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 828s git-debrebase ** Unknown 828s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 828s 828s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 828s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 828s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 828s + local 'ps=255 0' 828s + set -o pipefail 828s + case $ps in 828s + t-grep-mpat 'E:found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local 'mpat=E:found unprocessable commit.*general two-parent merge' 828s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local grepper=fgrep 828s + case "$mpat" in 828s + case "$mpat" in 828s + grepper=egrep 828s + mpat='found unprocessable commit.*general two-parent merge' 828s + egrep -e 'found unprocessable commit.*general two-parent merge' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (de5adc8d36110abf62d562d9a1985a4796748ece) 828s + branch origin 'origin commit' 828s + branch=origin 828s + git checkout gdr-unprocessable/origin 828s Switched to branch 'gdr-unprocessable/origin' 828s + msgcore='origin commit' 828s + expected- 828s ++ printf 'found unprocessable commit.*%s' 'origin commit' 828s + t-expect-fail 'E:found unprocessable commit.*origin commit' cmd 828s + local 'mpat=E:found unprocessable commit.*origin commit' 828s + shift 828s + set +o pipefail 828s + LC_MESSAGES=C 828s + LANGUAGE=C 828s + cmd 828s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + t-git-debrebase anchor 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D anchor 828s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 828s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 828s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}],"Type" => "AddPatches","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 828s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 828s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 828s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 828s git-debrebase = Pseudomerge {"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Merge branch 'upstream' into quilt-tip\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => $VAR1->{"Parents"}[0]} 828s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 828s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 828s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}]} 828s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 828s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 828s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Parents" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n"} 828s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 828s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 828s git-debrebase = Packaging {"Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}]} 828s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 828s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 828s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Msg" => "WIP\n"} 828s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 828s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 828s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 828s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 828s git-debrebase ** Unknown 828s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 828s 828s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 828s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 828s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 828s + local 'ps=255 0' 828s + set -o pipefail 828s + case $ps in 828s + t-grep-mpat 'E:found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local 'mpat=E:found unprocessable commit.*origin commit' 828s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s + local grepper=fgrep 828s + case "$mpat" in 828s + case "$mpat" in 828s + grepper=egrep 828s + mpat='found unprocessable commit.*origin commit' 828s + egrep -e 'found unprocessable commit.*origin commit' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 828s git-debrebase: error: found unprocessable commit, cannot cope: origin commit (2767dfd053a8a3be1e7df2406b5a68ad913a661d) 828s + expected=ok 828s + mfmts=(' Unprocessable (%s)') 828s + subcmd analyse 828s + cmd=("$@") 828s + branch merge 'general two-parent merge' 828s + branch=merge 828s + git checkout gdr-unprocessable/merge 828s Switched to branch 'gdr-unprocessable/merge' 828s + msgcore='general two-parent merge' 828s + expected-ok 828s + f=../out.merge.analyse 828s + cmd 828s + t-git-debrebase analyse 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D analyse 828s + tee ../out.merge.analyse 828s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 828s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 828s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 828s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 828s git-debrebase ** Unknown 828s git-debrebase *** WALK BOMB unrecognised 828s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 828s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 828s ' 828s + for mfmt in "${mfmts[@]}" 828s ++ printf ' Unprocessable (%s)' 'general two-parent merge' 828s + grep ' Unprocessable (general two-parent merge)' ../out.merge.analyse 828s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 828s + branch origin 'origin commit' 828s + branch=origin 828s + git checkout gdr-unprocessable/origin 828s Switched to branch 'gdr-unprocessable/origin' 828s + msgcore='origin commit' 828s + expected-ok 828s + f=../out.origin.analyse 828s + cmd 828s + t-git-debrebase analyse 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D analyse 828s + tee ../out.origin.analyse 828s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 828s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 828s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 828s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}],"Type" => "AddPatches"} 828s 3bc5395fa4571258183be3d3f389950314c53d4e AddPatchesgit-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 828s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 828s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 828s git-debrebase = Pseudomerge {"Contributor" => {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0,"Differs" => 0},"Msg" => "Merge branch 'upstream' into quilt-tip\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [$VAR1->{"Contributor"},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Ix" => 1,"Differs" => 48}],"Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 828s 828s 901ede7c64dd2ca1f1375724351a1aed46807f79 Pseudomerge Contributor=1986506b09aedf1864a4e3228284a58c3db6ac7agit-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 828s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 828s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Msg" => "Add *.o to .gitignore\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 828s 828s 1986506b09aedf1864a4e3228284a58c3db6ac7a Upstreamgit-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 828s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 828s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "Mixed","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0,"Differs" => 50}],"Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n"} 828s 828s ccfa28ce24478c3336e77e709106a16a158ac7eb Mixedgit-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 828s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 828s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Msg" => "echo EXAMPLE RULES TARGET\n"} 828s 828s 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 Packaginggit-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 828s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 828s git-debrebase = Packaging {"Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 828s 828s a26f8e83ba01707d830f942dc143a46140a87643 Packaginggit-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 828s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 828s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n"} 828s 828s 4d8f0e7980e2454b960fbd44cf76d11996098caa Packaginggit-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 828s git-debrebase ** Unknown 828s git-debrebase *** WALK BOMB unrecognised 828s 828s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 828s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 828s ' 828s + for mfmt in "${mfmts[@]}" 828s ++ printf ' Unprocessable (%s)' 'origin commit' 828s + grep ' Unprocessable (origin commit)' ../out.origin.analyse 828s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 828s + mfmts=('branch not in git-debrebase form' 'found unprocessable commit, cannot cope: %s') 828s + subcmd status 828s + cmd=("$@") 828s + branch merge 'general two-parent merge' 828s + branch=merge 828s + git checkout gdr-unprocessable/merge 828s Switched to branch 'gdr-unprocessable/merge' 828s + msgcore='general two-parent merge' 828s + expected-ok 828s + f=../out.merge.status 828s + cmd 828s + t-git-debrebase status 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D status 828s + tee ../out.merge.status 828s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 828s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 828s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 828s git-debrebase ** Unknown 828s current branch contents, in git-debrebase terms: 828s branch not in git-debrebase form 828s found unprocessable commit, cannot cope: general two-parent merge 828s de5adc8 Update upstream source from tag 'upstream/2.0' 828s key git-debrebase commits: 828s anchor is not well-defined 828s breakwater is not well-defined 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/merge 828s branch and ref status, in git-debrebase terms: 828s stitched? (no record of git-debrebase work) 828s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 828s ' 828s + for mfmt in "${mfmts[@]}" 828s ++ printf 'branch not in git-debrebase form' 'general two-parent merge' 828s + grep 'branch not in git-debrebase form' ../out.merge.status 828s branch not in git-debrebase form 828s + for mfmt in "${mfmts[@]}" 828s ++ printf 'found unprocessable commit, cannot cope: %s' 'general two-parent merge' 828s + grep 'found unprocessable commit, cannot cope: general two-parent merge' ../out.merge.status 828s found unprocessable commit, cannot cope: general two-parent merge 828s + branch origin 'origin commit' 828s + branch=origin 828s + git checkout gdr-unprocessable/origin 828s Switched to branch 'gdr-unprocessable/origin' 828s + msgcore='origin commit' 828s + expected-ok 828s + f=../out.origin.status 828s + cmd 828s + t-git-debrebase status 828s + local gdr=git-debrebase 828s + : ' 828s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 828s + git-debrebase --dgit=dgit -D status 828s + tee ../out.origin.status 828s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 828s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 828s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4,"Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 828s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 828s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 828s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 828s git-debrebase = Pseudomerge {"Overwritten" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Type" => "Pseudomerge","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => {"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Ix" => 0},"Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 828s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 828s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 828s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n"} 828s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 828s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 828s git-debrebase = Mixed {"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}],"Type" => "Mixed","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n"} 828s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 828s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 828s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Msg" => "echo EXAMPLE RULES TARGET\n"} 828s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 828s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 828s git-debrebase = Packaging {"Msg" => "WIP\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Type" => "Packaging"} 828s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 828s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 828s git-debrebase = Packaging {"Msg" => "WIP\n","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging"} 828s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 828s git-debrebase ** Unknown 828s current branch contents, in git-debrebase terms: 828s branch not in git-debrebase form 828s found unprocessable commit, cannot cope: origin commit 828s 2767dfd WIP 828s key git-debrebase commits: 828s anchor is not well-defined 828s breakwater is not well-defined 828s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 828s branch and ref status, in git-debrebase terms: 828s stitched? (no record of git-debrebase work) 828s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 828s ' 828s + for mfmt in "${mfmts[@]}" 828s ++ printf 'branch not in git-debrebase form' 'origin commit' 828s + grep 'branch not in git-debrebase form' ../out.origin.status 828s branch not in git-debrebase form 828s + for mfmt in "${mfmts[@]}" 828s ++ printf 'found unprocessable commit, cannot cope: %s' 'origin commit' 828s + grep 'found unprocessable commit, cannot cope: origin commit' ../out.origin.status 828s found unprocessable commit, cannot cope: origin commit 828s + t-ok 828s + : ======================================== 828s + t-check-only-bpd 828s + '[' .. = .. ']' 828s + return 828s + t-fscks 828s + shopt -s nullglob 828s + for d in $tmp/*/.git $tmp/git/*.git 828s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s + t-git-fsck 828s ++ git rev-parse --git-dir 828s + local fsckerrs=.git/dgit-test-fsck.errs 828s + set +e 828s + tee .git/dgit-test-fsck.errs 828s + LC_MESSAGES=C 828s + git fsck --no-dangling --strict 828s + ps='0 0' 828s + set -e 828s + local pats 828s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 828s + test '0 0' = '0 0' 828s + pats+=(-e 'notice: HEAD points to an unborn branch') 828s + pats+=(-e 'notice: No default references') 828s + set +e 828s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 828s + rc=1 828s + set -e 828s + case $rc in 828s + for d in $tmp/*/.git $tmp/git/*.git 828s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 828s + t-git-fsck 828s ++ git rev-parse --git-dir 828s + local fsckerrs=./dgit-test-fsck.errs 828s + set +e 828s + tee ./dgit-test-fsck.errs 828s + LC_MESSAGES=C 828s + git fsck --no-dangling --strict 828s notice: HEAD points to an unborn branch (master) 828s + ps='0 0' 828s + set -e 828s + local pats 828s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 828s + test '0 0' = '0 0' 828s + pats+=(-e 'notice: HEAD points to an unborn branch') 828s + pats+=(-e 'notice: No default references') 828s + set +e 828s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 828s + rc=1 828s + set -e 828s + case $rc in 828s + t-save-artifacts 828s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts 828s + '[' x/tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts = x ']' 828s + '[' xtmp = x ']' 828s + GZIP=-1v 828s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-unprocessable-artifacts/gdr-unprocessable.tar.gz '--exclude=*.tar' . 828s gzip: warning: GZIP environment variable is deprecated; use an alias or script 828s 79.9% 828s + echo ok. 828s ok. 828s + rc=0 828s + set +x 828s + set +e 828s + pwd 828s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 828s + '[' x '!=' x ']' 828s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 828s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 828s + set -e 828s + test 0 = 0 829s autopkgtest [12:32:03]: test gdr-unprocessable: -----------------------] 829s gdr-unprocessable PASS 829s autopkgtest [12:32:03]: test gdr-unprocessable: - - - - - - - - - - results - - - - - - - - - - 829s autopkgtest [12:32:03]: test gdr-unprocessable-hints: preparing testbed 829s Reading package lists... 829s Building dependency tree... 829s Reading state information... 830s Starting pkgProblemResolver with broken count: 0 830s Starting 2 pkgProblemResolver with broken count: 0 830s Done 830s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 830s autopkgtest [12:32:04]: test gdr-unprocessable-hints: [----------------------- 830s ++ set -o pipefail 830s ++ . tests/lib-core 830s ++ . tests/lib-restricts 830s ++ trap ' 830s rc=$? 830s set +x 830s test $rc = 0 || echo " 830s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 830s 830s Most relevant logs are just before assignment rc=$rc 830s Will now do cleanup etc. 830s " 830s set -x 830s set +e 830s pwd 830s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 830s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 830s set -e 830s test $rc = 0 || t-report-failure 830s ' EXIT 830s ++ t-filter-out-git-hyphen-dir 830s ++ local pathent 830s +++ type -p git-rev-parse 830s +++ : 830s ++ pathent= 830s ++ case "$pathent" in 830s ++ return 830s ++ t-set-intree 830s ++ '[' x = x ']' 830s ++ return 830s ++ : -D 830s ++ export DGIT_TEST_DEBUG 830s ++ : x 830s ++ export DGIT_TEST_DEBPUSH_DEBUG 830s ++ : 830s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 830s ++ GIT_COMMITTER_DATE='1530000000 +0100' 830s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 830s ++ GIT_AUTHOR_DATE='1530000000 +0100' 830s ++ export LC_CTYPE=C.UTF-8 830s ++ LC_CTYPE=C.UTF-8 830s ++ unset CDPATH 830s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 830s ++ FILTER_BRANCH_SQUELCH_WARNING=1 830s +++ pwd 830s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 830s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ testname=gdr-unprocessable-hints 830s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ bpd=.. 830s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 830s ++ '[' x '!=' x ']' 830s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s +++ pwd 830s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ t-set-using-tmp 830s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 830s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 830s ++ export 'DEBFULLNAME=dgit test git user' 830s ++ DEBFULLNAME='dgit test git user' 830s ++ git config --global user.email dgit-test@debian.example.net 830s ++ git config --global user.name 'dgit test git user' 830s ++ git config --global protocol.ext.allow always 830s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 830s ++ env -0 830s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 830s ++ export DEBCHANGE_VENDOR=dpkg 830s ++ DEBCHANGE_VENDOR=dpkg 830s ++ unset VISUAL 830s ++ unset GIT_EDITOR 830s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 830s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 830s ++ cat 830s ++ schroot=build 830s ++ : aq 830s ++ : archive/test-dummy 830s ++ : sid:unstable 830s ++ t-git-config dgit.default.old-dsc-distro test-dummy 830s ++ git config --global dgit.default.old-dsc-distro test-dummy 830s ++ for import in ${autoimport-gnupg} 830s ++ case "$0" in 830s ++ t-setup-import gnupg 830s ++ local setupname=gnupg 830s ++ local setupsrc 830s ++ local lock 830s ++ '[' x = x ']' 830s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 830s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 830s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 830s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 830s cd "$1"; shift 830s setupname="$1"; shift 830s simport="$1"; shift 830s if [ -e "$simport" ]; then exit 0; fi 830s env - "$@" \ 830s "tests/setup/$setupname" 830s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 830s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 830s + shift 830s + setupname=gnupg 830s + shift 830s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 830s + shift 830s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 830s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-unprocessable-hints -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-unprocessable-hints' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 830s ++ set -o pipefail 830s ++ . tests/lib-core 830s ++ . tests/lib-restricts 830s ++ trap ' 830s rc=$? 830s set +x 830s test $rc = 0 || echo " 830s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 830s 830s Most relevant logs are just before assignment rc=$rc 830s Will now do cleanup etc. 830s " 830s set -x 830s set +e 830s pwd 830s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 830s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 830s set -e 830s test $rc = 0 || t-report-failure 830s ' EXIT 830s ++ t-filter-out-git-hyphen-dir 830s ++ local pathent 830s +++ type -p git-rev-parse 830s +++ : 830s ++ pathent= 830s ++ case "$pathent" in 830s ++ return 830s ++ t-set-intree 830s ++ '[' x = x ']' 830s ++ return 830s ++ : -D 830s ++ export DGIT_TEST_DEBUG 830s ++ : x 830s ++ export DGIT_TEST_DEBPUSH_DEBUG 830s ++ : 830s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 830s ++ GIT_COMMITTER_DATE='1530000000 +0100' 830s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 830s ++ GIT_AUTHOR_DATE='1530000000 +0100' 830s ++ export LC_CTYPE=C.UTF-8 830s ++ LC_CTYPE=C.UTF-8 830s ++ unset CDPATH 830s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 830s ++ FILTER_BRANCH_SQUELCH_WARNING=1 830s +++ pwd 830s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 830s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ testname=gnupg 830s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 830s ++ bpd=.. 830s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 830s ++ '[' x '!=' x ']' 830s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s +++ pwd 830s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ t-set-using-tmp 830s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 830s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 830s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 830s ++ export 'DEBFULLNAME=dgit test git user' 830s ++ DEBFULLNAME='dgit test git user' 830s ++ git config --global user.email dgit-test@debian.example.net 830s ++ git config --global user.name 'dgit test git user' 830s ++ git config --global protocol.ext.allow always 830s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 830s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 830s ++ export DEBCHANGE_VENDOR=dpkg 830s ++ DEBCHANGE_VENDOR=dpkg 830s ++ unset VISUAL 830s ++ unset GIT_EDITOR 830s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 830s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 830s ++ cat 830s ++ schroot=build 830s ++ : aq 830s ++ : archive/test-dummy 830s ++ : sid:unstable 830s ++ t-git-config dgit.default.old-dsc-distro test-dummy 830s ++ git config --global dgit.default.old-dsc-distro test-dummy 830s ++ for import in ${autoimport-gnupg} 830s ++ case "$0" in 830s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 830s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 830s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 830s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 830s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 830s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 830s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 830s + setup=' 830s export GNUPGHOME=$tmp/gnupg 830s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 830s 830s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 831s ssb rsa2048 2013-11-17 [E] 831s 831s sec rsa2048 2014-01-26 [SC] 831s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 831s uid [ultimate] Populus Romanus (test key) 831s ssb rsa2048 2014-01-26 [E] 831s 831s sec rsa2048 2014-01-26 [SC] 831s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 831s uid [ unknown] Hannibal (test key) 831s ssb rsa2048 2014-01-26 [E] 831s 831s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 831s export GNUPGHOME=$tmp/gnupg 831s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 831s 831s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 100644 debian/rules 831s delete mode 100644 debian/source/format 831s + git tag v1.0 831s + : 'fake up that our quilt-tip was descended from upstream' 831s + git checkout quilt-tip 831s Switched to branch 'quilt-tip' 831s + git merge --no-edit -s ours upstream 831s Merge made by the 'ours' strategy. 831s + : 'fake up that our quilt-tip had the patch queue in it' 831s + git checkout patch-queue/quilt-tip 831s Switched to branch 'patch-queue/quilt-tip' 831s + gbp pq export 831s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 831s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 831s + git add debian/patches 831s + git commit -m 'patch queue update (tests/setup/gdr-convert-gbp)' 831s [quilt-tip 3bc5395] patch queue update (tests/setup/gdr-convert-gbp) 831s 4 files changed, 50 insertions(+) 831s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 831s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 831s create mode 100644 debian/patches/series 831s create mode 100644 debian/patches/subdir/addnewups 831s + : 'make branch names more conventional' 831s + git branch -D master 831s Deleted branch master (was 17d67db). 831s + git branch -m quilt-tip master 831s + not-gdr-processable origin 831s + git branch gdr-unprocessable/origin 831s + t-git-debrebase analyse 831s + local gdr=git-debrebase 831s + : ' 831s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 831s + git-debrebase --dgit=dgit -D analyse 831s + grep 'Unknown Unprocessable' 831s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 1 *main::STDOUT 831s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 831s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 831s git-debrebase = AddPatches {"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Differs" => 4,"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e"} 831s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 831s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 831s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 831s git-debrebase = Pseudomerge {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]]} 831s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 831s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 831s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 831s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 831s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 831s git-debrebase = Mixed {"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 831s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 831s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 831s git-debrebase = Packaging {"Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n"} 831s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 831s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 831s git-debrebase = Packaging {"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"} 831s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 831s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 831s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d"}]} 831s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 831s git-debrebase ** Unknown 831s git-debrebase *** WALK BOMB unrecognised 831s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 831s ' 831s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 831s + : 'fake up an upstream 2.0' 831s + git branch make-upstream upstream 831s + t-make-new-upstream-tarball 2.0 831s + local uv=2.0 831s + git checkout make-upstream 831s Switched to branch 'make-upstream' 831s + echo 'upstream 2.0' 831s + git commit -a -m 'upstream 2.0 tarball' 831s [make-upstream 4db56a8] upstream 2.0 tarball 831s 1 file changed, 1 insertion(+) 831s + t-make-orig example 2.0 make-upstream 831s + local p=example 831s + local v=2.0 831s + local tag=make-upstream 831s + ust=example_2.0.orig.tar.gz 831s + GZIP=-1 831s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 831s gzip: warning: GZIP environment variable is deprecated; use an alias or script 831s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 831s + git branch -D quilt-tip-2 831s Deleted branch quilt-tip-2 (was 99fcab4). 831s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 831s + git branch -D gitish-only 831s Deleted branch gitish-only (was 2b2ddc8). 831s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 831s + git branch -D quilt-tip-1.1 831s Deleted branch quilt-tip-1.1 (was 7fc34be). 831s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 831s + git branch -D patch-queue/quilt-tip 831s Deleted branch patch-queue/quilt-tip (was d843a68). 831s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 831s + git branch -D indep-arch 831s Deleted branch indep-arch (was e215729). 831s + : 'see what gbp import-orig does' 831s + git checkout master 831s Switched to branch 'master' 831s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 831s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 831s gbp:info: Source package is example 831s gbp:info: Upstream version is 2.0 831s gbp:info: Replacing upstream source on 'master' 831s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 831s + not-gdr-processable merge 831s + git branch gdr-unprocessable/merge 831s + t-git-debrebase analyse 831s + local gdr=git-debrebase 831s + : ' 831s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 831s + git-debrebase --dgit=dgit -D analyse 831s + grep 'Unknown Unprocessable' 831s git-debrebase *** WALK de5adc8d36110abf62d562d9a1985a4796748ece 1 *main::STDOUT 831s git-debrebase get_differs 3bc5395fa4571258183be3d3f389950314c53d4e 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 831s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 831s git-debrebase classify de5adc8d36110abf62d562d9a1985a4796748ece $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 3bc5395fa4571258183be3d3f389950314c53d4e/0x2 923df13cd47c1ac87a6a0646124ace159c3d8291/0x34 831s git-debrebase ** Unknown 831s git-debrebase *** WALK BOMB unrecognised 831s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 831s ' 831s de5adc8d36110abf62d562d9a1985a4796748ece Unknown Unprocessable (general two-parent merge) 831s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 831s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 831s + DEBEMAIL=dgit-tests@example.org 831s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 831s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 831s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 831s [master e0acf20] dch -v 2.0-1 -m new upstream (did gbp import-orig) 831s 1 file changed, 6 insertions(+) 831s + t-dch-commit-r 831s + t-dch-r-rune t-dch-commit 831s + local cmd=t-dch-commit 831s + shift 831s + local suite=unstable 831s + t-dch-commit -r -D unstable '' 831s + t-debchange -r -D unstable '' 831s + DEBEMAIL=dgit-tests@example.org 831s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 831s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 831s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 831s libdistro-info-perl is not installed, Debian release names are not known. 831s libdistro-info-perl is not installed, Ubuntu release names are not known. 831s + git commit -m 'dch -r -D unstable ' debian/changelog 831s [master f31021f] dch -r -D unstable 831s 1 file changed, 3 insertions(+), 2 deletions(-) 831s + echo garbage 831s + git add debian/patches/garbage 831s + git commit -m 'add garbage' debian/patches/garbage 831s [master eb10718] add garbage 831s 1 file changed, 1 insertion(+) 831s create mode 100644 debian/patches/garbage 831s + t-archive-none example 831s + t-select-package example 831s + p=example 831s + dgitrepo=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 831s + t-archive-none-aq 831s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main 831s + : 831s + local 'jsondelim=[' 831s + local suitespec 831s + for suitespec in $suitespecs 831s + local suite=sid 831s + local sname=unstable 831s + t-aq-archive-updated sid example 831s + local suite=sid 831s + local p=example 831s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 831s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 831s + perl -wne ' 831s use JSON; 831s use strict; 831s our @v; 831s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 831s push @v, { 831s "version" => "$1", 831s "sha256sum" => "$2", 831s "component" => "$3", 831s "filename" => "$4", 831s }; 831s END { 831s my $json = JSON->new->canonical(); 831s print $json->encode(\@v) or die $!; 831s } 831s ' 831s + t-aq-archive-updated new example 831s + local suite=new 831s + local p=example 831s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 831s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 831s + perl -wne ' 831s use JSON; 831s use strict; 831s our @v; 831s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 831s push @v, { 831s "version" => "$1", 831s "sha256sum" => "$2", 831s "component" => "$3", 831s "filename" => "$4", 831s }; 831s END { 831s my $json = JSON->new->canonical(); 831s print $json->encode(\@v) or die $!; 831s } 831s ' 831s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 831s + cat 831s + jsondelim=' },' 831s + cat 831s + t-git-none 831s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 831s + set -e 831s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 831s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 831s + t-dgit -wgf --gbp push-source --new 831s + local dgit=dgit 831s + pwd 831s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 831s + : ' 831s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 831s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf --gbp push-source --new 832s | git rev-parse --show-toplevel 832s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 832s | git config -z --get-regexp --local '.*' 832s | git config -z --get-regexp --local '.*' 832s | git config -z --get-regexp --global '.*' 832s | git config -z --get-regexp --system '.*' 832s format 3.0 (quilt), quilt mode gbp 832s Format `3.0 (quilt)', need to check/update patch stack 832s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 832s => `' 832s + git diff --quiet HEAD 832s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 832s canonical suite name for unstable is sid 832s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 832s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 832s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 832s | git rev-parse 'HEAD~0' 832s => `eb10718ab213ccfa83613ebbddefbffda941a548' 832s | git symbolic-ref -q HEAD 832s => `refs/heads/master' 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 832s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 832s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 832s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 832s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 832s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ec589170633c1314f9359337d7eec0b797ed97f5bf23c9081bb4e8ea008db65f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 832s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 832s >(no reflog) 832s splitbrain cache miss 832s CD work 832s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 832s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 832s + git checkout -q -b dgit-view 832s examining quilt state (multiple patches, gbp mode) 832s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 832s CD fake 832s | find -name .git -prune -print0 832s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 832s + git checkout -f eb10718ab213ccfa83613ebbddefbffda941a548 -- debian 832s + git add -Af . 832s | git write-tree 832s => `25ace9139511ccf0c93a7bd57b77dd51e225d5f4' 832s fake orig tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 832s CD .. 832s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 832s CD ../fake 832s + git add -Af . 832s | git write-tree 832s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 832s fake o+d/p tree object 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 832s CD ../work 832s | git ls-tree --name-only -z eb10718ab213ccfa83613ebbddefbffda941a548 832s => `.gitignore\x00debian\x00docs\x00example\x00src.c\x00' 832s | git diff-tree -z --no-renames -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 832s => `' 832s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 eb10718ab213ccfa83613ebbddefbffda941a548 => 0 832s | git diff-tree -z --no-renames --name-only -r eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 832s => `lib.c\x00new-upstream-file\x00src.c\x00' 832s quiltify_trees_differ eb10718ab213ccfa83613ebbddefbffda941a548 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 832s | git diff-tree -z --no-renames --name-only -r 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 832s => `lib.c\x00new-upstream-file\x00src.c\x00' 832s quiltify_trees_differ 25ace9139511ccf0c93a7bd57b77dd51e225d5f4 c9e106866ca8afa4eceff0095dbb45e74602cf64 => 1 832s differences @dl == ## ## == == ==. 832s dgit: base trees orig=25ace9139511ccf0c93a o+d/p=c9e106866ca8afa4ecef 832s dgit: quilt differences: src: == orig ## gitignores: == orig == 832s dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p 832s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 832s => `1530000000 +0000' 832s dgit view: creating patches-applied version using gbp pq 832s + sh -ec 'exec >/dev/null; exec "$@"' x gbp pq import 832s + git update-ref refs/heads/dgit-view HEAD 832s + git checkout -q dgit-view 832s | git rev-parse 'HEAD~0' 832s => `45ea71a69fa522ce760afdab8a420200443753e9' 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 832s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-intern/quilt-cache' 832s => `' 832s + git update-ref -m 'dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ec589170633c1314f9359337d7eec0b797ed97f5bf23c9081bb4e8ea008db65f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488' refs/dgit-intern/quilt-cache 45ea71a69fa522ce760afdab8a420200443753e9 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work 832s dgit view: created (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 832s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 832s | git rev-parse 'HEAD~0' 832s => `eb10718ab213ccfa83613ebbddefbffda941a548' 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 832s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 832s dpkg-source: info: using source format '3.0 (quilt)' 832s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 832s dpkg-source: info: using patch list from debian/patches/series 832s dpkg-source: info: building example in example_2.0-1.debian.tar.xz 832s dpkg-source: info: building example in example_2.0-1.dsc 832s CD work 832s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 832s package seems new, not specifying -v 832s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-1_source.changes dpkg-genchanges -S 832s dpkg-genchanges: info: not including original source code in upload 832s CD .. 832s moving example_2.0-1.dsc, example_2.0-1_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 832s renaming (Files) example_2.0.orig.tar.gz 832s renaming (Files) example_2.0-1.debian.tar.xz 832s renaming (dsc) example_2.0-1.dsc 832s renaming (changes) example_2.0-1_source.changes 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 832s actually entering push 832s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 832s => `0' 832s + git config remote.dgit.skipdefaultupdate true 832s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 832s get_archive_dsc: nothing in archive, returning undef 832s no version available from the archive 832s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 832s => `' 832s previous reference hash= 832s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 832s => `' 832s fetch_from_archive: lastfetch= 832s nothing found! 832s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 832s + git check-ref-format archive/test-dummy/2.0-1 832s | git symbolic-ref -q HEAD 832s => `refs/heads/master' 832s | git rev-parse 'HEAD~0' 832s => `eb10718ab213ccfa83613ebbddefbffda941a548' 832s ffq_prev_branchinfo branch current refs/heads/master 832s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 832s => `' 832s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 832s => `' 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 832s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 832s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog debian/patches 832s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 832s dgit: split brain (separate dgit view) may be needed (--quilt=gbp). 832s splitbrain cachekey dgit 9.15 2.0 gbp eb10718ab213ccfa83613ebbddefbffda941a548 - ec589170633c1314f9359337d7eec0b797ed97f5bf23c9081bb4e8ea008db65f 08f186b3e2aa10e8aad75e83a218360c1284f0bc23159f4699bc3518ee745488 832s |(probably) git log -g '--pretty=format:%H %gs' refs/dgit-intern/quilt-cache 832s CD work 832s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 832s + git reset -q --hard eb10718ab213ccfa83613ebbddefbffda941a548 832s dgit view: found cached (commit id 45ea71a69fa522ce760afdab8a420200443753e9) 832s + git checkout -q -b dgit-view 45ea71a69fa522ce760afdab8a420200443753e9 832s splitbrain_pseudomerge... 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 832s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 832s => `' 832s + git diff --quiet HEAD 832s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-1' 832s => `' 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 832s checking that example_2.0-1.dsc corresponds to HEAD 832s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc 832s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-1.dsc) 832s dpkg-source: info: extracting example in example-2.0 832s dpkg-source: info: unpacking example_2.0.orig.tar.gz 832s dpkg-source: info: unpacking example_2.0-1.debian.tar.xz 832s dpkg-source: info: using patch list from debian/patches/series 832s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 832s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 832s dpkg-source: info: applying subdir/addnewups 832s CD example-2.0 832s | find -name .git -prune -print0 832s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 832s + git add -Af . 832s | git write-tree 832s => `c9e106866ca8afa4eceff0095dbb45e74602cf64' 832s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 832s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 832s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 832s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 832s + git diff --quiet c9e106866ca8afa4eceff0095dbb45e74602cf64 45ea71a69fa522ce760afdab8a420200443753e9 832s files_compare_inputs example_2.0-1.dsc 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0.orig.tar.gz 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha256 example_2.0-1.debian.tar.xz 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0.orig.tar.gz 832s files_compare_inputs example_2.0-1.dsc Checksums-Sha1 example_2.0-1.debian.tar.xz 832s files_compare_inputs example_2.0-1.dsc Files 832s files_compare_inputs example_2.0-1.dsc Files example_2.0.orig.tar.gz 832s files_compare_inputs example_2.0-1.dsc Files example_2.0-1.debian.tar.xz 832s files_compare_inputs example_2.0-1_source.changes 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.dsc 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha256 example_2.0-1.debian.tar.xz 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.dsc 832s files_compare_inputs example_2.0-1_source.changes Checksums-Sha1 example_2.0-1.debian.tar.xz 832s files_compare_inputs example_2.0-1_source.changes Files 832s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.dsc 832s files_compare_inputs example_2.0-1_source.changes Files example_2.0-1.debian.tar.xz 832s checking origs needed (2.0)... 832s checking origs needed placement 'devel extra'... 832s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 832s origs example_2.0.orig.tar.gz is_orig 832s -| sh -ec 'cd "$1"; shift 832s 832s find -name "$1" -print0 | 832s xargs -0r sha256sum 832s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 832s origs example_2.0.orig.tar.gz $#$have=-1 832s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 832s origs example_2.0-1.debian.tar.xz | aa1f0714c5fca54f4cb0b167672074b3 1296 example_2.0-1.debian.tar.xz 832s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 832s push_tagwants: $VAR1 = [ 832s '2.0-1', 832s '45ea71a69fa522ce760afdab8a420200443753e9', 832s 'eb10718ab213ccfa83613ebbddefbffda941a548', 832s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 832s ]; 832s $VAR2 = [ 832s { 832s 'Tfn' => sub { "DUMMY" }, 832s 'TagFn' => sub { "DUMMY" }, 832s 'View' => 'dgit', 832s 'Tag' => 'archive/test-dummy/2.0-1', 832s 'TfSuffix' => '', 832s 'Objid' => '45ea71a69fa522ce760afdab8a420200443753e9' 832s }, 832s { 832s 'View' => 'maint', 832s 'TagFn' => sub { "DUMMY" }, 832s 'Tfn' => sub { "DUMMY" }, 832s 'TfSuffix' => '-maintview', 832s 'Objid' => 'eb10718ab213ccfa83613ebbddefbffda941a548', 832s 'Tag' => 'test-dummy/2.0-1' 832s } 832s ]; 832s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 832s => `1530000000 +0000' 832s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 832s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 832s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 832s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp 832s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 832s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.tmp.asc 832s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 832s => `197399ec17848412720baa3c011db78d38e86226' 832s + git verify-tag 197399ec17848412720baa3c011db78d38e86226 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s gpg: Signature made Mon Mar 31 12:32:06 2025 UTC 833s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 833s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 833s gpg: WARNING: This key is not certified with a trusted signature! 833s gpg: There is no indication that the signature belongs to the owner. 833s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 833s + git update-ref refs/tags/archive/test-dummy/2.0-1 197399ec17848412720baa3c011db78d38e86226 833s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-maintview.signed.tmp 833s => `e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77' 833s + git verify-tag e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s gpg: Signature made Mon Mar 31 12:32:06 2025 UTC 833s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 833s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 833s gpg: WARNING: This key is not certified with a trusted signature! 833s gpg: There is no indication that the signature belongs to the owner. 833s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 833s + git update-ref refs/tags/test-dummy/2.0-1 e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 833s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 833s => `0' 833s + /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-create example ;set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; cp -a _template example.git' 833s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 45ea71a69fa522ce760afdab8a420200443753e9:refs/dgit/sid refs/tags/archive/test-dummy/2.0-1 refs/tags/test-dummy/2.0-1 833s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 833s * [new reference] 45ea71a69fa522ce760afdab8a420200443753e9 -> refs/dgit/sid 833s * [new tag] archive/test-dummy/2.0-1 -> archive/test-dummy/2.0-1 833s * [new tag] test-dummy/2.0-1 -> test-dummy/2.0-1 833s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 45ea71a69fa522ce760afdab8a420200443753e9 833s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-1_source.changes 833s signfile dsc ../example_2.0-1.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s 833s fixup_changes dsc ../example_2.0-1.dsc ../example_2.0-1_source.changes 833s signfile changes ../example_2.0-1_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 833s 833s Successfully signed dsc, changes files 833s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-1_source.changes 833s gpg: ../example_2.0-1_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 833s gpg: ../example_2.0-1.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 833s D: Setting host argument. 833s Checking signature on .changes 833s Checking signature on .dsc 833s Uploading to test-dummy (via local to localhost): 833s Successfully uploaded packages. 833s dgit ok: pushed and uploaded 2.0-1 833s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 833s del_lrfetchrefs... 833s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 833s ' 833s + t-salsa-add-remote 833s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 833s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 833s + set -e 833s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 833s + git init --bare 833s hint: Using 'master' as the name for the initial branch. This default branch name 833s hint: is subject to change. To configure the initial branch name to use in all 833s hint: of your new repositories, which will suppress this warning, call: 833s hint: 833s hint: git config --global init.defaultBranch 833s hint: 833s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 833s hint: 'development'. The just-created branch can be renamed via this command: 833s hint: 833s hint: git branch -m 833s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 833s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 833s + git push --set-upstream origin master 833s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 833s * [new branch] master -> master 833s Branch 'master' set up to track remote branch 'master' from 'origin'. 833s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 833s + local 'mpat=E:identical in upstream files' 833s + shift 833s + set +o pipefail 833s + LC_MESSAGES=C 833s + LANGUAGE=C 833s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 833s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + local gdr=git-debrebase 833s + : ' 833s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 833s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 833s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 833s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x36 833s docs/README | 1 + 833s 1 file changed, 1 insertion(+) 833s 833s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 833s git-debrebase: identical in upstream files. See diffstat above, or run 833s git-debrebase: git diff a8b25984b338928272b3ddd50dd036d6db8f83d2 HEAD -- :!/debian :/ 833s + local 'ps=255 0' 833s + set -o pipefail 833s + case $ps in 833s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + local 'mpat=E:identical in upstream files' 833s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + local grepper=fgrep 833s + case "$mpat" in 833s + case "$mpat" in 833s + grepper=egrep 833s + mpat='identical in upstream files' 833s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s git-debrebase: identical in upstream files. See diffstat above, or run 833s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 833s + local 'mpat=E:Unused patch file garbage will be discarded' 833s + shift 833s + set +o pipefail 833s + LC_MESSAGES=C 833s + LANGUAGE=C 833s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + t-git-debrebase -fupstream-has-debian convert-from-gbp 833s + local gdr=git-debrebase 833s + : ' 833s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 833s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 833s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 833s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 833s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 833s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 833s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 833s $VAR2 = bless( do{\(my $o = { 833s 'allow_pgp' => 1, 833s 'keep_duplicate' => 0, 833s 'fields' => { 833s 'Source' => 'example', 833s 'Version' => '2.0-1', 833s 'Distribution' => 'unstable', 833s 'Urgency' => 'medium', 833s 'Maintainer' => 'dgit test git user ', 833s 'Timestamp' => '1530000000', 833s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 833s 'Changes' => ' 833s example (2.0-1) unstable; urgency=medium 833s 833s [ Ian Jackson ] 833s * new upstream (did gbp import-orig)' 833s }, 833s 'drop_empty' => 0, 833s 'allow_duplicate' => 0, 833s 'in_order' => [ 833s 'Source', 833s 'Version', 833s 'Distribution', 833s 'Urgency', 833s 'Maintainer', 833s 'Timestamp', 833s 'Date', 833s 'Changes' 833s ], 833s 'out_order' => [], 833s 'is_pgp_signed' => 0, 833s 'name' => 'debian/changelog, entry no.1' 833s })}, 'Dpkg::Control::Hash' ); 833s last finished-looking changelog entry: (2.0-1) unstable 833s will stitch in dgit view, archive/test-dummy/2.0-1 833s git-debrebase: snags: 1 overriden by individual -f options 833s 833s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 833s + local 'ps=255 0' 833s + set -o pipefail 833s + case $ps in 833s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + local 'mpat=E:Unused patch file garbage will be discarded' 833s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s + local grepper=fgrep 833s + case "$mpat" in 833s + case "$mpat" in 833s + grepper=egrep 833s + mpat='Unused patch file garbage will be discarded' 833s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 833s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 833s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 833s + local gdr=git-debrebase 833s + : ' 833s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 833s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 833s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 834s git-debrebase get_differs 923df13cd47c1ac87a6a0646124ace159c3d8291 eb10718ab213ccfa83613ebbddefbffda941a548 = 0x34 834s git-debrebase: snag ignored (-fupstream-has-debian): upstream (923df13cd47c1ac87a6a0646124ace159c3d8291) contains debian/ directory 834s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 834s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 834s $VAR2 = bless( do{\(my $o = { 834s 'drop_empty' => 0, 834s 'name' => 'debian/changelog, entry no.1', 834s 'fields' => { 834s 'Source' => 'example', 834s 'Version' => '2.0-1', 834s 'Distribution' => 'unstable', 834s 'Urgency' => 'medium', 834s 'Maintainer' => 'dgit test git user ', 834s 'Timestamp' => '1530000000', 834s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 834s 'Changes' => ' 834s example (2.0-1) unstable; urgency=medium 834s 834s [ Ian Jackson ] 834s * new upstream (did gbp import-orig)' 834s }, 834s 'in_order' => [ 834s 'Source', 834s 'Version', 834s 'Distribution', 834s 'Urgency', 834s 'Maintainer', 834s 'Timestamp', 834s 'Date', 834s 'Changes' 834s ], 834s 'keep_duplicate' => 0, 834s 'allow_duplicate' => 0, 834s 'allow_pgp' => 1, 834s 'out_order' => [], 834s 'is_pgp_signed' => 0 834s })}, 'Dpkg::Control::Hash' ); 834s last finished-looking changelog entry: (2.0-1) unstable 834s will stitch in dgit view, archive/test-dummy/2.0-1 834s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 834s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 834s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 834s gbp:info: Trying to apply patches at 'eb10718ab213ccfa83613ebbddefbffda941a548' 834s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 834s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 834s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 834s git-debrebase ffq check_specs * 834s git-debrebase ffq merge master 834s git-debrebase ffq check_remote origin remote fetch/merge branch 834s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 834s OK, you are ahead of refs/remotes/origin/master 834s git-debrebase ffq check_remote undef remote push branch 834s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 834s OK, you are ahead of refs/remotes/dgit/dgit/sid 834s git-debrebase: snags: 2 overriden by individual -f options 834s git-debrebase >= update refs/debrebase-last/heads/master 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 0000000000000000000000000000000000000000 834s git-debrebase >= update HEAD 0bcedd364c245298b6ec08d8f29abf69e34b6e5b eb10718ab213ccfa83613ebbddefbffda941a548 834s git-debrebase >$ 834s HEAD is now at 0bcedd3 git-debrebase import: declare ff from dgit archive view 834s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 834s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 834s ' 834s + git branch converted-from-gbp 834s + v=2.0-2 834s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 834s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 834s + DEBEMAIL=dgit-tests@example.org 834s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 834s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 834s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 834s [master 2d8cdac] dch -v 2.0-2 -m switch to git-debrebase, no other changes 834s 1 file changed, 6 insertions(+) 834s + t-dch-commit-r 834s + t-dch-r-rune t-dch-commit 834s + local cmd=t-dch-commit 834s + shift 834s + local suite=unstable 834s + t-dch-commit -r -D unstable '' 834s + t-debchange -r -D unstable '' 834s + DEBEMAIL=dgit-tests@example.org 834s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 834s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 834s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 834s libdistro-info-perl is not installed, Debian release names are not known. 834s libdistro-info-perl is not installed, Ubuntu release names are not known. 834s + git commit -m 'dch -r -D unstable ' debian/changelog 834s [master 4af0243] dch -r -D unstable 834s 1 file changed, 1 insertion(+), 1 deletion(-) 834s + t-dgit -wgf push-source --new 834s + local dgit=dgit 834s + pwd 834s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 834s + : ' 834s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 834s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -wgf push-source --new 834s | git rev-parse --show-toplevel 834s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example' 834s | git config -z --get-regexp --local '.*' 834s | git config -z --get-regexp --local '.*' 834s | git config -z --get-regexp --global '.*' 834s | git config -z --get-regexp --system '.*' 834s format 3.0 (quilt), quilt mode linear 834s Format `3.0 (quilt)', need to check/update patch stack 834s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 834s => `' 834s + git diff --quiet HEAD 834s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 834s canonical suite name for unstable is sid 834s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 834s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 834s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 834s | git rev-parse 'HEAD~0' 834s => `4af0243f9227b0d695fbff38df345aca23969e2e' 834s | git symbolic-ref -q HEAD 834s => `refs/heads/master' 834s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 834s CD work 834s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 834s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 834s examining quilt state (multiple patches, linear mode) 834s branch_is_gdr 4af0243f9227b0d695fbff38df345aca23969e2e... 834s branch_is_gdr 0bcedd364c245298b6ec08d8f29abf69e34b6e5b gdr pseudomerge YES 834s + git reset -q --hard 4af0243f9227b0d695fbff38df345aca23969e2e 834s + git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend 834s HEAD is now at 6b22dd5 Commit patch queue (exported by git-debrebase) 834s | git rev-parse 'HEAD~0' 834s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 834s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 834s + tar -cf './example_2.0-~~DGITFAKE.debian.tar' -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example debian/source/format debian/rules debian/control debian/changelog 834s + gzip -1n './example_2.0-~~DGITFAKE.debian.tar' 834s + sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null' 835s CD fake 835s | find -name .git -prune -print0 835s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 835s + git checkout -f 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian 835s + git add -Af . 835s | git write-tree 835s => `e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7' 835s fake orig tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 835s CD .. 835s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s CD ../fake 835s + git add -Af . 835s | git write-tree 835s => `607612c46d7ea5b66697b830f1a50f069061d460' 835s fake o+d/p tree object e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 835s CD ../work 835s | git ls-tree --name-only -z 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s => `.gitignore\x00debian\x00docs\x00example\x00lib.c\x00new-upstream-file\x00src.c\x00' 835s | git diff-tree -z --no-renames -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s => `:000000 100644 0000000000000000000000000000000000000000 e026ed3569d457e57c3430310f3dcea8d6a1fa66 A\x00lib.c\x00:000000 100644 0000000000000000000000000000000000000000 a2d670bf768748c4c6901b3fbb3f09dd01de0a20 A\x00new-upstream-file\x00:100644 100644 05437c57e0ed8b79a911ff59d65cf73d6a6cf1fc 6cc28de9c84de22b24fd6e2ef890862c64d11bf8 M\x00src.c\x00' 835s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf => 1 835s | git diff-tree -z --no-renames --name-only -r 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 835s => `' 835s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 835s | git diff-tree -z --no-renames --name-only -r e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 835s => `lib.c\x00new-upstream-file\x00src.c\x00' 835s quiltify_trees_differ e91dae3f9b9f31b52f2926aec82ef1a983ca1fd7 607612c46d7ea5b66697b830f1a50f069061d460 => 1 835s differences @dl ## ## == == == ==. 835s dgit: base trees orig=e91dae3f9b9f31b52f29 o+d/p=607612c46d7ea5b66697 835s dgit: quilt differences: src: ## orig ## gitignores: == orig == 835s dgit: quilt differences: HEAD == o+d/p HEAD == o+d/p 835s starting quiltify (multiple patches, linear mode) 835s | git ls-tree --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -- debian/rules debian/control 835s => `debian/control'... 835s quiltify investigate 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s | git diff-tree -z --no-renames --name-only 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 835s => `' 835s quiltify_trees_differ 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 607612c46d7ea5b66697b830f1a50f069061d460 => 0 835s search finished hooray! 835s quiltify linearisation planning successful, executing... 835s + git checkout -q master 835s | git status --ignored --porcelain 835s => `?? .pc/' 835s nothing quilty to commit, ok. 835s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 835s + git pull --ff-only -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack/work master 835s | git rev-parse 'HEAD~0' 835s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 835s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 835s QF linkorigs example_2.0.orig.tar.gz, /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0.orig.tar.gz Y 835s CD work 835s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 835s + git reset -q --hard 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s CD .. 835s + dpkg-source '-i(?:^|/)'\\'.git(?:/|$)' -I.git -b -- work 835s dpkg-source: info: using source format '3.0 (quilt)' 835s dpkg-source: info: building example using existing ./example_2.0.orig.tar.gz 835s dpkg-source: info: using patch list from debian/patches/series 835s dpkg-source: info: building example in example_2.0-2.debian.tar.xz 835s dpkg-source: info: building example in example_2.0-2.dsc 835s CD work 835s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 835s package seems new, not specifying -v 835s + sh -ec 'exec >../$1; shift; exec "$@"' x example_2.0-2_source.changes dpkg-genchanges -S 835s dpkg-genchanges: info: not including original source code in upload 835s CD .. 835s moving example_2.0-2.dsc, example_2.0-2_source.changes, etc. to /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.. 835s renaming (Files) example_2.0.orig.tar.gz 835s renaming (Files) example_2.0-2.debian.tar.xz 835s renaming (dsc) example_2.0-2.dsc 835s renaming (changes) example_2.0-2_source.changes 835s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 835s actually entering push 835s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 835s => `1' 835s git_lrfetch_sane suppl=0 specs tags/archive/test-dummy/* tags/test-dummy/* dgit/sid dgit-rewrite/map 835s git_lrfetch_sane specre=(?:refs/tags\/archive\/test\-dummy\/.*)|(?:refs/tags\/test\-dummy\/.*)|(?:refs/dgit\/sid)|(?:refs/dgit\-rewrite\/map) 835s git_lrfetch_sane iteration 0 835s | git ls-remote -q --refs /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' refs/dgit/sid refs/dgit-rewrite/map 835s => 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit/sid 835s => 197399ec17848412720baa3c011db78d38e86226 refs/tags/archive/test-dummy/2.0-1 835s => e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 refs/tags/test-dummy/2.0-1 835s git_lrfetch_sane fspecs +refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/* +refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/* +refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid 835s + git fetch -p -n -q /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git '+refs/tags/archive/test-dummy/*:refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' '+refs/tags/test-dummy/*:refs/dgit-fetch/test-dummy/tags/test-dummy/*' '+refs/dgit/sid:refs/dgit-fetch/test-dummy/dgit/sid' 835s | git for-each-ref refs/dgit-fetch/test-dummy 835s |> 45ea71a69fa522ce760afdab8a420200443753e9 commit refs/dgit-fetch/test-dummy/dgit/sid 835s |> 197399ec17848412720baa3c011db78d38e86226 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 835s |> e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 835s git_lrfetch_sane: tidying any old suite lrfetchrefs 835s | git for-each-ref refs/dgit-fetch/sid 835s git_lrfetch_sane: git fetch --no-insane emulation complete 835s $VAR1 = { 835s 'refs/dgit-fetch/test-dummy/dgit/sid' => '45ea71a69fa522ce760afdab8a420200443753e9', 835s 'refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1' => 'e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77', 835s 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1' => '197399ec17848412720baa3c011db78d38e86226' 835s }; 835s | git for-each-ref 'refs/tags/archive/test-dummy/*' 'refs/tags/test-dummy/*' 835s |> 197399ec17848412720baa3c011db78d38e86226 tag refs/tags/archive/test-dummy/2.0-1 835s currently refs/tags/archive/test-dummy/2.0-1=197399ec17848412720baa3c011db78d38e86226 835s |> e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 tag refs/tags/test-dummy/2.0-1 835s currently refs/tags/test-dummy/2.0-1=e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 835s | git for-each-ref 'refs/dgit-fetch/test-dummy/tags/archive/test-dummy/*' 'refs/dgit-fetch/test-dummy/tags/test-dummy/*' 835s |> 197399ec17848412720baa3c011db78d38e86226 tag refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 835s offered refs/tags/archive/test-dummy/2.0-1=197399ec17848412720baa3c011db78d38e86226 835s |> e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 tag refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 835s offered refs/tags/test-dummy/2.0-1=e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 835s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable/example... 835s get_archive_dsc: nothing in archive, returning undef 835s no version available from the archive 835s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s previous reference hash=45ea71a69fa522ce760afdab8a420200443753e9 835s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s fetch_from_archive: lastfetch=45ea71a69fa522ce760afdab8a420200443753e9 835s 835s Package not found in the archive, but has allegedly been pushed using dgit. 835s Perhaps the upload is stuck in incoming. Using the version from git. 835s 835s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s fetch mergeinfos: 835s commit 45ea71a69fa522ce760afdab8a420200443753e9 dgit suite branch on dgit git server 835s fetch hash=45ea71a69fa522ce760afdab8a420200443753e9 835s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 45ea71a69fa522ce760afdab8a420200443753e9 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 45ea71a69fa522ce760afdab8a420200443753e9 835s | git log -n2 45ea71a69fa522ce760afdab8a420200443753e9 835s => `commit 45ea71a69fa522ce760afdab8a420200443753e9'... 835s | git ls-tree -lrz -- 45ea71a69fa522ce760afdab8a420200443753e9: 835s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/changelog.822.tmp; exec "$@"' x dpkg-parsechangelog 835s + git check-ref-format archive/test-dummy/2.0-2 835s | git symbolic-ref -q HEAD 835s => `refs/heads/master' 835s | git rev-parse 'HEAD~0' 835s => `6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf' 835s ffq_prev_branchinfo branch current refs/heads/master 835s | git for-each-ref '--format=%(objectname)' '[r]efs/ffq-prev/heads/master' 835s => `' 835s | git for-each-ref '--format=%(objectname)' '[r]efs/debrebase-last/heads/master' 835s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 835s | git merge-base 0bcedd364c245298b6ec08d8f29abf69e34b6e5b 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 835s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 835s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 835s | git rev-parse '0bcedd364c245298b6ec08d8f29abf69e34b6e5b~0' 835s => `0bcedd364c245298b6ec08d8f29abf69e34b6e5b' 835s | git status --ignored --porcelain 835s => `' 835s nothing quilty to commit, ok. 835s | git status -uall --ignored --porcelain debian/source/format debian/source/options debian/source/local-options debian/source/local-patch-header 835s => `' 835s + git diff --quiet HEAD 835s | git merge-base 45ea71a69fa522ce760afdab8a420200443753e9 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git rev-parse '45ea71a69fa522ce760afdab8a420200443753e9~0' 835s => `45ea71a69fa522ce760afdab8a420200443753e9' 835s | git for-each-ref '--format=%(objectname)' '[r]efs/tags/archive/test-dummy/2.0-2' 835s => `' 835s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/unpack 835s checking that example_2.0-2.dsc corresponds to HEAD 835s + dpkg-source -x -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc 835s dpkg-source: warning: extracting unsigned source package (/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/../example_2.0-2.dsc) 835s dpkg-source: info: extracting example in example-2.0 835s dpkg-source: info: unpacking example_2.0.orig.tar.gz 835s dpkg-source: info: unpacking example_2.0-2.debian.tar.xz 835s dpkg-source: info: using patch list from debian/patches/series 835s dpkg-source: info: applying 0001-Add-a-new-upstream-file.patch 835s dpkg-source: info: applying 0002-Edit-the-.c-file.patch 835s dpkg-source: info: applying subdir/addnewups 835s CD example-2.0 835s | find -name .git -prune -print0 835s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 835s + git add -Af . 835s | git write-tree 835s => `607612c46d7ea5b66697b830f1a50f069061d460' 835s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 835s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 835s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 835s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 835s + git diff --quiet 607612c46d7ea5b66697b830f1a50f069061d460 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 835s files_compare_inputs example_2.0-2.dsc 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0.orig.tar.gz 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha256 example_2.0-2.debian.tar.xz 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0.orig.tar.gz 835s files_compare_inputs example_2.0-2.dsc Checksums-Sha1 example_2.0-2.debian.tar.xz 835s files_compare_inputs example_2.0-2.dsc Files 835s files_compare_inputs example_2.0-2.dsc Files example_2.0.orig.tar.gz 835s files_compare_inputs example_2.0-2.dsc Files example_2.0-2.debian.tar.xz 835s files_compare_inputs example_2.0-2_source.changes 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.dsc 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha256 example_2.0-2.debian.tar.xz 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.dsc 835s files_compare_inputs example_2.0-2_source.changes Checksums-Sha1 example_2.0-2.debian.tar.xz 835s files_compare_inputs example_2.0-2_source.changes Files 835s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.dsc 835s files_compare_inputs example_2.0-2_source.changes Files example_2.0-2.debian.tar.xz 835s checking origs needed (2.0)... 835s checking origs needed placement 'devel extra'... 835s origs example_2.0.orig.tar.gz | 3b8cbf944b4b44ffe8a368d15a0fe1df 532 example_2.0.orig.tar.gz 835s origs example_2.0.orig.tar.gz is_orig 835s -| sh -ec 'cd "$1"; shift 835s 835s find -name "$1" -print0 | 835s xargs -0r sha256sum 835s ' x //tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/ example_2.0.orig.tar.gz 835s origs example_2.0.orig.tar.gz $#$have=-1 835s origs example_2.0.orig.tar.gz f.same=0 #f._differ=-1 835s origs example_2.0-2.debian.tar.xz | a84e843efe3446dba42fb756ea317d63 1304 example_2.0-2.debian.tar.xz 835s edited .changes for archive .orig contents: added example_2.0.orig.tar.gz 835s push_tagwants: $VAR1 = [ 835s '2.0-2', 835s '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 835s undef, 835s '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag' 835s ]; 835s $VAR2 = [ 835s { 835s 'View' => 'dgit', 835s 'Tfn' => sub { "DUMMY" }, 835s 'Tag' => 'archive/test-dummy/2.0-2', 835s 'TagFn' => sub { "DUMMY" }, 835s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 835s 'TfSuffix' => '' 835s }, 835s { 835s 'Objid' => '6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf', 835s 'TfSuffix' => '-dgit', 835s 'Tag' => 'test-dummy/2.0-2', 835s 'TagFn' => sub { "DUMMY" }, 835s 'View' => 'dgit', 835s 'Tfn' => sub { "DUMMY" } 835s } 835s ]; 835s | date '+%s %z' -d 'Tue, 26 Jun 2018 08:00:00 +0000' 835s => `1530000000 +0000' 835s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp 835s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 835s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.tmp.asc 835s + gpg --detach-sign --armor -u BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp 835s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 835s + sh -ec 'exec >/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp; exec "$@"' x cat -- /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.tmp.asc 835s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag.signed.tmp 835s => `053b5eae2aa22bed8b9088f33533e16ab54c9ce5' 835s + git verify-tag 053b5eae2aa22bed8b9088f33533e16ab54c9ce5 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s gpg: Signature made Mon Mar 31 12:32:09 2025 UTC 836s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 836s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 836s gpg: WARNING: This key is not certified with a trusted signature! 836s gpg: There is no indication that the signature belongs to the owner. 836s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 836s + git update-ref refs/tags/archive/test-dummy/2.0-2 053b5eae2aa22bed8b9088f33533e16ab54c9ce5 836s | git hash-object -w -t tag /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/dgit/tag-dgit.signed.tmp 836s => `de44e7beb3cb5c4950e93b488232722a26e85851' 836s + git verify-tag de44e7beb3cb5c4950e93b488232722a26e85851 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s gpg: Signature made Mon Mar 31 12:32:09 2025 UTC 836s gpg: using RSA key BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 836s gpg: Good signature from "Senatus Romanus (test key) " [unknown] 836s gpg: WARNING: This key is not certified with a trusted signature! 836s gpg: There is no indication that the signature belongs to the owner. 836s Primary key fingerprint: BCD2 2CD8 3243 B79D 3DFA C33E A3DB CBC0 39B1 3D8A 836s + git update-ref refs/tags/test-dummy/2.0-2 de44e7beb3cb5c4950e93b488232722a26e85851 836s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 836s => `1' 836s + git -c push.followTags=false push /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf:refs/dgit/sid refs/tags/archive/test-dummy/2.0-2 refs/tags/test-dummy/2.0-2 836s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 836s 45ea71a..6b22dd5 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf -> refs/dgit/sid 836s * [new tag] archive/test-dummy/2.0-2 -> archive/test-dummy/2.0-2 836s * [new tag] test-dummy/2.0-2 -> test-dummy/2.0-2 836s + git update-ref -m 'dgit push' refs/remotes/dgit/dgit/sid 6b22dd5380567a2a7bd954f74ddfc3ae40ae18bf 836s + debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A ../example_2.0-2_source.changes 836s signfile dsc ../example_2.0-2.dsc BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s 836s fixup_changes dsc ../example_2.0-2.dsc ../example_2.0-2_source.changes 836s signfile changes ../example_2.0-2_source.changes BCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s gpg: WARNING: unsafe permissions on homedir '/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg' 836s 836s Successfully signed dsc, changes files 836s + dput --config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf test-dummy ../example_2.0-2_source.changes 836s gpg: ../example_2.0-2_source.changes: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 836s gpg: ../example_2.0-2.dsc: Error checking signature from A3DBCBC039B13D8A: SignatureVerifyError: 0 836s D: Setting host argument. 836s Checking signature on .changes 836s Checking signature on .dsc 836s Package includes an .orig.tar.gz file although the debian revision suggests 836s that it might not be required. Multiple uploads of the .orig.tar.gz may be 836s rejected by the upload queue management software. 836s Uploading to test-dummy (via local to localhost): 836s Successfully uploaded packages. 836s dgit ok: pushed and uploaded 2.0-2 836s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 836s del_lrfetchrefs... 836s del_lrfetchrefs: 45ea71a69fa522ce760afdab8a420200443753e9 refs/dgit-fetch/test-dummy/dgit/sid 836s del_lrfetchrefs: 197399ec17848412720baa3c011db78d38e86226 refs/dgit-fetch/test-dummy/tags/archive/test-dummy/2.0-1 836s del_lrfetchrefs: e450d8ab117b0c1ace1b74c57b7bd1c8ac291b77 refs/dgit-fetch/test-dummy/tags/test-dummy/2.0-1 836s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 836s ' 836s + git push 836s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 836s eb10718..6b22dd5 master -> master 836s + cd .. 836s + t-archive-process-incoming sid 836s + local suite=sid 836s + mv /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-1_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.debian.tar.xz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0-2_source.changes /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming/example_2.0.orig.tar.gz /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 836s + t-archive-query sid 836s + local suite=sid 836s + local dscf=main/example_2.0-2.dsc 836s + t-archive-query-aq sid example 2.0-2 main/example_2.0-2.dsc 836s + local suite=sid 836s + local p=example 836s + local v=2.0-2 836s + local dscf=main/example_2.0-2.dsc 836s + local sha 836s ++ sha256sum 836s + sha='79e34b17d868012fc8f0f0b03d0a05a1dbf71ea4473b87c76c66ca5b68b36e84 -' 836s + echo '2.0-2 79e34b17d868012fc8f0f0b03d0a05a1dbf71ea4473b87c76c66ca5b68b36e84 main/example_2.0-2.dsc' 836s + t-aq-archive-updated sid example 836s + local suite=sid 836s + local p=example 836s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 836s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 836s + perl -wne ' 836s use JSON; 836s use strict; 836s our @v; 836s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 836s push @v, { 836s "version" => "$1", 836s "sha256sum" => "$2", 836s "component" => "$3", 836s "filename" => "$4", 836s }; 836s END { 836s my $json = JSON->new->canonical(); 836s print $json->encode(\@v) or die $!; 836s } 836s ' 836s ++ echo example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz 836s ++ echo git mirror aq 836s + t-setup-done '' 'example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' ' 836s . $troot/lib-gdr 836s t-tstunt-parsechangelog 836s p=example 836s t-git-next-date 836s ' 836s + local savevars= 836s + local 'savedirs=example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq' 836s + local 'importeval= 836s . $troot/lib-gdr 836s t-tstunt-parsechangelog 836s p=example 836s t-git-next-date 836s ' 836s + local import=IMPORT.gdr-convert-gbp 836s + exec 836s + local vn 836s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 836s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 836s print STDERR "saving-exporting $vn\n"; 836s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 836s or die $!; 836s } 836s ' 836s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 836s saving-exporting DGIT_TEST_REAL_GPG_AGENT 836s saving-exporting DGIT_TEST_REAL_GPG 836s saving-exporting DGIT_TEST_REAL_DEBCHANGE 836s + set -e 836s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 836s + tar cf IMPORT.gdr-convert-gbp.tar example example_2.0-1.debian.tar.xz example_2.0-1.dsc example_2.0-1_source.changes example_2.0-1_source.test-dummy.upload example_2.0-2.debian.tar.xz example_2.0-2.dsc example_2.0-2_source.changes example_2.0-2_source.test-dummy.upload example_2.0.orig.tar.gz salsa git mirror aq 836s + printf '\n%s\n' ' 836s . $troot/lib-gdr 836s t-tstunt-parsechangelog 836s p=example 836s t-git-next-date 836s ' 836s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 836s + rc=0 836s + set +x 836s + set +e 836s + pwd 836s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 836s + '[' x '!=' x ']' 836s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 836s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 836s + set -e 836s + test 0 = 0 836s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 836s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 836s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp 836s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 836s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 836s ++ export DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 836s ++ DGIT_TEST_REAL_GPG_AGENT=/usr/bin/gpg-agent 836s ++ export DGIT_TEST_REAL_GPG=/usr/bin/gpg 836s ++ DGIT_TEST_REAL_GPG=/usr/bin/gpg 836s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 836s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 836s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 836s +++ : -D 836s +++ export GDR_TEST_DEBUG 836s +++ t-tstunt debchange 836s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s +++ local var=PATH 836s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s +++ eval ' 836s case "$PATH" in 836s "$tstunt:"*) ;; 836s *":$tstunt:"*) ;; 836s "") PATH="$tstunt" ;; 836s *) PATH="$tstunt:$PATH" ;; 836s esac 836s export PATH 836s ' 836s ++++ case "$PATH" in 836s ++++ export PATH 836s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s +++ local var=PERLLIB 836s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s +++ eval ' 836s case "$PERLLIB" in 836s "$tstunt:"*) ;; 836s *":$tstunt:"*) ;; 836s "") PERLLIB="$tstunt" ;; 836s *) PERLLIB="$tstunt:$PERLLIB" ;; 836s esac 836s export PERLLIB 836s ' 836s ++++ case "$PERLLIB" in 836s ++++ export PERLLIB 836s +++ local f 836s +++ for f in "$@" 836s +++ t-tstunt--save-real debchange 836s +++ local f=debchange 836s +++ case "$f" in 836s +++ local rc 836s +++ local real 836s +++ set +e 836s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 836s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 836s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s ++++ type -p debchange 836s +++ real=/usr/bin/debchange 836s +++ rc=0 836s +++ set -e 836s +++ case $rc in 836s +++ local varname=debchange 836s +++ varname=DGIT_TEST_REAL_DEBCHANGE 836s +++ eval ' 836s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 836s export DGIT_TEST_REAL_DEBCHANGE 836s ' 836s ++++ : /usr/bin/debchange 836s ++++ export DGIT_TEST_REAL_DEBCHANGE 836s +++ f=./debchange 836s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 836s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 836s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 836s ++ t-tstunt-parsechangelog 836s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 836s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s ++ local var=PATH 836s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s ++ eval ' 836s case "$PATH" in 836s "$tstunt:"*) ;; 836s *":$tstunt:"*) ;; 836s "") PATH="$tstunt" ;; 836s *) PATH="$tstunt:$PATH" ;; 836s esac 836s export PATH 836s ' 836s +++ case "$PATH" in 836s +++ export PATH 836s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s ++ local var=PERLLIB 836s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 836s ++ eval ' 836s case "$PERLLIB" in 836s "$tstunt:"*) ;; 836s *":$tstunt:"*) ;; 836s "") PERLLIB="$tstunt" ;; 836s *) PERLLIB="$tstunt:$PERLLIB" ;; 836s esac 836s export PERLLIB 836s ' 836s +++ case "$PERLLIB" in 836s +++ export PERLLIB 836s ++ local f 836s ++ for f in "$@" 836s ++ t-tstunt--save-real dpkg-parsechangelog 836s ++ local f=dpkg-parsechangelog 836s ++ case "$f" in 836s ++ local rc 836s ++ local real 836s ++ set +e 836s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 836s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 836s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 836s +++ type -p dpkg-parsechangelog 836s ++ real=/usr/bin/dpkg-parsechangelog 836s ++ rc=0 836s ++ set -e 836s ++ case $rc in 836s ++ local varname=dpkg_parsechangelog 836s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 836s ++ eval ' 836s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 836s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 836s ' 836s +++ : /usr/bin/dpkg-parsechangelog 836s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 836s ++ f=./dpkg-parsechangelog 836s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 836s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 836s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 836s ++ for f in "$@" 836s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 836s ++ local f=Dpkg/Changelog/Parse.pm 836s ++ case "$f" in 836s ++ return 836s ++ f=./Dpkg/Changelog/Parse.pm 836s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 836s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 836s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 836s ++ p=example 836s ++ t-git-next-date 836s ++ GIT_COMMITTER_DATE='1530000001 +0100' 836s ++ GIT_AUTHOR_DATE='1530000001 +0100' 836s + cd example 836s + b=gdr-unprocessable/origin 836s + git checkout gdr-unprocessable/origin 836s Switched to branch 'gdr-unprocessable/origin' 836s + t-expect-fail 'E:maybe you needed git-debrebase convert-from' t-git-debrebase quick 836s + local 'mpat=E:maybe you needed git-debrebase convert-from' 836s + shift 836s + set +o pipefail 836s + LC_MESSAGES=C 836s + LANGUAGE=C 836s + t-git-debrebase quick 836s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local gdr=git-debrebase 836s + : ' 836s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 836s + git-debrebase --dgit=dgit -D quick 836s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 836s git-debrebase ffq check_specs * 836s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 836s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 836s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 836s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches","Parents" => [{"Ix" => 0,"Differs" => 4,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"}],"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445"} 836s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 836s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 836s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 836s git-debrebase = Pseudomerge {"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Contributor" => {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},"Msg" => "Merge branch 'upstream' into quilt-tip\n","Parents" => [$VAR1->{"Contributor"},{"Differs" => 48,"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Type" => "Pseudomerge","Overwritten" => [$VAR1->{"Parents"}[1]],"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 836s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 836s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 836s git-debrebase = Upstream {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Msg" => "Add *.o to .gitignore\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2,"Ix" => 0}],"Type" => "Upstream"} 836s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 836s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 836s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}]} 836s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 836s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 836s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 836s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 836s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 836s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Msg" => "WIP\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Type" => "Packaging"} 836s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 836s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 836s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"Type" => "Packaging","Msg" => "WIP\n","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 836s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 836s git-debrebase ** Unknown 836s git-debrebase *** WALK BOMB unrecognised 836s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 836s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 836s 836s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 836s git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? 836s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 836s + local 'ps=255 0' 836s + set -o pipefail 836s + case $ps in 836s + t-grep-mpat 'E:maybe you needed git-debrebase convert-from' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local 'mpat=E:maybe you needed git-debrebase convert-from' 836s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local grepper=fgrep 836s + case "$mpat" in 836s + case "$mpat" in 836s + grepper=egrep 836s + mpat='maybe you needed git-debrebase convert-from' 836s + egrep -e 'maybe you needed git-debrebase convert-from' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. 836s + git update-ref refs/ffq-prev/heads/gdr-unprocessable/origin master 836s + t-expect-fail 'E:Consider git-debrebase scrap' t-git-debrebase quick 836s + local 'mpat=E:Consider git-debrebase scrap' 836s + shift 836s + set +o pipefail 836s + LC_MESSAGES=C 836s + LANGUAGE=C 836s + t-git-debrebase quick 836s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local gdr=git-debrebase 836s + : ' 836s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 836s + git-debrebase --dgit=dgit -D quick 836s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 836s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 836s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 836s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 836s git-debrebase = AddPatches {"Type" => "AddPatches","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}]} 836s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 836s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 836s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 836s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Merge branch 'upstream' into quilt-tip\n","Overwritten" => [{"Ix" => 1,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 836s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 836s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 836s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","Type" => "Upstream","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 836s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 836s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 836s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Parents" => [{"Differs" => 50,"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed"} 836s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 836s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 836s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n"} 836s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 836s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 836s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Parents" => [{"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Ix" => 0}],"Msg" => "WIP\n","Type" => "Packaging"} 836s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 836s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 836s git-debrebase = Packaging {"Msg" => "WIP\n","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056"} 836s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 836s git-debrebase ** Unknown 836s git-debrebase *** WALK BOMB unrecognised 836s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 836s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 836s 836s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 836s git-debrebase: Branch/history seems mangled - no longer in gdr format. 836s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 836s git-debrebase: Consider git-debrebase scrap, to throw away your recent work. 836s + local 'ps=255 0' 836s + set -o pipefail 836s + case $ps in 836s + t-grep-mpat 'E:Consider git-debrebase scrap' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local 'mpat=E:Consider git-debrebase scrap' 836s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local grepper=fgrep 836s + case "$mpat" in 836s + case "$mpat" in 836s + grepper=egrep 836s + mpat='Consider git-debrebase scrap' 836s + egrep -e 'Consider git-debrebase scrap' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s git-debrebase: Consider git-debrebase scrap, to throw away your recent work. 836s + git update-ref -d refs/ffq-prev/heads/gdr-unprocessable/origin master 836s + git update-ref refs/debrebase-last/heads/gdr-unprocessable/origin HEAD 836s + t-expect-fail 'E:Branch/history seems mangled' t-git-debrebase quick 836s + local 'mpat=E:Branch/history seems mangled' 836s + shift 836s + set +o pipefail 836s + LC_MESSAGES=C 836s + LANGUAGE=C 836s + t-git-debrebase quick 836s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 836s + local gdr=git-debrebase 836s + : ' 836s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 836s + git-debrebase --dgit=dgit -D quick 837s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 837s git-debrebase ffq check_specs * 837s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 837s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 837s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 837s git-debrebase = AddPatches {"Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Parents" => [{"Ix" => 0,"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Differs" => 4}],"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Type" => "AddPatches","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 837s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 837s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 837s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 837s git-debrebase = Pseudomerge {"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2","Differs" => 48,"Ix" => 1}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Pseudomerge","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Overwritten" => [$VAR1->{"Parents"}[1]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 837s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 837s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 837s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Parents" => [{"Ix" => 0,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Add *.o to .gitignore\n","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 837s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 837s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 837s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50,"Ix" => 0}],"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Type" => "Mixed"} 837s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 837s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 837s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Type" => "Packaging","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Msg" => "echo EXAMPLE RULES TARGET\n"} 837s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 837s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 837s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Msg" => "WIP\n","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Type" => "Packaging","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 837s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 837s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 837s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Type" => "Packaging","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32}],"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Msg" => "WIP\n"} 837s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 837s git-debrebase ** Unknown 837s git-debrebase *** WALK BOMB unrecognised 837s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 837s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 837s 837s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 837s git-debrebase: Branch/history seems mangled - no longer in gdr format. 837s git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5). 837s + local 'ps=255 0' 837s + set -o pipefail 837s + case $ps in 837s + t-grep-mpat 'E:Branch/history seems mangled' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s + local 'mpat=E:Branch/history seems mangled' 837s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s + local grepper=fgrep 837s + case "$mpat" in 837s + case "$mpat" in 837s + grepper=egrep 837s + mpat='Branch/history seems mangled' 837s + egrep -e 'Branch/history seems mangled' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s git-debrebase: Branch/history seems mangled - no longer in gdr format. 837s ++ grep 'git-debrebase scrap' ../t.output 837s + test '' = '' 837s + git update-ref refs/debrebase-last/heads/gdr-unprocessable/origin master 837s + t-expect-fail 'E:Branch/history mangled, and diverged' t-git-debrebase quick 837s + local 'mpat=E:Branch/history mangled, and diverged' 837s + shift 837s + set +o pipefail 837s + LC_MESSAGES=C 837s + LANGUAGE=C 837s + t-git-debrebase quick 837s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s + local gdr=git-debrebase 837s + : ' 837s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 837s + git-debrebase --dgit=dgit -D quick 837s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 837s git-debrebase ffq check_specs * 837s git-debrebase *** WALK 3bc5395fa4571258183be3d3f389950314c53d4e 0 - 837s git-debrebase get_differs 901ede7c64dd2ca1f1375724351a1aed46807f79 bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 837s git-debrebase classify 3bc5395fa4571258183be3d3f389950314c53d4e $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 901ede7c64dd2ca1f1375724351a1aed46807f79/0x4 837s git-debrebase = AddPatches {"CommitId" => "3bc5395fa4571258183be3d3f389950314c53d4e","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 901ede7c64dd2ca1f1375724351a1aed46807f79\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79","Ix" => 0,"Differs" => 4}],"Type" => "AddPatches"} 837s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 837s git-debrebase get_differs a8b25984b338928272b3ddd50dd036d6db8f83d2 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 837s git-debrebase classify 901ede7c64dd2ca1f1375724351a1aed46807f79 $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 a8b25984b338928272b3ddd50dd036d6db8f83d2/0x30 837s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},{"Ix" => 1,"Differs" => 48,"CommitId" => "a8b25984b338928272b3ddd50dd036d6db8f83d2"}],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent a8b25984b338928272b3ddd50dd036d6db8f83d2\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "901ede7c64dd2ca1f1375724351a1aed46807f79"} 837s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 837s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 837s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"} 837s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 837s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 837s git-debrebase = Mixed {"Parents" => [{"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0,"Differs" => 50}],"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b"} 837s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 837s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 837s git-debrebase = Packaging {"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Parents" => [{"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Msg" => "echo EXAMPLE RULES TARGET\n","Type" => "Packaging"} 837s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 837s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 837s git-debrebase = Packaging {"Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Msg" => "WIP\n","Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9"} 837s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 837s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 837s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0,"Differs" => 32}],"Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"} 837s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 837s git-debrebase ** Unknown 837s git-debrebase *** WALK BOMB unrecognised 837s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 837s git-debrebase ffq_prev_branchinfo branch current refs/heads/gdr-unprocessable/origin 837s 837s git-debrebase: error: found unprocessable commit, cannot cope; origin commit: (commit 2767dfd053a8a3be1e7df2406b5a68ad913a661d) (d.) 837s git-debrebase: Branch/history mangled, and diverged since last git-debrebase. 837s git-debrebase: Maybe you reset to, or rebased from, somewhere inappropriate. 837s + local 'ps=255 0' 837s + set -o pipefail 837s + case $ps in 837s + t-grep-mpat 'E:Branch/history mangled, and diverged' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s + local 'mpat=E:Branch/history mangled, and diverged' 837s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s + local grepper=fgrep 837s + case "$mpat" in 837s + case "$mpat" in 837s + grepper=egrep 837s + mpat='Branch/history mangled, and diverged' 837s + egrep -e 'Branch/history mangled, and diverged' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 837s git-debrebase: Branch/history mangled, and diverged since last git-debrebase. 837s ++ grep 'git-debrebase scrap' ../t.output 837s + test '' = '' 837s + t-ok 837s + : ======================================== 837s + t-check-only-bpd 837s + '[' .. = .. ']' 837s + return 837s + t-fscks 837s + shopt -s nullglob 837s + for d in $tmp/*/.git $tmp/git/*.git 837s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 837s + t-git-fsck 837s ++ git rev-parse --git-dir 837s + local fsckerrs=.git/dgit-test-fsck.errs 837s + set +e 837s + LC_MESSAGES=C 837s + git fsck --no-dangling --strict 837s + tee .git/dgit-test-fsck.errs 837s + ps='0 0' 837s + set -e 837s + local pats 837s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 837s + test '0 0' = '0 0' 837s + pats+=(-e 'notice: HEAD points to an unborn branch') 837s + pats+=(-e 'notice: No default references') 837s + set +e 837s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 837s + rc=1 837s + set -e 837s + case $rc in 837s + for d in $tmp/*/.git $tmp/git/*.git 837s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git/example.git 837s + t-git-fsck 837s ++ git rev-parse --git-dir 837s + local fsckerrs=./dgit-test-fsck.errs 837s + set +e 837s + LC_MESSAGES=C 837s + git fsck --no-dangling --strict 837s + tee ./dgit-test-fsck.errs 837s notice: HEAD points to an unborn branch (master) 837s + ps='0 0' 837s + set -e 837s + local pats 837s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 837s + test '0 0' = '0 0' 837s + pats+=(-e 'notice: HEAD points to an unborn branch') 837s + pats+=(-e 'notice: No default references') 837s + set +e 837s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' ./dgit-test-fsck.errs 837s + rc=1 837s + set -e 837s + case $rc in 837s + t-save-artifacts 837s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts 837s + '[' x/tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts = x ']' 837s + '[' xtmp = x ']' 837s + GZIP=-1v 837s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-unprocessable-hints-artifacts/gdr-unprocessable-hints.tar.gz '--exclude=*.tar' . 837s gzip: warning: GZIP environment variable is deprecated; use an alias or script 837s 79.7% 837s + echo ok. 837s ok. 837s + rc=0 837s + set +x 837s + set +e 837s + pwd 837s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 837s + '[' x '!=' x ']' 837s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 837s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 837s + set -e 837s + test 0 = 0 837s autopkgtest [12:32:11]: test gdr-unprocessable-hints: -----------------------] 837s gdr-unprocessable-hints PASS 837s autopkgtest [12:32:11]: test gdr-unprocessable-hints: - - - - - - - - - - results - - - - - - - - - - 837s autopkgtest [12:32:11]: test gitattributes: preparing testbed 900s autopkgtest [12:33:14]: testbed dpkg architecture: amd64 900s autopkgtest [12:33:14]: testbed apt version: 2.4.13 900s autopkgtest [12:33:14]: @@@@@@@@@@@@@@@@@@@@ test bed setup 900s autopkgtest [12:33:14]: testbed release detected to be: jammy 900s autopkgtest [12:33:14]: updating testbed package index (apt update) 901s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 901s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 901s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 901s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 901s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 901s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 901s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 901s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 901s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 901s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 901s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 901s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 901s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 901s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 901s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 901s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 901s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 904s Fetched 1719 kB in 1s (2898 kB/s) 905s Reading package lists... 905s autopkgtest [12:33:19]: upgrading testbed (apt dist-upgrade and autopurge) 906s Reading package lists... 906s Building dependency tree... 906s Reading state information... 906s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 906s Starting 2 pkgProblemResolver with broken count: 0 906s Done 907s Entering ResolveByKeep 907s 907s The following packages will be upgraded: 907s apt apt-utils libapt-pkg6.0 907s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 907s Need to get 2486 kB of archives. 907s After this operation, 0 B of additional disk space will be used. 907s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 907s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 907s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 908s Fetched 2486 kB in 0s (29.0 MB/s) 908s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 908s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 908s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 908s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 908s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 908s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 908s Unpacking apt (2.4.14) over (2.4.13) ... 908s Setting up apt (2.4.14) ... 909s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 909s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 909s Unpacking apt-utils (2.4.14) over (2.4.13) ... 909s Setting up apt-utils (2.4.14) ... 909s Processing triggers for man-db (2.10.2-1) ... 909s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 910s Reading package lists... 911s Building dependency tree... 911s Reading state information... 911s Starting pkgProblemResolver with broken count: 0 911s Starting 2 pkgProblemResolver with broken count: 0 911s Done 912s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 912s autopkgtest [12:33:26]: rebooting testbed after setup commands that affected boot 925s Reading package lists... 925s Building dependency tree... 925s Reading state information... 925s Starting pkgProblemResolver with broken count: 0 925s Starting 2 pkgProblemResolver with broken count: 0 925s Done 926s The following NEW packages will be installed: 926s autoconf automake autopoint autotools-dev bc bsdgames build-essential 926s chiark-utils-bin cpp cpp-11 debhelper debugedit devscripts dgit 926s dgit-infrastructure dh-autoreconf dh-strip-nondeterminism dput dwz fakeroot 926s faketime g++ g++-11 gcc gcc-11 gcc-11-base gettext git git-buildpackage 926s git-man intltool-debian libarchive-zip-perl libasan6 libatomic1 926s libb-hooks-op-check-perl libc-dev-bin libc6-dev libcc1-0 926s libclass-method-modifiers-perl libclass-xsaccessor-perl libcrypt-dev 926s libdbd-sqlite3-perl libdbi-perl libdebhelper-perl libdevel-callchecker-perl 926s libdynaloader-functions-perl libencode-locale-perl liberror-perl 926s libexporter-tiny-perl libfakeroot libfaketime libfile-dirlist-perl 926s libfile-homedir-perl libfile-listing-perl libfile-stripnondeterminism-perl 926s libfile-touch-perl libfile-which-perl libfl2 libgcc-11-dev libgomp1 926s libhtml-parser-perl libhtml-tagset-perl libhtml-tree-perl 926s libhttp-cookies-perl libhttp-date-perl libhttp-message-perl 926s libhttp-negotiate-perl libimport-into-perl libio-html-perl libio-pty-perl 926s libio-socket-ssl-perl libipc-run-perl libisl23 libitm1 libjson-perl 926s liblist-moreutils-perl liblist-moreutils-xs-perl liblsan0 926s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 926s libmoo-perl libmpc3 libnet-http-perl libnet-ssleay-perl libnsl-dev 926s libparams-classify-perl libquadmath0 librole-tiny-perl libstdc++-11-dev 926s libsub-override-perl libsub-quote-perl libtext-csv-perl libtext-glob-perl 926s libtimedate-perl libtirpc-dev libtool libtry-tiny-perl libtsan0 libubsan1 926s liburi-perl libwww-curl-perl libwww-perl libwww-robotrules-perl 926s linux-libc-dev m4 patchutils perl-openssl-defaults po-debconf 926s python3-dateutil python3-debian python3-gpg rpcsvc-proto sqlite3 wamerican 926s wdiff 926s 0 upgraded, 116 newly installed, 0 to remove and 0 not upgraded. 926s Need to get 74.1 MB of archives. 926s After this operation, 251 MB of additional disk space will be used. 926s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 m4 amd64 1.4.18-5ubuntu2 [199 kB] 926s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 autoconf all 2.71-2 [338 kB] 926s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 autotools-dev all 20220109.1 [44.9 kB] 926s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 automake all 1:1.16.5-1.3 [558 kB] 926s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 autopoint all 0.21-4ubuntu4 [422 kB] 926s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 bc amd64 1.07.1-3build1 [87.6 kB] 926s Get:7 http://ftpmaster.internal/ubuntu jammy/main amd64 wamerican all 2020.12.07-2 [236 kB] 926s Get:8 http://ftpmaster.internal/ubuntu jammy/main amd64 libfl2 amd64 2.6.4-8build2 [10.7 kB] 926s Get:9 http://ftpmaster.internal/ubuntu jammy/universe amd64 bsdgames amd64 2.17-29 [975 kB] 926s Get:10 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc-dev-bin amd64 2.35-0ubuntu3.9 [20.3 kB] 926s Get:11 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 linux-libc-dev amd64 5.15.0-135.146 [1321 kB] 926s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libcrypt-dev amd64 1:4.4.27-1 [112 kB] 926s Get:13 http://ftpmaster.internal/ubuntu jammy/main amd64 rpcsvc-proto amd64 1.4.2-0ubuntu6 [68.5 kB] 926s Get:14 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtirpc-dev amd64 1.3.2-2ubuntu0.1 [192 kB] 926s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libnsl-dev amd64 1.3.0-2build2 [71.3 kB] 926s Get:16 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libc6-dev amd64 2.35-0ubuntu3.9 [2100 kB] 926s Get:17 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11-base amd64 11.4.0-1ubuntu1~22.04 [20.2 kB] 926s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 libisl23 amd64 0.24-2build1 [727 kB] 926s Get:19 http://ftpmaster.internal/ubuntu jammy/main amd64 libmpc3 amd64 1.2.1-2build1 [46.9 kB] 926s Get:20 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 cpp-11 amd64 11.4.0-1ubuntu1~22.04 [10.0 MB] 926s Get:21 http://ftpmaster.internal/ubuntu jammy/main amd64 cpp amd64 4:11.2.0-1ubuntu1 [27.7 kB] 926s Get:22 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libcc1-0 amd64 12.3.0-1ubuntu1~22.04 [48.3 kB] 926s Get:23 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgomp1 amd64 12.3.0-1ubuntu1~22.04 [126 kB] 926s Get:24 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libitm1 amd64 12.3.0-1ubuntu1~22.04 [30.2 kB] 926s Get:25 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libatomic1 amd64 12.3.0-1ubuntu1~22.04 [10.4 kB] 926s Get:26 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libasan6 amd64 11.4.0-1ubuntu1~22.04 [2282 kB] 926s Get:27 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 liblsan0 amd64 12.3.0-1ubuntu1~22.04 [1069 kB] 926s Get:28 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libtsan0 amd64 11.4.0-1ubuntu1~22.04 [2260 kB] 926s Get:29 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libubsan1 amd64 12.3.0-1ubuntu1~22.04 [976 kB] 926s Get:30 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libquadmath0 amd64 12.3.0-1ubuntu1~22.04 [154 kB] 926s Get:31 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libgcc-11-dev amd64 11.4.0-1ubuntu1~22.04 [2517 kB] 926s Get:32 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 gcc-11 amd64 11.4.0-1ubuntu1~22.04 [20.1 MB] 926s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 gcc amd64 4:11.2.0-1ubuntu1 [5112 B] 926s Get:34 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 libstdc++-11-dev amd64 11.4.0-1ubuntu1~22.04 [2101 kB] 926s Get:35 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 g++-11 amd64 11.4.0-1ubuntu1~22.04 [11.4 MB] 926s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 g++ amd64 4:11.2.0-1ubuntu1 [1412 B] 926s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 build-essential amd64 12.9ubuntu3 [4744 B] 926s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libdebhelper-perl all 13.6ubuntu1 [67.2 kB] 926s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libtool all 2.4.6-15build2 [164 kB] 926s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-autoreconf all 20 [16.1 kB] 926s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 libarchive-zip-perl all 1.68-1 [90.2 kB] 926s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-override-perl all 0.09-2 [9532 B] 926s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-stripnondeterminism-perl all 1.13.0-1 [18.1 kB] 926s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 dh-strip-nondeterminism all 1.13.0-1 [5344 B] 926s Get:45 http://ftpmaster.internal/ubuntu jammy/main amd64 debugedit amd64 1:5.0-4build1 [47.2 kB] 926s Get:46 http://ftpmaster.internal/ubuntu jammy/main amd64 dwz amd64 0.14-1build2 [105 kB] 926s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 gettext amd64 0.21-4ubuntu4 [868 kB] 926s Get:48 http://ftpmaster.internal/ubuntu jammy/main amd64 intltool-debian all 0.35.0+20060710.5 [24.9 kB] 926s Get:49 http://ftpmaster.internal/ubuntu jammy/main amd64 po-debconf all 1.0.21+nmu1 [233 kB] 926s Get:50 http://ftpmaster.internal/ubuntu jammy/main amd64 debhelper all 13.6ubuntu1 [923 kB] 926s Get:51 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 926s Get:52 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 926s Get:53 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 926s Get:54 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 926s Get:55 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 926s Get:56 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 926s Get:57 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 926s Get:58 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 926s Get:59 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 926s Get:60 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 926s Get:61 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 926s Get:62 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 926s Get:63 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 926s Get:64 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 926s Get:65 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 926s Get:66 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 926s Get:67 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 926s Get:68 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 926s Get:69 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 926s Get:70 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 926s Get:71 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 926s Get:72 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 926s Get:73 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 926s Get:74 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 926s Get:75 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 926s Get:76 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 926s Get:77 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 926s Get:78 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 926s Get:79 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 926s Get:80 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 926s Get:81 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 926s Get:82 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 926s Get:83 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 926s Get:84 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 926s Get:85 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 926s Get:86 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 926s Get:87 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 926s Get:88 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 926s Get:89 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 926s Get:90 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 926s Get:91 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 926s Get:92 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 926s Get:93 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 926s Get:94 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 926s Get:95 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 926s Get:96 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 926s Get:97 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 926s Get:98 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 926s Get:99 http://ftpmaster.internal/ubuntu jammy/main amd64 libexporter-tiny-perl all 1.002002-1 [36.2 kB] 926s Get:100 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-xs-perl amd64 0.430-2build2 [41.9 kB] 926s Get:101 http://ftpmaster.internal/ubuntu jammy/main amd64 liblist-moreutils-perl all 0.430-2 [38.2 kB] 926s Get:102 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-debian all 0.1.43ubuntu1.1 [107 kB] 926s Get:103 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 python3-gpg amd64 1.16.0-1.2ubuntu4.2 [214 kB] 926s Get:104 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 dput all 1.1.0ubuntu2.1 [44.7 kB] 926s Get:105 http://ftpmaster.internal/ubuntu jammy/main amd64 libjson-perl all 4.04000-1 [81.8 kB] 926s Get:106 http://ftpmaster.internal/ubuntu jammy/main amd64 libtext-glob-perl all 0.11-2 [8042 B] 926s Get:107 http://ftpmaster.internal/ubuntu jammy/universe amd64 libwww-curl-perl amd64 4.17-7build2 [58.9 kB] 926s Get:108 http://ftpmaster.internal/ubuntu jammy/universe amd64 libtext-csv-perl all 2.01-1 [108 kB] 926s Get:109 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit all 9.15 [194 kB] 926s Get:110 http://ftpmaster.internal/ubuntu jammy/main amd64 libdbi-perl amd64 1.643-3build3 [741 kB] 926s Get:111 http://ftpmaster.internal/ubuntu jammy/universe amd64 libdbd-sqlite3-perl amd64 1.70-3build1 [165 kB] 926s Get:112 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 sqlite3 amd64 3.37.2-2ubuntu0.3 [768 kB] 926s Get:113 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 926s Get:114 http://ftpmaster.internal/ubuntu jammy/universe amd64 dgit-infrastructure all 9.15 [40.8 kB] 926s Get:115 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 926s Get:116 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 927s Preconfiguring packages ... 927s Fetched 74.1 MB in 1s (98.1 MB/s) 927s Selecting previously unselected package m4. 927s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 927s Preparing to unpack .../000-m4_1.4.18-5ubuntu2_amd64.deb ... 927s Unpacking m4 (1.4.18-5ubuntu2) ... 927s Selecting previously unselected package autoconf. 927s Preparing to unpack .../001-autoconf_2.71-2_all.deb ... 927s Unpacking autoconf (2.71-2) ... 927s Selecting previously unselected package autotools-dev. 927s Preparing to unpack .../002-autotools-dev_20220109.1_all.deb ... 927s Unpacking autotools-dev (20220109.1) ... 927s Selecting previously unselected package automake. 927s Preparing to unpack .../003-automake_1%3a1.16.5-1.3_all.deb ... 927s Unpacking automake (1:1.16.5-1.3) ... 927s Selecting previously unselected package autopoint. 927s Preparing to unpack .../004-autopoint_0.21-4ubuntu4_all.deb ... 927s Unpacking autopoint (0.21-4ubuntu4) ... 927s Selecting previously unselected package bc. 927s Preparing to unpack .../005-bc_1.07.1-3build1_amd64.deb ... 927s Unpacking bc (1.07.1-3build1) ... 927s Selecting previously unselected package wamerican. 927s Preparing to unpack .../006-wamerican_2020.12.07-2_all.deb ... 927s Unpacking wamerican (2020.12.07-2) ... 927s Selecting previously unselected package libfl2:amd64. 927s Preparing to unpack .../007-libfl2_2.6.4-8build2_amd64.deb ... 927s Unpacking libfl2:amd64 (2.6.4-8build2) ... 927s Selecting previously unselected package bsdgames. 927s Preparing to unpack .../008-bsdgames_2.17-29_amd64.deb ... 927s Unpacking bsdgames (2.17-29) ... 927s Selecting previously unselected package libc-dev-bin. 927s Preparing to unpack .../009-libc-dev-bin_2.35-0ubuntu3.9_amd64.deb ... 927s Unpacking libc-dev-bin (2.35-0ubuntu3.9) ... 927s Selecting previously unselected package linux-libc-dev:amd64. 927s Preparing to unpack .../010-linux-libc-dev_5.15.0-135.146_amd64.deb ... 927s Unpacking linux-libc-dev:amd64 (5.15.0-135.146) ... 927s Selecting previously unselected package libcrypt-dev:amd64. 927s Preparing to unpack .../011-libcrypt-dev_1%3a4.4.27-1_amd64.deb ... 927s Unpacking libcrypt-dev:amd64 (1:4.4.27-1) ... 927s Selecting previously unselected package rpcsvc-proto. 927s Preparing to unpack .../012-rpcsvc-proto_1.4.2-0ubuntu6_amd64.deb ... 927s Unpacking rpcsvc-proto (1.4.2-0ubuntu6) ... 927s Selecting previously unselected package libtirpc-dev:amd64. 927s Preparing to unpack .../013-libtirpc-dev_1.3.2-2ubuntu0.1_amd64.deb ... 927s Unpacking libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 927s Selecting previously unselected package libnsl-dev:amd64. 927s Preparing to unpack .../014-libnsl-dev_1.3.0-2build2_amd64.deb ... 927s Unpacking libnsl-dev:amd64 (1.3.0-2build2) ... 927s Selecting previously unselected package libc6-dev:amd64. 927s Preparing to unpack .../015-libc6-dev_2.35-0ubuntu3.9_amd64.deb ... 927s Unpacking libc6-dev:amd64 (2.35-0ubuntu3.9) ... 928s Selecting previously unselected package gcc-11-base:amd64. 928s Preparing to unpack .../016-gcc-11-base_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libisl23:amd64. 928s Preparing to unpack .../017-libisl23_0.24-2build1_amd64.deb ... 928s Unpacking libisl23:amd64 (0.24-2build1) ... 928s Selecting previously unselected package libmpc3:amd64. 928s Preparing to unpack .../018-libmpc3_1.2.1-2build1_amd64.deb ... 928s Unpacking libmpc3:amd64 (1.2.1-2build1) ... 928s Selecting previously unselected package cpp-11. 928s Preparing to unpack .../019-cpp-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking cpp-11 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package cpp. 928s Preparing to unpack .../020-cpp_4%3a11.2.0-1ubuntu1_amd64.deb ... 928s Unpacking cpp (4:11.2.0-1ubuntu1) ... 928s Selecting previously unselected package libcc1-0:amd64. 928s Preparing to unpack .../021-libcc1-0_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libgomp1:amd64. 928s Preparing to unpack .../022-libgomp1_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libitm1:amd64. 928s Preparing to unpack .../023-libitm1_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libatomic1:amd64. 928s Preparing to unpack .../024-libatomic1_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libasan6:amd64. 928s Preparing to unpack .../025-libasan6_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package liblsan0:amd64. 928s Preparing to unpack .../026-liblsan0_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libtsan0:amd64. 928s Preparing to unpack .../027-libtsan0_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libubsan1:amd64. 928s Preparing to unpack .../028-libubsan1_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libquadmath0:amd64. 928s Preparing to unpack .../029-libquadmath0_12.3.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package libgcc-11-dev:amd64. 928s Preparing to unpack .../030-libgcc-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package gcc-11. 928s Preparing to unpack .../031-gcc-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking gcc-11 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package gcc. 928s Preparing to unpack .../032-gcc_4%3a11.2.0-1ubuntu1_amd64.deb ... 928s Unpacking gcc (4:11.2.0-1ubuntu1) ... 928s Selecting previously unselected package libstdc++-11-dev:amd64. 928s Preparing to unpack .../033-libstdc++-11-dev_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package g++-11. 928s Preparing to unpack .../034-g++-11_11.4.0-1ubuntu1~22.04_amd64.deb ... 928s Unpacking g++-11 (11.4.0-1ubuntu1~22.04) ... 928s Selecting previously unselected package g++. 928s Preparing to unpack .../035-g++_4%3a11.2.0-1ubuntu1_amd64.deb ... 928s Unpacking g++ (4:11.2.0-1ubuntu1) ... 928s Selecting previously unselected package build-essential. 928s Preparing to unpack .../036-build-essential_12.9ubuntu3_amd64.deb ... 928s Unpacking build-essential (12.9ubuntu3) ... 928s Selecting previously unselected package libdebhelper-perl. 928s Preparing to unpack .../037-libdebhelper-perl_13.6ubuntu1_all.deb ... 928s Unpacking libdebhelper-perl (13.6ubuntu1) ... 928s Selecting previously unselected package libtool. 928s Preparing to unpack .../038-libtool_2.4.6-15build2_all.deb ... 928s Unpacking libtool (2.4.6-15build2) ... 928s Selecting previously unselected package dh-autoreconf. 928s Preparing to unpack .../039-dh-autoreconf_20_all.deb ... 928s Unpacking dh-autoreconf (20) ... 928s Selecting previously unselected package libarchive-zip-perl. 929s Preparing to unpack .../040-libarchive-zip-perl_1.68-1_all.deb ... 929s Unpacking libarchive-zip-perl (1.68-1) ... 929s Selecting previously unselected package libsub-override-perl. 929s Preparing to unpack .../041-libsub-override-perl_0.09-2_all.deb ... 929s Unpacking libsub-override-perl (0.09-2) ... 929s Selecting previously unselected package libfile-stripnondeterminism-perl. 929s Preparing to unpack .../042-libfile-stripnondeterminism-perl_1.13.0-1_all.deb ... 929s Unpacking libfile-stripnondeterminism-perl (1.13.0-1) ... 929s Selecting previously unselected package dh-strip-nondeterminism. 929s Preparing to unpack .../043-dh-strip-nondeterminism_1.13.0-1_all.deb ... 929s Unpacking dh-strip-nondeterminism (1.13.0-1) ... 929s Selecting previously unselected package debugedit. 929s Preparing to unpack .../044-debugedit_1%3a5.0-4build1_amd64.deb ... 929s Unpacking debugedit (1:5.0-4build1) ... 929s Selecting previously unselected package dwz. 929s Preparing to unpack .../045-dwz_0.14-1build2_amd64.deb ... 929s Unpacking dwz (0.14-1build2) ... 929s Selecting previously unselected package gettext. 929s Preparing to unpack .../046-gettext_0.21-4ubuntu4_amd64.deb ... 929s Unpacking gettext (0.21-4ubuntu4) ... 929s Selecting previously unselected package intltool-debian. 929s Preparing to unpack .../047-intltool-debian_0.35.0+20060710.5_all.deb ... 929s Unpacking intltool-debian (0.35.0+20060710.5) ... 929s Selecting previously unselected package po-debconf. 929s Preparing to unpack .../048-po-debconf_1.0.21+nmu1_all.deb ... 929s Unpacking po-debconf (1.0.21+nmu1) ... 929s Selecting previously unselected package debhelper. 929s Preparing to unpack .../049-debhelper_13.6ubuntu1_all.deb ... 929s Unpacking debhelper (13.6ubuntu1) ... 929s Selecting previously unselected package libfakeroot:amd64. 929s Preparing to unpack .../050-libfakeroot_1.28-1ubuntu1_amd64.deb ... 929s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 929s Selecting previously unselected package fakeroot. 929s Preparing to unpack .../051-fakeroot_1.28-1ubuntu1_amd64.deb ... 929s Unpacking fakeroot (1.28-1ubuntu1) ... 929s Selecting previously unselected package libfile-dirlist-perl. 929s Preparing to unpack .../052-libfile-dirlist-perl_0.05-2_all.deb ... 929s Unpacking libfile-dirlist-perl (0.05-2) ... 929s Selecting previously unselected package libfile-which-perl. 929s Preparing to unpack .../053-libfile-which-perl_1.23-1_all.deb ... 929s Unpacking libfile-which-perl (1.23-1) ... 929s Selecting previously unselected package libfile-homedir-perl. 929s Preparing to unpack .../054-libfile-homedir-perl_1.006-1_all.deb ... 929s Unpacking libfile-homedir-perl (1.006-1) ... 929s Selecting previously unselected package libfile-touch-perl. 929s Preparing to unpack .../055-libfile-touch-perl_0.12-1_all.deb ... 929s Unpacking libfile-touch-perl (0.12-1) ... 929s Selecting previously unselected package libio-pty-perl. 929s Preparing to unpack .../056-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 929s Unpacking libio-pty-perl (1:1.15-2build2) ... 929s Selecting previously unselected package libipc-run-perl. 929s Preparing to unpack .../057-libipc-run-perl_20200505.0-1_all.deb ... 929s Unpacking libipc-run-perl (20200505.0-1) ... 929s Selecting previously unselected package libclass-method-modifiers-perl. 929s Preparing to unpack .../058-libclass-method-modifiers-perl_2.13-1_all.deb ... 929s Unpacking libclass-method-modifiers-perl (2.13-1) ... 929s Selecting previously unselected package libclass-xsaccessor-perl. 929s Preparing to unpack .../059-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 929s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 929s Selecting previously unselected package libb-hooks-op-check-perl. 929s Preparing to unpack .../060-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 929s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 929s Selecting previously unselected package libdynaloader-functions-perl. 929s Preparing to unpack .../061-libdynaloader-functions-perl_0.003-1.1_all.deb ... 929s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 929s Selecting previously unselected package libdevel-callchecker-perl. 929s Preparing to unpack .../062-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 929s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 929s Selecting previously unselected package libparams-classify-perl. 929s Preparing to unpack .../063-libparams-classify-perl_0.015-1build5_amd64.deb ... 929s Unpacking libparams-classify-perl (0.015-1build5) ... 929s Selecting previously unselected package libmodule-runtime-perl. 929s Preparing to unpack .../064-libmodule-runtime-perl_0.016-1_all.deb ... 929s Unpacking libmodule-runtime-perl (0.016-1) ... 929s Selecting previously unselected package libimport-into-perl. 929s Preparing to unpack .../065-libimport-into-perl_1.002005-1_all.deb ... 929s Unpacking libimport-into-perl (1.002005-1) ... 929s Selecting previously unselected package librole-tiny-perl. 929s Preparing to unpack .../066-librole-tiny-perl_2.002004-1_all.deb ... 929s Unpacking librole-tiny-perl (2.002004-1) ... 929s Selecting previously unselected package libsub-quote-perl. 929s Preparing to unpack .../067-libsub-quote-perl_2.006006-1_all.deb ... 929s Unpacking libsub-quote-perl (2.006006-1) ... 929s Selecting previously unselected package libmoo-perl. 929s Preparing to unpack .../068-libmoo-perl_2.005004-3_all.deb ... 929s Unpacking libmoo-perl (2.005004-3) ... 929s Selecting previously unselected package libencode-locale-perl. 929s Preparing to unpack .../069-libencode-locale-perl_1.05-1.1_all.deb ... 929s Unpacking libencode-locale-perl (1.05-1.1) ... 929s Selecting previously unselected package libtimedate-perl. 929s Preparing to unpack .../070-libtimedate-perl_2.3300-2_all.deb ... 929s Unpacking libtimedate-perl (2.3300-2) ... 929s Selecting previously unselected package libhttp-date-perl. 929s Preparing to unpack .../071-libhttp-date-perl_6.05-1_all.deb ... 929s Unpacking libhttp-date-perl (6.05-1) ... 929s Selecting previously unselected package libfile-listing-perl. 929s Preparing to unpack .../072-libfile-listing-perl_6.14-1_all.deb ... 929s Unpacking libfile-listing-perl (6.14-1) ... 929s Selecting previously unselected package libhtml-tagset-perl. 929s Preparing to unpack .../073-libhtml-tagset-perl_3.20-4_all.deb ... 929s Unpacking libhtml-tagset-perl (3.20-4) ... 929s Selecting previously unselected package liburi-perl. 929s Preparing to unpack .../074-liburi-perl_5.10-1_all.deb ... 929s Unpacking liburi-perl (5.10-1) ... 929s Selecting previously unselected package libhtml-parser-perl:amd64. 929s Preparing to unpack .../075-libhtml-parser-perl_3.76-1build2_amd64.deb ... 929s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 929s Selecting previously unselected package libhtml-tree-perl. 929s Preparing to unpack .../076-libhtml-tree-perl_5.07-2_all.deb ... 929s Unpacking libhtml-tree-perl (5.07-2) ... 929s Selecting previously unselected package libio-html-perl. 929s Preparing to unpack .../077-libio-html-perl_1.004-2_all.deb ... 929s Unpacking libio-html-perl (1.004-2) ... 929s Selecting previously unselected package liblwp-mediatypes-perl. 929s Preparing to unpack .../078-liblwp-mediatypes-perl_6.04-1_all.deb ... 929s Unpacking liblwp-mediatypes-perl (6.04-1) ... 929s Selecting previously unselected package libhttp-message-perl. 929s Preparing to unpack .../079-libhttp-message-perl_6.36-1_all.deb ... 929s Unpacking libhttp-message-perl (6.36-1) ... 929s Selecting previously unselected package libhttp-cookies-perl. 929s Preparing to unpack .../080-libhttp-cookies-perl_6.10-1_all.deb ... 929s Unpacking libhttp-cookies-perl (6.10-1) ... 929s Selecting previously unselected package libhttp-negotiate-perl. 929s Preparing to unpack .../081-libhttp-negotiate-perl_6.01-1_all.deb ... 929s Unpacking libhttp-negotiate-perl (6.01-1) ... 929s Selecting previously unselected package perl-openssl-defaults:amd64. 929s Preparing to unpack .../082-perl-openssl-defaults_5build2_amd64.deb ... 929s Unpacking perl-openssl-defaults:amd64 (5build2) ... 929s Selecting previously unselected package libnet-ssleay-perl:amd64. 929s Preparing to unpack .../083-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 929s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 929s Selecting previously unselected package libio-socket-ssl-perl. 929s Preparing to unpack .../084-libio-socket-ssl-perl_2.074-2_all.deb ... 929s Unpacking libio-socket-ssl-perl (2.074-2) ... 929s Selecting previously unselected package libnet-http-perl. 929s Preparing to unpack .../085-libnet-http-perl_6.22-1_all.deb ... 929s Unpacking libnet-http-perl (6.22-1) ... 929s Selecting previously unselected package liblwp-protocol-https-perl. 929s Preparing to unpack .../086-liblwp-protocol-https-perl_6.10-1_all.deb ... 929s Unpacking liblwp-protocol-https-perl (6.10-1) ... 929s Selecting previously unselected package libtry-tiny-perl. 929s Preparing to unpack .../087-libtry-tiny-perl_0.31-1_all.deb ... 929s Unpacking libtry-tiny-perl (0.31-1) ... 929s Selecting previously unselected package libwww-robotrules-perl. 929s Preparing to unpack .../088-libwww-robotrules-perl_6.02-1_all.deb ... 929s Unpacking libwww-robotrules-perl (6.02-1) ... 929s Selecting previously unselected package libwww-perl. 929s Preparing to unpack .../089-libwww-perl_6.61-1_all.deb ... 929s Unpacking libwww-perl (6.61-1) ... 929s Selecting previously unselected package patchutils. 929s Preparing to unpack .../090-patchutils_0.4.2-1build2_amd64.deb ... 929s Unpacking patchutils (0.4.2-1build2) ... 929s Selecting previously unselected package wdiff. 929s Preparing to unpack .../091-wdiff_1.2.2-2build3_amd64.deb ... 929s Unpacking wdiff (1.2.2-2build3) ... 929s Selecting previously unselected package devscripts. 929s Preparing to unpack .../092-devscripts_2.22.1ubuntu1_amd64.deb ... 929s Unpacking devscripts (2.22.1ubuntu1) ... 929s Selecting previously unselected package liberror-perl. 929s Preparing to unpack .../093-liberror-perl_0.17029-1_all.deb ... 929s Unpacking liberror-perl (0.17029-1) ... 929s Selecting previously unselected package git-man. 929s Preparing to unpack .../094-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 929s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 929s Selecting previously unselected package git. 929s Preparing to unpack .../095-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 929s Unpacking git (1:2.34.1-1ubuntu1.12) ... 930s Selecting previously unselected package python3-dateutil. 930s Preparing to unpack .../096-python3-dateutil_2.8.1-6_all.deb ... 930s Unpacking python3-dateutil (2.8.1-6) ... 930s Selecting previously unselected package git-buildpackage. 930s Preparing to unpack .../097-git-buildpackage_0.9.25_all.deb ... 930s Unpacking git-buildpackage (0.9.25) ... 930s Selecting previously unselected package libexporter-tiny-perl. 930s Preparing to unpack .../098-libexporter-tiny-perl_1.002002-1_all.deb ... 930s Unpacking libexporter-tiny-perl (1.002002-1) ... 930s Selecting previously unselected package liblist-moreutils-xs-perl. 930s Preparing to unpack .../099-liblist-moreutils-xs-perl_0.430-2build2_amd64.deb ... 930s Unpacking liblist-moreutils-xs-perl (0.430-2build2) ... 930s Selecting previously unselected package liblist-moreutils-perl. 930s Preparing to unpack .../100-liblist-moreutils-perl_0.430-2_all.deb ... 930s Unpacking liblist-moreutils-perl (0.430-2) ... 930s Selecting previously unselected package python3-debian. 930s Preparing to unpack .../101-python3-debian_0.1.43ubuntu1.1_all.deb ... 930s Unpacking python3-debian (0.1.43ubuntu1.1) ... 930s Selecting previously unselected package python3-gpg. 930s Preparing to unpack .../102-python3-gpg_1.16.0-1.2ubuntu4.2_amd64.deb ... 930s Unpacking python3-gpg (1.16.0-1.2ubuntu4.2) ... 930s Selecting previously unselected package dput. 930s Preparing to unpack .../103-dput_1.1.0ubuntu2.1_all.deb ... 930s Unpacking dput (1.1.0ubuntu2.1) ... 930s Selecting previously unselected package libjson-perl. 930s Preparing to unpack .../104-libjson-perl_4.04000-1_all.deb ... 930s Unpacking libjson-perl (4.04000-1) ... 930s Selecting previously unselected package libtext-glob-perl. 930s Preparing to unpack .../105-libtext-glob-perl_0.11-2_all.deb ... 930s Unpacking libtext-glob-perl (0.11-2) ... 930s Selecting previously unselected package libwww-curl-perl. 930s Preparing to unpack .../106-libwww-curl-perl_4.17-7build2_amd64.deb ... 930s Unpacking libwww-curl-perl (4.17-7build2) ... 930s Selecting previously unselected package libtext-csv-perl. 930s Preparing to unpack .../107-libtext-csv-perl_2.01-1_all.deb ... 930s Unpacking libtext-csv-perl (2.01-1) ... 930s Selecting previously unselected package dgit. 930s Preparing to unpack .../108-dgit_9.15_all.deb ... 930s Unpacking dgit (9.15) ... 930s Selecting previously unselected package libdbi-perl:amd64. 930s Preparing to unpack .../109-libdbi-perl_1.643-3build3_amd64.deb ... 930s Unpacking libdbi-perl:amd64 (1.643-3build3) ... 930s Selecting previously unselected package libdbd-sqlite3-perl:amd64. 930s Preparing to unpack .../110-libdbd-sqlite3-perl_1.70-3build1_amd64.deb ... 930s Unpacking libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 930s Selecting previously unselected package sqlite3. 930s Preparing to unpack .../111-sqlite3_3.37.2-2ubuntu0.3_amd64.deb ... 930s Unpacking sqlite3 (3.37.2-2ubuntu0.3) ... 930s Selecting previously unselected package chiark-utils-bin. 930s Preparing to unpack .../112-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 930s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 930s Selecting previously unselected package dgit-infrastructure. 930s Preparing to unpack .../113-dgit-infrastructure_9.15_all.deb ... 930s Unpacking dgit-infrastructure (9.15) ... 930s Selecting previously unselected package libfaketime:amd64. 930s Preparing to unpack .../114-libfaketime_0.9.8-9_amd64.deb ... 930s Unpacking libfaketime:amd64 (0.9.8-9) ... 930s Selecting previously unselected package faketime. 930s Preparing to unpack .../115-faketime_0.9.8-9_amd64.deb ... 930s Unpacking faketime (0.9.8-9) ... 930s Setting up wdiff (1.2.2-2build3) ... 930s Setting up gcc-11-base:amd64 (11.4.0-1ubuntu1~22.04) ... 930s Setting up libfile-which-perl (1.23-1) ... 930s Setting up libdynaloader-functions-perl (0.003-1.1) ... 930s Setting up libtext-glob-perl (0.11-2) ... 930s Setting up libclass-method-modifiers-perl (2.13-1) ... 930s Setting up libio-pty-perl (1:1.15-2build2) ... 930s Setting up libarchive-zip-perl (1.68-1) ... 930s Setting up libhtml-tagset-perl (3.20-4) ... 930s Setting up libdebhelper-perl (13.6ubuntu1) ... 930s Setting up liblwp-mediatypes-perl (6.04-1) ... 930s Setting up libtry-tiny-perl (0.31-1) ... 930s Setting up perl-openssl-defaults:amd64 (5build2) ... 930s Setting up linux-libc-dev:amd64 (5.15.0-135.146) ... 930s Setting up bc (1.07.1-3build1) ... 930s Setting up m4 (1.4.18-5ubuntu2) ... 930s Setting up libwww-curl-perl (4.17-7build2) ... 930s Setting up libencode-locale-perl (1.05-1.1) ... 930s Setting up libgomp1:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 930s Setting up libasan6:amd64 (11.4.0-1ubuntu1~22.04) ... 930s Setting up chiark-utils-bin (6.1.2+nmu1) ... 930s Setting up fakeroot (1.28-1ubuntu1) ... 930s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 930s Setting up liberror-perl (0.17029-1) ... 930s Setting up patchutils (0.4.2-1build2) ... 930s Setting up autotools-dev (20220109.1) ... 930s Setting up libtirpc-dev:amd64 (1.3.2-2ubuntu0.1) ... 930s Setting up rpcsvc-proto (1.4.2-0ubuntu6) ... 930s Setting up python3-gpg (1.16.0-1.2ubuntu4.2) ... 930s Setting up python3-debian (0.1.43ubuntu1.1) ... 930s Setting up wamerican (2020.12.07-2) ... 930s Setting up libquadmath0:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up libmpc3:amd64 (1.2.1-2build1) ... 930s Setting up libatomic1:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up libio-html-perl (1.004-2) ... 930s Setting up autopoint (0.21-4ubuntu4) ... 930s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 930s Setting up libipc-run-perl (20200505.0-1) ... 930s Setting up libfl2:amd64 (2.6.4-8build2) ... 930s Setting up liblist-moreutils-xs-perl (0.430-2build2) ... 930s Setting up autoconf (2.71-2) ... 930s Setting up libtimedate-perl (2.3300-2) ... 930s Setting up libubsan1:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up dwz (0.14-1build2) ... 930s Setting up libnsl-dev:amd64 (1.3.0-2build2) ... 930s Setting up libcrypt-dev:amd64 (1:4.4.27-1) ... 930s Setting up libjson-perl (4.04000-1) ... 930s Setting up librole-tiny-perl (2.002004-1) ... 930s Setting up debugedit (1:5.0-4build1) ... 930s Setting up libsub-override-perl (0.09-2) ... 930s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 930s Setting up python3-dateutil (2.8.1-6) ... 930s Setting up libsub-quote-perl (2.006006-1) ... 930s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 930s Setting up libexporter-tiny-perl (1.002002-1) ... 930s Setting up libfile-dirlist-perl (0.05-2) ... 930s Setting up libisl23:amd64 (0.24-2build1) ... 930s Setting up libc-dev-bin (2.35-0ubuntu3.9) ... 930s Setting up libfile-homedir-perl (1.006-1) ... 930s Setting up libcc1-0:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up liburi-perl (5.10-1) ... 930s Setting up sqlite3 (3.37.2-2ubuntu0.3) ... 930s Setting up libfile-touch-perl (0.12-1) ... 930s Setting up libdbi-perl:amd64 (1.643-3build3) ... 930s Setting up liblsan0:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up libitm1:amd64 (12.3.0-1ubuntu1~22.04) ... 930s Setting up libfaketime:amd64 (0.9.8-9) ... 930s Setting up libtext-csv-perl (2.01-1) ... 930s Setting up libtsan0:amd64 (11.4.0-1ubuntu1~22.04) ... 930s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 930s Setting up automake (1:1.16.5-1.3) ... 930s update-alternatives: using /usr/bin/automake-1.16 to provide /usr/bin/automake (automake) in auto mode 930s Setting up libfile-stripnondeterminism-perl (1.13.0-1) ... 930s Setting up cpp-11 (11.4.0-1ubuntu1~22.04) ... 930s Setting up faketime (0.9.8-9) ... 930s Setting up libhttp-date-perl (6.05-1) ... 930s Setting up gettext (0.21-4ubuntu4) ... 930s Setting up libfile-listing-perl (6.14-1) ... 930s Setting up liblist-moreutils-perl (0.430-2) ... 930s Setting up libnet-http-perl (6.22-1) ... 930s Setting up bsdgames (2.17-29) ... 930s update-alternatives: using /usr/games/bsdgames-adventure to provide /usr/games/adventure (adventure) in auto mode 930s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 930s Setting up dput (1.1.0ubuntu2.1) ... 931s Setting up intltool-debian (0.35.0+20060710.5) ... 931s Setting up git (1:2.34.1-1ubuntu1.12) ... 931s Setting up dh-strip-nondeterminism (1.13.0-1) ... 931s Setting up libwww-robotrules-perl (6.02-1) ... 931s Setting up libgcc-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 931s Setting up gcc-11 (11.4.0-1ubuntu1~22.04) ... 931s Setting up cpp (4:11.2.0-1ubuntu1) ... 931s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 931s Setting up libc6-dev:amd64 (2.35-0ubuntu3.9) ... 931s Setting up libdbd-sqlite3-perl:amd64 (1.70-3build1) ... 931s Setting up libio-socket-ssl-perl (2.074-2) ... 931s Setting up libhttp-message-perl (6.36-1) ... 931s Setting up libhttp-negotiate-perl (6.01-1) ... 931s Setting up libhttp-cookies-perl (6.10-1) ... 931s Setting up libtool (2.4.6-15build2) ... 931s Setting up po-debconf (1.0.21+nmu1) ... 931s Setting up libhtml-tree-perl (5.07-2) ... 931s Setting up libparams-classify-perl (0.015-1build5) ... 931s Setting up gcc (4:11.2.0-1ubuntu1) ... 931s Setting up dh-autoreconf (20) ... 931s Setting up libmodule-runtime-perl (0.016-1) ... 931s Setting up libstdc++-11-dev:amd64 (11.4.0-1ubuntu1~22.04) ... 931s Setting up dgit-infrastructure (9.15) ... 931s Setting up g++-11 (11.4.0-1ubuntu1~22.04) ... 931s Setting up libimport-into-perl (1.002005-1) ... 931s Setting up libmoo-perl (2.005004-3) ... 931s Setting up debhelper (13.6ubuntu1) ... 931s Setting up g++ (4:11.2.0-1ubuntu1) ... 931s update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode 931s Setting up build-essential (12.9ubuntu3) ... 931s Setting up liblwp-protocol-https-perl (6.10-1) ... 931s Setting up libwww-perl (6.61-1) ... 931s Setting up devscripts (2.22.1ubuntu1) ... 931s Setting up git-buildpackage (0.9.25) ... 931s Setting up dgit (9.15) ... 931s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 931s Processing triggers for man-db (2.10.2-1) ... 931s Processing triggers for install-info (6.8-4build1) ... 932s autopkgtest [12:33:46]: test gitattributes: [----------------------- 932s ++ set -o pipefail 932s ++ . tests/lib-core 932s ++ . tests/lib-restricts 932s ++ trap ' 932s rc=$? 932s set +x 932s test $rc = 0 || echo " 932s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 932s 932s Most relevant logs are just before assignment rc=$rc 932s Will now do cleanup etc. 932s " 932s set -x 932s set +e 932s pwd 932s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 932s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 932s set -e 932s test $rc = 0 || t-report-failure 932s ' EXIT 932s ++ t-filter-out-git-hyphen-dir 932s ++ local pathent 932s +++ type -p git-rev-parse 932s +++ : 932s ++ pathent= 932s ++ case "$pathent" in 932s ++ return 932s ++ t-set-intree 932s ++ '[' x = x ']' 932s ++ return 932s ++ : -D 932s ++ export DGIT_TEST_DEBUG 932s ++ : x 932s ++ export DGIT_TEST_DEBPUSH_DEBUG 932s ++ : 932s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 932s ++ GIT_COMMITTER_DATE='1530000000 +0100' 932s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 932s ++ GIT_AUTHOR_DATE='1530000000 +0100' 932s ++ export LC_CTYPE=C.UTF-8 932s ++ LC_CTYPE=C.UTF-8 932s ++ unset CDPATH 932s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 932s ++ FILTER_BRANCH_SQUELCH_WARNING=1 932s +++ pwd 932s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 932s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ testname=gitattributes 932s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ bpd=.. 932s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 932s ++ '[' x '!=' x ']' 932s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s +++ pwd 932s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ t-set-using-tmp 932s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 932s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 932s ++ export 'DEBFULLNAME=dgit test git user' 932s ++ DEBFULLNAME='dgit test git user' 932s ++ git config --global user.email dgit-test@debian.example.net 932s ++ git config --global user.name 'dgit test git user' 932s ++ git config --global protocol.ext.allow always 932s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 932s ++ env -0 932s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 932s ++ export DEBCHANGE_VENDOR=dpkg 932s ++ DEBCHANGE_VENDOR=dpkg 932s ++ unset VISUAL 932s ++ unset GIT_EDITOR 932s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 932s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 932s ++ cat 932s ++ schroot=build 932s ++ : aq 932s ++ : archive/test-dummy 932s ++ : sid:unstable 932s ++ t-git-config dgit.default.old-dsc-distro test-dummy 932s ++ git config --global dgit.default.old-dsc-distro test-dummy 932s ++ for import in ${autoimport-gnupg} 932s ++ case "$0" in 932s ++ t-setup-import gnupg 932s ++ local setupname=gnupg 932s ++ local setupsrc 932s ++ local lock 932s ++ '[' x = x ']' 932s ++ setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 932s ++ local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 932s ++ '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 932s ++ with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 932s cd "$1"; shift 932s setupname="$1"; shift 932s simport="$1"; shift 932s if [ -e "$simport" ]; then exit 0; fi 932s env - "$@" \ 932s "tests/setup/$setupname" 932s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gnupg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 932s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 932s + shift 932s + setupname=gnupg 932s + shift 932s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg 932s + shift 932s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gnupg ']' 932s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gitattributes-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gitattributes-stderr --stdout=/tmp/autopkgtest.ztMUxl/gitattributes-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gitattributes -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gitattributes' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gitattributes-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gitattributes-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gnupg 932s ++ set -o pipefail 932s ++ . tests/lib-core 932s ++ . tests/lib-restricts 932s ++ trap ' 932s rc=$? 932s set +x 932s test $rc = 0 || echo " 932s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 932s 932s Most relevant logs are just before assignment rc=$rc 932s Will now do cleanup etc. 932s " 932s set -x 932s set +e 932s pwd 932s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 932s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 932s set -e 932s test $rc = 0 || t-report-failure 932s ' EXIT 932s ++ t-filter-out-git-hyphen-dir 932s ++ local pathent 932s +++ type -p git-rev-parse 932s +++ : 932s ++ pathent= 932s ++ case "$pathent" in 932s ++ return 932s ++ t-set-intree 932s ++ '[' x = x ']' 932s ++ return 932s ++ : -D 932s ++ export DGIT_TEST_DEBUG 932s ++ : x 932s ++ export DGIT_TEST_DEBPUSH_DEBUG 932s ++ : 932s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 932s ++ GIT_COMMITTER_DATE='1530000000 +0100' 932s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 932s ++ GIT_AUTHOR_DATE='1530000000 +0100' 932s ++ export LC_CTYPE=C.UTF-8 932s ++ LC_CTYPE=C.UTF-8 932s ++ unset CDPATH 932s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 932s ++ FILTER_BRANCH_SQUELCH_WARNING=1 932s +++ pwd 932s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 932s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ testname=gnupg 932s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 932s ++ bpd=.. 932s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 932s ++ '[' x '!=' x ']' 932s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s +++ pwd 932s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ t-set-using-tmp 932s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 932s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 932s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 932s ++ export 'DEBFULLNAME=dgit test git user' 932s ++ DEBFULLNAME='dgit test git user' 932s ++ git config --global user.email dgit-test@debian.example.net 932s ++ git config --global user.name 'dgit test git user' 932s ++ git config --global protocol.ext.allow always 932s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 932s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 932s ++ export DEBCHANGE_VENDOR=dpkg 932s ++ DEBCHANGE_VENDOR=dpkg 932s ++ unset VISUAL 932s ++ unset GIT_EDITOR 932s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 932s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 932s ++ cat 932s ++ schroot=build 932s ++ : aq 932s ++ : archive/test-dummy 932s ++ : sid:unstable 932s ++ t-git-config dgit.default.old-dsc-distro test-dummy 932s ++ git config --global dgit.default.old-dsc-distro test-dummy 932s ++ for import in ${autoimport-gnupg} 932s ++ case "$0" in 932s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 932s + cp /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/random_seed /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/gnupg/trustdb.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg 932s + chmod go-rw /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dd.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dm.txt /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/pubring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/random_seed /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/secring.gpg /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/trustdb.gpg 932s + export DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 932s + DGIT_TEST_GNUPG_GLOBAL_LOCK=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg/dgit-test-global-lock 932s + export DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 932s + DGIT_TEST_GNUPG_LOG=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/gnupg-workarounds.log 932s + setup=' 932s export GNUPGHOME=$tmp/gnupg 932s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 932s 932s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < 932s ssb rsa2048 2013-11-17 [E] 932s 932s sec rsa2048 2014-01-26 [SC] 932s 3A82860837A0CD32470F91E62AC1E075F5ED1B25 932s uid [ultimate] Populus Romanus (test key) 932s ssb rsa2048 2014-01-26 [E] 932s 932s sec rsa2048 2014-01-26 [SC] 932s 3B0F3FB8ADEFAEF81E0D0C5C14A868BFAC3BD039 932s uid [ unknown] Hannibal (test key) 932s ssb rsa2048 2014-01-26 [E] 932s 932s + t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' gnupg ' 932s export GNUPGHOME=$tmp/gnupg 932s export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG 932s 932s cat >$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf <$tmp/gnupg/gpg-agent.conf < "$1", 932s "sha256sum" => "$2", 932s "component" => "$3", 932s "filename" => "$4", 932s }; 932s END { 932s my $json = JSON->new->canonical(); 932s print $json->encode(\@v) or die $!; 932s } 932s ' 932s + t-aq-archive-updated new example 932s + local suite=new 932s + local p=example 932s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 932s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/new 932s + perl -wne ' 932s use JSON; 932s use strict; 932s our @v; 932s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 932s push @v, { 932s "version" => "$1", 932s "sha256sum" => "$2", 932s "component" => "$3", 932s "filename" => "$4", 932s }; 932s END { 932s my $json = JSON->new->canonical(); 932s print $json->encode(\@v) or die $!; 932s } 932s ' 932s + ln -sf sid /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/unstable 932s + cat 932s + jsondelim=' },' 932s + cat 932s + t-git-none 932s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 932s + set -e 932s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git 932s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/git-template.tar 932s + bv=1.0 932s + t-worktree 1.0 932s + rm -rf example 932s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0 932s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 932s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 932s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.edit 932s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.0.tar 932s + : ----- prepare badnesses ----- 932s + mkdir af 932s + t-git-config core.eol crlf 932s + git config --global core.eol crlf 932s + printf 'dotfiles too?\n' 932s + echo '.dotfile-attr filter=dgit-test-crazy-f' 932s + badattr text auto 932s + attrname=text 932s + shift 932s + case "$attrname" in 932s + badattr1 text-set text 932s + local filename=text-set 932s + local attrspec=text 932s + echo 'Test file with text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-set text 932s + badattr1 text-unset -text 932s + local filename=text-unset 932s + local attrspec=-text 932s + echo 'Test file with -text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unset -text 932s + badattr1 text-unspec '!text' 932s + local filename=text-unspec 932s + local 'attrspec=!text' 932s + echo 'Test file with !text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unspec '!text' 932s + local val 932s + for val in "$@" 932s + badattr1 text=auto text=auto 932s + local filename=text=auto 932s + local attrspec=text=auto 932s + echo 'Test file with text=auto' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text=auto text=auto 932s + badattr eol lf crlf 932s + attrname=eol 932s + shift 932s + case "$attrname" in 932s + badattr1 eol-set eol 932s + local filename=eol-set 932s + local attrspec=eol 932s + echo 'Test file with eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-set eol 932s + badattr1 eol-unset -eol 932s + local filename=eol-unset 932s + local attrspec=-eol 932s + echo 'Test file with -eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-unset -eol 932s + badattr1 eol-unspec '!eol' 932s + local filename=eol-unspec 932s + local 'attrspec=!eol' 932s + echo 'Test file with !eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-unspec '!eol' 932s + local val 932s + for val in "$@" 932s + badattr1 eol=lf eol=lf 932s + local filename=eol=lf 932s + local attrspec=eol=lf 932s + echo 'Test file with eol=lf' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol=lf eol=lf 932s + for val in "$@" 932s + badattr1 eol=crlf eol=crlf 932s + local filename=eol=crlf 932s + local attrspec=eol=crlf 932s + echo 'Test file with eol=crlf' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol=crlf eol=crlf 932s + badattr ident 932s + attrname=ident 932s + shift 932s + case "$attrname" in 932s + badattr1 ident-set ident 932s + local filename=ident-set 932s + local attrspec=ident 932s + echo 'Test file with ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-set ident 932s + badattr1 ident-unset -ident 932s + local filename=ident-unset 932s + local attrspec=-ident 932s + echo 'Test file with -ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-unset -ident 932s + badattr1 ident-unspec '!ident' 932s + local filename=ident-unspec 932s + local 'attrspec=!ident' 932s + echo 'Test file with !ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-unspec '!ident' 932s + local val 932s + t-git-config filter.dgit-test-crazy-f.smudge '/usr/games/rot13 2' 932s + git config --global filter.dgit-test-crazy-f.smudge '/usr/games/rot13 2' 932s + t-git-config filter.dgit-test-crazy-f.clean '/usr/games/rot13 24' 932s + git config --global filter.dgit-test-crazy-f.clean '/usr/games/rot13 24' 932s + t-git-config filter.dgit-test-crazy-f.requrired true 932s + git config --global filter.dgit-test-crazy-f.requrired true 932s + badattr filter dgit-test-crazy-f 932s + attrname=filter 932s + shift 932s + case "$attrname" in 932s + badattr1 filter-set filter 932s + local filename=filter-set 932s + local attrspec=filter 932s + echo 'Test file with filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-set filter 932s + badattr1 filter-unset -filter 932s + local filename=filter-unset 932s + local attrspec=-filter 932s + echo 'Test file with -filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-unset -filter 932s + badattr1 filter-unspec '!filter' 932s + local filename=filter-unspec 932s + local 'attrspec=!filter' 932s + echo 'Test file with !filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-unspec '!filter' 932s + local val 932s + for val in "$@" 932s + badattr1 filter=dgit-test-crazy-f filter=dgit-test-crazy-f 932s + local filename=filter=dgit-test-crazy-f 932s + local attrspec=filter=dgit-test-crazy-f 932s + echo 'Test file with filter=dgit-test-crazy-f' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter=dgit-test-crazy-f filter=dgit-test-crazy-f 932s + badattr diff 932s + attrname=diff 932s + shift 932s + case "$attrname" in 932s + badattr1 diff-set diff 932s + local filename=diff-set 932s + local attrspec=diff 932s + echo 'Test file with diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-set diff 932s + badattr1 diff-unset -diff 932s + local filename=diff-unset 932s + local attrspec=-diff 932s + echo 'Test file with -diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-unset -diff 932s + badattr1 diff-unspec '!diff' 932s + local filename=diff-unspec 932s + local 'attrspec=!diff' 932s + echo 'Test file with !diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-unspec '!diff' 932s + local val 932s + badattr merge text binary union 932s + attrname=merge 932s + shift 932s + case "$attrname" in 932s + badattr1 merge-set merge 932s + local filename=merge-set 932s + local attrspec=merge 932s + echo 'Test file with merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-set merge 932s + badattr1 merge-unset -merge 932s + local filename=merge-unset 932s + local attrspec=-merge 932s + echo 'Test file with -merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-unset -merge 932s + badattr1 merge-unspec '!merge' 932s + local filename=merge-unspec 932s + local 'attrspec=!merge' 932s + echo 'Test file with !merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-unspec '!merge' 932s + local val 932s + for val in "$@" 932s + badattr1 merge=text merge=text 932s + local filename=merge=text 932s + local attrspec=merge=text 932s + echo 'Test file with merge=text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge=text merge=text 932s + for val in "$@" 932s + badattr1 merge=binary merge=binary 932s + local filename=merge=binary 932s + local attrspec=merge=binary 932s + echo 'Test file with merge=binary' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge=binary merge=binary 932s + for val in "$@" 932s + badattr1 merge=union merge=union 932s + local filename=merge=union 932s + local attrspec=merge=union 932s + echo 'Test file with merge=union' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge=union merge=union 932s + badattr whitespace 932s + attrname=whitespace 932s + shift 932s + case "$attrname" in 932s + badattr1 whitespace-set whitespace 932s + local filename=whitespace-set 932s + local attrspec=whitespace 932s + echo 'Test file with whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-set whitespace 932s + badattr1 whitespace-unset -whitespace 932s + local filename=whitespace-unset 932s + local attrspec=-whitespace 932s + echo 'Test file with -whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-unset -whitespace 932s + badattr1 whitespace-unspec '!whitespace' 932s + local filename=whitespace-unspec 932s + local 'attrspec=!whitespace' 932s + echo 'Test file with !whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-unspec '!whitespace' 932s + local val 932s + badattr export-ignore 932s + attrname=export-ignore 932s + shift 932s + case "$attrname" in 932s + badattr1 export-ignore-set export-ignore 932s + local filename=export-ignore-set 932s + local attrspec=export-ignore 932s + echo 'Test file with export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-set export-ignore 932s + badattr1 export-ignore-unset -export-ignore 932s + local filename=export-ignore-unset 932s + local attrspec=-export-ignore 932s + echo 'Test file with -export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-unset -export-ignore 932s + badattr1 export-ignore-unspec '!export-ignore' 932s + local filename=export-ignore-unspec 932s + local 'attrspec=!export-ignore' 932s + echo 'Test file with !export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-unspec '!export-ignore' 932s + local val 932s + badattr export-subst 932s + attrname=export-subst 932s + shift 932s + case "$attrname" in 932s + badattr1 export-subst-set export-subst 932s + local filename=export-subst-set 932s + local attrspec=export-subst 932s + echo 'Test file with export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-set export-subst 932s + badattr1 export-subst-unset -export-subst 932s + local filename=export-subst-unset 932s + local attrspec=-export-subst 932s + echo 'Test file with -export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-unset -export-subst 932s + badattr1 export-subst-unspec '!export-subst' 932s + local filename=export-subst-unspec 932s + local 'attrspec=!export-subst' 932s + echo 'Test file with !export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-unspec '!export-subst' 932s + local val 932s + badattr delta 932s + attrname=delta 932s + shift 932s + case "$attrname" in 932s + badattr1 delta-set delta 932s + local filename=delta-set 932s + local attrspec=delta 932s + echo 'Test file with delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-set delta 932s + badattr1 delta-unset -delta 932s + local filename=delta-unset 932s + local attrspec=-delta 932s + echo 'Test file with -delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-unset -delta 932s + badattr1 delta-unspec '!delta' 932s + local filename=delta-unspec 932s + local 'attrspec=!delta' 932s + echo 'Test file with !delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-unspec '!delta' 932s + local val 932s + badattr encoding no-such-encoding 932s + attrname=encoding 932s + shift 932s + case "$attrname" in 932s + badattr1 encoding-set encoding 932s + local filename=encoding-set 932s + local attrspec=encoding 932s + echo 'Test file with encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-set encoding 932s + badattr1 encoding-unset -encoding 932s + local filename=encoding-unset 932s + local attrspec=-encoding 932s + echo 'Test file with -encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-unset -encoding 932s + badattr1 encoding-unspec '!encoding' 932s + local filename=encoding-unspec 932s + local 'attrspec=!encoding' 932s + echo 'Test file with !encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-unspec '!encoding' 932s + local val 932s + for val in "$@" 932s + badattr1 encoding=no-such-encoding encoding=no-such-encoding 932s + local filename=encoding=no-such-encoding 932s + local attrspec=encoding=no-such-encoding 932s + echo 'Test file with encoding=no-such-encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding=no-such-encoding encoding=no-such-encoding 932s + badattr working-tree-encoding ISO-8859-1 UTF-16 932s + attrname=working-tree-encoding 932s + shift 932s + case "$attrname" in 932s + badattr1 working-tree-encoding-unset -working-tree-encoding 932s + local filename=working-tree-encoding-unset 932s + local attrspec=-working-tree-encoding 932s + echo 'Test file with -working-tree-encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding-unset -working-tree-encoding 932s + badattr1 working-tree-encoding-unspec '!working-tree-encoding' 932s + local filename=working-tree-encoding-unspec 932s + local 'attrspec=!working-tree-encoding' 932s + echo 'Test file with !working-tree-encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding-unspec '!working-tree-encoding' 932s + local val 932s + for val in "$@" 932s + badattr1 working-tree-encoding=ISO-8859-1 working-tree-encoding=ISO-8859-1 932s + local filename=working-tree-encoding=ISO-8859-1 932s + local attrspec=working-tree-encoding=ISO-8859-1 932s + echo 'Test file with working-tree-encoding=ISO-8859-1' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding=ISO-8859-1 working-tree-encoding=ISO-8859-1 932s + for val in "$@" 932s + badattr1 working-tree-encoding=UTF-16 working-tree-encoding=UTF-16 932s + local filename=working-tree-encoding=UTF-16 932s + local attrspec=working-tree-encoding=UTF-16 932s + echo 'Test file with working-tree-encoding=UTF-16' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding=UTF-16 working-tree-encoding=UTF-16 932s + man gitattributes 932s + perl -ne 'print $1,"\n" if m/^ *(\w[-a-z]*)$/' 932s + exec 932s + read attr 932s + badattr Set 932s + attrname=Set 932s + shift 932s + case "$attrname" in 932s + badattr1 Set-set Set 932s + local filename=Set-set 932s + local attrspec=Set 932s + echo 'Test file with Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-set Set 932s + badattr1 Set-unset -Set 932s + local filename=Set-unset 932s + local attrspec=-Set 932s + echo 'Test file with -Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unset -Set 932s + badattr1 Set-unspec '!Set' 932s + local filename=Set-unspec 932s + local 'attrspec=!Set' 932s + echo 'Test file with !Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unspec '!Set' 932s + local val 932s + read attr 932s + badattr Unset 932s + attrname=Unset 932s + shift 932s + case "$attrname" in 932s + badattr1 Unset-set Unset 932s + local filename=Unset-set 932s + local attrspec=Unset 932s + echo 'Test file with Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-set Unset 932s + badattr1 Unset-unset -Unset 932s + local filename=Unset-unset 932s + local attrspec=-Unset 932s + echo 'Test file with -Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unset -Unset 932s + badattr1 Unset-unspec '!Unset' 932s + local filename=Unset-unspec 932s + local 'attrspec=!Unset' 932s + echo 'Test file with !Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unspec '!Unset' 932s + local val 932s + read attr 932s + badattr Unspecified 932s + attrname=Unspecified 932s + shift 932s + case "$attrname" in 932s + badattr1 Unspecified-set Unspecified 932s + local filename=Unspecified-set 932s + local attrspec=Unspecified 932s + echo 'Test file with Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-set Unspecified 932s + badattr1 Unspecified-unset -Unspecified 932s + local filename=Unspecified-unset 932s + local attrspec=-Unspecified 932s + echo 'Test file with -Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unset -Unspecified 932s + badattr1 Unspecified-unspec '!Unspecified' 932s + local filename=Unspecified-unspec 932s + local 'attrspec=!Unspecified' 932s + echo 'Test file with !Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unspec '!Unspecified' 932s + local val 932s + read attr 932s + badattr text 932s + attrname=text 932s + shift 932s + case "$attrname" in 932s + badattr1 text-set text 932s + local filename=text-set 932s + local attrspec=text 932s + echo 'Test file with text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-set text 932s + badattr1 text-unset -text 932s + local filename=text-unset 932s + local attrspec=-text 932s + echo 'Test file with -text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unset -text 932s + badattr1 text-unspec '!text' 932s + local filename=text-unspec 932s + local 'attrspec=!text' 932s + echo 'Test file with !text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unspec '!text' 932s + local val 932s + read attr 932s + badattr Set 932s + attrname=Set 932s + shift 932s + case "$attrname" in 932s + badattr1 Set-set Set 932s + local filename=Set-set 932s + local attrspec=Set 932s + echo 'Test file with Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-set Set 932s + badattr1 Set-unset -Set 932s + local filename=Set-unset 932s + local attrspec=-Set 932s + echo 'Test file with -Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unset -Set 932s + badattr1 Set-unspec '!Set' 932s + local filename=Set-unspec 932s + local 'attrspec=!Set' 932s + echo 'Test file with !Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unspec '!Set' 932s + local val 932s + read attr 932s + badattr Unset 932s + attrname=Unset 932s + shift 932s + case "$attrname" in 932s + badattr1 Unset-set Unset 932s + local filename=Unset-set 932s + local attrspec=Unset 932s + echo 'Test file with Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-set Unset 932s + badattr1 Unset-unset -Unset 932s + local filename=Unset-unset 932s + local attrspec=-Unset 932s + echo 'Test file with -Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unset -Unset 932s + badattr1 Unset-unspec '!Unset' 932s + local filename=Unset-unspec 932s + local 'attrspec=!Unset' 932s + echo 'Test file with !Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unspec '!Unset' 932s + local val 932s + read attr 932s + badattr Unspecified 932s + attrname=Unspecified 932s + shift 932s + case "$attrname" in 932s + badattr1 Unspecified-set Unspecified 932s + local filename=Unspecified-set 932s + local attrspec=Unspecified 932s + echo 'Test file with Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-set Unspecified 932s + badattr1 Unspecified-unset -Unspecified 932s + local filename=Unspecified-unset 932s + local attrspec=-Unspecified 932s + echo 'Test file with -Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unset -Unspecified 932s + badattr1 Unspecified-unspec '!Unspecified' 932s + local filename=Unspecified-unspec 932s + local 'attrspec=!Unspecified' 932s + echo 'Test file with !Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unspec '!Unspecified' 932s + local val 932s + read attr 932s + badattr eol 932s + attrname=eol 932s + shift 932s + case "$attrname" in 932s + badattr1 eol-set eol 932s + local filename=eol-set 932s + local attrspec=eol 932s + echo 'Test file with eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-set eol 932s + badattr1 eol-unset -eol 932s + local filename=eol-unset 932s + local attrspec=-eol 932s + echo 'Test file with -eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-unset -eol 932s + badattr1 eol-unspec '!eol' 932s + local filename=eol-unspec 932s + local 'attrspec=!eol' 932s + echo 'Test file with !eol' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/eol-unspec '!eol' 932s + local val 932s + read attr 932s + badattr Note 932s + attrname=Note 932s + shift 932s + case "$attrname" in 932s + badattr1 Note-set Note 932s + local filename=Note-set 932s + local attrspec=Note 932s + echo 'Test file with Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-set Note 932s + badattr1 Note-unset -Note 932s + local filename=Note-unset 932s + local attrspec=-Note 932s + echo 'Test file with -Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-unset -Note 932s + badattr1 Note-unspec '!Note' 932s + local filename=Note-unspec 932s + local 'attrspec=!Note' 932s + echo 'Test file with !Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-unspec '!Note' 932s + local val 932s + read attr 932s + badattr working-tree-encoding 932s + attrname=working-tree-encoding 932s + shift 932s + case "$attrname" in 932s + badattr1 working-tree-encoding-unset -working-tree-encoding 932s + local filename=working-tree-encoding-unset 932s + local attrspec=-working-tree-encoding 932s + echo 'Test file with -working-tree-encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding-unset -working-tree-encoding 932s + badattr1 working-tree-encoding-unspec '!working-tree-encoding' 932s + local filename=working-tree-encoding-unspec 932s + local 'attrspec=!working-tree-encoding' 932s + echo 'Test file with !working-tree-encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/working-tree-encoding-unspec '!working-tree-encoding' 932s + local val 932s + read attr 932s + badattr ident 932s + attrname=ident 932s + shift 932s + case "$attrname" in 932s + badattr1 ident-set ident 932s + local filename=ident-set 932s + local attrspec=ident 932s + echo 'Test file with ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-set ident 932s + badattr1 ident-unset -ident 932s + local filename=ident-unset 932s + local attrspec=-ident 932s + echo 'Test file with -ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-unset -ident 932s + badattr1 ident-unspec '!ident' 932s + local filename=ident-unspec 932s + local 'attrspec=!ident' 932s + echo 'Test file with !ident' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/ident-unspec '!ident' 932s + local val 932s + read attr 932s + badattr filter 932s + attrname=filter 932s + shift 932s + case "$attrname" in 932s + badattr1 filter-set filter 932s + local filename=filter-set 932s + local attrspec=filter 932s + echo 'Test file with filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-set filter 932s + badattr1 filter-unset -filter 932s + local filename=filter-unset 932s + local attrspec=-filter 932s + echo 'Test file with -filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-unset -filter 932s + badattr1 filter-unspec '!filter' 932s + local filename=filter-unspec 932s + local 'attrspec=!filter' 932s + echo 'Test file with !filter' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/filter-unspec '!filter' 932s + local val 932s + read attr 932s + badattr required 932s + attrname=required 932s + shift 932s + case "$attrname" in 932s + badattr1 required-set required 932s + local filename=required-set 932s + local attrspec=required 932s + echo 'Test file with required' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/required-set required 932s + badattr1 required-unset -required 932s + local filename=required-unset 932s + local attrspec=-required 932s + echo 'Test file with -required' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/required-unset -required 932s + badattr1 required-unspec '!required' 932s + local filename=required-unspec 932s + local 'attrspec=!required' 932s + echo 'Test file with !required' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/required-unspec '!required' 932s + local val 932s + read attr 932s + badattr Delay 932s + attrname=Delay 932s + shift 932s + case "$attrname" in 932s + badattr1 Delay-set Delay 932s + local filename=Delay-set 932s + local attrspec=Delay 932s + echo 'Test file with Delay' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Delay-set Delay 932s + badattr1 Delay-unset -Delay 932s + local filename=Delay-unset 932s + local attrspec=-Delay 932s + echo 'Test file with -Delay' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Delay-unset -Delay 932s + badattr1 Delay-unspec '!Delay' 932s + local filename=Delay-unspec 932s + local 'attrspec=!Delay' 932s + echo 'Test file with !Delay' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Delay-unspec '!Delay' 932s + local val 932s + read attr 932s + badattr Example 932s + attrname=Example 932s + shift 932s + case "$attrname" in 932s + badattr1 Example-set Example 932s + local filename=Example-set 932s + local attrspec=Example 932s + echo 'Test file with Example' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Example-set Example 932s + badattr1 Example-unset -Example 932s + local filename=Example-unset 932s + local attrspec=-Example 932s + echo 'Test file with -Example' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Example-unset -Example 932s + badattr1 Example-unspec '!Example' 932s + local filename=Example-unspec 932s + local 'attrspec=!Example' 932s + echo 'Test file with !Example' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Example-unspec '!Example' 932s + local val 932s + read attr 932s + badattr diff 932s + attrname=diff 932s + shift 932s + case "$attrname" in 932s + badattr1 diff-set diff 932s + local filename=diff-set 932s + local attrspec=diff 932s + echo 'Test file with diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-set diff 932s + badattr1 diff-unset -diff 932s + local filename=diff-unset 932s + local attrspec=-diff 932s + echo 'Test file with -diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-unset -diff 932s + badattr1 diff-unspec '!diff' 932s + local filename=diff-unspec 932s + local 'attrspec=!diff' 932s + echo 'Test file with !diff' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/diff-unspec '!diff' 932s + local val 932s + read attr 932s + badattr Set 932s + attrname=Set 932s + shift 932s + case "$attrname" in 932s + badattr1 Set-set Set 932s + local filename=Set-set 932s + local attrspec=Set 932s + echo 'Test file with Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-set Set 932s + badattr1 Set-unset -Set 932s + local filename=Set-unset 932s + local attrspec=-Set 932s + echo 'Test file with -Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unset -Set 932s + badattr1 Set-unspec '!Set' 932s + local filename=Set-unspec 932s + local 'attrspec=!Set' 932s + echo 'Test file with !Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unspec '!Set' 932s + local val 932s + read attr 932s + badattr Unset 932s + attrname=Unset 932s + shift 932s + case "$attrname" in 932s + badattr1 Unset-set Unset 932s + local filename=Unset-set 932s + local attrspec=Unset 932s + echo 'Test file with Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-set Unset 932s + badattr1 Unset-unset -Unset 932s + local filename=Unset-unset 932s + local attrspec=-Unset 932s + echo 'Test file with -Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unset -Unset 932s + badattr1 Unset-unspec '!Unset' 932s + local filename=Unset-unspec 932s + local 'attrspec=!Unset' 932s + echo 'Test file with !Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unspec '!Unset' 932s + local val 932s + read attr 932s + badattr Unspecified 932s + attrname=Unspecified 932s + shift 932s + case "$attrname" in 932s + badattr1 Unspecified-set Unspecified 932s + local filename=Unspecified-set 932s + local attrspec=Unspecified 932s + echo 'Test file with Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-set Unspecified 932s + badattr1 Unspecified-unset -Unspecified 932s + local filename=Unspecified-unset 932s + local attrspec=-Unspecified 932s + echo 'Test file with -Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unset -Unspecified 932s + badattr1 Unspecified-unspec '!Unspecified' 932s + local filename=Unspecified-unspec 932s + local 'attrspec=!Unspecified' 932s + echo 'Test file with !Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unspec '!Unspecified' 932s + local val 932s + read attr 932s + badattr String 932s + attrname=String 932s + shift 932s + case "$attrname" in 932s + badattr1 String-set String 932s + local filename=String-set 932s + local attrspec=String 932s + echo 'Test file with String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-set String 932s + badattr1 String-unset -String 932s + local filename=String-unset 932s + local attrspec=-String 932s + echo 'Test file with -String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unset -String 932s + badattr1 String-unspec '!String' 932s + local filename=String-unspec 932s + local 'attrspec=!String' 932s + echo 'Test file with !String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unspec '!String' 932s + local val 932s + read attr 932s + badattr Note 932s + attrname=Note 932s + shift 932s + case "$attrname" in 932s + badattr1 Note-set Note 932s + local filename=Note-set 932s + local attrspec=Note 932s + echo 'Test file with Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-set Note 932s + badattr1 Note-unset -Note 932s + local filename=Note-unset 932s + local attrspec=-Note 932s + echo 'Test file with -Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-unset -Note 932s + badattr1 Note-unspec '!Note' 932s + local filename=Note-unspec 932s + local 'attrspec=!Note' 932s + echo 'Test file with !Note' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Note-unspec '!Note' 932s + local val 932s + read attr 932s + badattr merge 932s + attrname=merge 932s + shift 932s + case "$attrname" in 932s + badattr1 merge-set merge 932s + local filename=merge-set 932s + local attrspec=merge 932s + echo 'Test file with merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-set merge 932s + badattr1 merge-unset -merge 932s + local filename=merge-unset 932s + local attrspec=-merge 932s + echo 'Test file with -merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-unset -merge 932s + badattr1 merge-unspec '!merge' 932s + local filename=merge-unspec 932s + local 'attrspec=!merge' 932s + echo 'Test file with !merge' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/merge-unspec '!merge' 932s + local val 932s + read attr 932s + badattr Set 932s + attrname=Set 932s + shift 932s + case "$attrname" in 932s + badattr1 Set-set Set 932s + local filename=Set-set 932s + local attrspec=Set 932s + echo 'Test file with Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-set Set 932s + badattr1 Set-unset -Set 932s + local filename=Set-unset 932s + local attrspec=-Set 932s + echo 'Test file with -Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unset -Set 932s + badattr1 Set-unspec '!Set' 932s + local filename=Set-unspec 932s + local 'attrspec=!Set' 932s + echo 'Test file with !Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unspec '!Set' 932s + local val 932s + read attr 932s + badattr Unset 932s + attrname=Unset 932s + shift 932s + case "$attrname" in 932s + badattr1 Unset-set Unset 932s + local filename=Unset-set 932s + local attrspec=Unset 932s + echo 'Test file with Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-set Unset 932s + badattr1 Unset-unset -Unset 932s + local filename=Unset-unset 932s + local attrspec=-Unset 932s + echo 'Test file with -Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unset -Unset 932s + badattr1 Unset-unspec '!Unset' 932s + local filename=Unset-unspec 932s + local 'attrspec=!Unset' 932s + echo 'Test file with !Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unspec '!Unset' 932s + local val 932s + read attr 932s + badattr Unspecified 932s + attrname=Unspecified 932s + shift 932s + case "$attrname" in 932s + badattr1 Unspecified-set Unspecified 932s + local filename=Unspecified-set 932s + local attrspec=Unspecified 932s + echo 'Test file with Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-set Unspecified 932s + badattr1 Unspecified-unset -Unspecified 932s + local filename=Unspecified-unset 932s + local attrspec=-Unspecified 932s + echo 'Test file with -Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unset -Unspecified 932s + badattr1 Unspecified-unspec '!Unspecified' 932s + local filename=Unspecified-unspec 932s + local 'attrspec=!Unspecified' 932s + echo 'Test file with !Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unspec '!Unspecified' 932s + local val 932s + read attr 932s + badattr String 932s + attrname=String 932s + shift 932s + case "$attrname" in 932s + badattr1 String-set String 932s + local filename=String-set 932s + local attrspec=String 932s + echo 'Test file with String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-set String 932s + badattr1 String-unset -String 932s + local filename=String-unset 932s + local attrspec=-String 932s + echo 'Test file with -String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unset -String 932s + badattr1 String-unspec '!String' 932s + local filename=String-unspec 932s + local 'attrspec=!String' 932s + echo 'Test file with !String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unspec '!String' 932s + local val 932s + read attr 932s + badattr text 932s + attrname=text 932s + shift 932s + case "$attrname" in 932s + badattr1 text-set text 932s + local filename=text-set 932s + local attrspec=text 932s + echo 'Test file with text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-set text 932s + badattr1 text-unset -text 932s + local filename=text-unset 932s + local attrspec=-text 932s + echo 'Test file with -text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unset -text 932s + badattr1 text-unspec '!text' 932s + local filename=text-unspec 932s + local 'attrspec=!text' 932s + echo 'Test file with !text' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/text-unspec '!text' 932s + local val 932s + read attr 932s + badattr binary 932s + attrname=binary 932s + shift 932s + case "$attrname" in 932s + badattr1 binary-set binary 932s + local filename=binary-set 932s + local attrspec=binary 932s + echo 'Test file with binary' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/binary-set binary 932s + badattr1 binary-unset -binary 932s + local filename=binary-unset 932s + local attrspec=-binary 932s + echo 'Test file with -binary' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/binary-unset -binary 932s + badattr1 binary-unspec '!binary' 932s + local filename=binary-unspec 932s + local 'attrspec=!binary' 932s + echo 'Test file with !binary' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/binary-unspec '!binary' 932s + local val 932s + read attr 932s + badattr union 932s + attrname=union 932s + shift 932s + case "$attrname" in 932s + badattr1 union-set union 932s + local filename=union-set 932s + local attrspec=union 932s + echo 'Test file with union' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/union-set union 932s + badattr1 union-unset -union 932s + local filename=union-unset 932s + local attrspec=-union 932s + echo 'Test file with -union' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/union-unset -union 932s + badattr1 union-unspec '!union' 932s + local filename=union-unspec 932s + local 'attrspec=!union' 932s + echo 'Test file with !union' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/union-unspec '!union' 932s + local val 932s + read attr 932s + badattr conflict-marker-size 932s + attrname=conflict-marker-size 932s + shift 932s + case "$attrname" in 932s + badattr1 conflict-marker-size-set conflict-marker-size 932s + local filename=conflict-marker-size-set 932s + local attrspec=conflict-marker-size 932s + echo 'Test file with conflict-marker-size' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/conflict-marker-size-set conflict-marker-size 932s + badattr1 conflict-marker-size-unset -conflict-marker-size 932s + local filename=conflict-marker-size-unset 932s + local attrspec=-conflict-marker-size 932s + echo 'Test file with -conflict-marker-size' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/conflict-marker-size-unset -conflict-marker-size 932s + badattr1 conflict-marker-size-unspec '!conflict-marker-size' 932s + local filename=conflict-marker-size-unspec 932s + local 'attrspec=!conflict-marker-size' 932s + echo 'Test file with !conflict-marker-size' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/conflict-marker-size-unspec '!conflict-marker-size' 932s + local val 932s + read attr 932s + badattr whitespace 932s + attrname=whitespace 932s + shift 932s + case "$attrname" in 932s + badattr1 whitespace-set whitespace 932s + local filename=whitespace-set 932s + local attrspec=whitespace 932s + echo 'Test file with whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-set whitespace 932s + badattr1 whitespace-unset -whitespace 932s + local filename=whitespace-unset 932s + local attrspec=-whitespace 932s + echo 'Test file with -whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-unset -whitespace 932s + badattr1 whitespace-unspec '!whitespace' 932s + local filename=whitespace-unspec 932s + local 'attrspec=!whitespace' 932s + echo 'Test file with !whitespace' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/whitespace-unspec '!whitespace' 932s + local val 932s + read attr 932s + badattr Set 932s + attrname=Set 932s + shift 932s + case "$attrname" in 932s + badattr1 Set-set Set 932s + local filename=Set-set 932s + local attrspec=Set 932s + echo 'Test file with Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-set Set 932s + badattr1 Set-unset -Set 932s + local filename=Set-unset 932s + local attrspec=-Set 932s + echo 'Test file with -Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unset -Set 932s + badattr1 Set-unspec '!Set' 932s + local filename=Set-unspec 932s + local 'attrspec=!Set' 932s + echo 'Test file with !Set' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Set-unspec '!Set' 932s + local val 932s + read attr 932s + badattr Unset 932s + attrname=Unset 932s + shift 932s + case "$attrname" in 932s + badattr1 Unset-set Unset 932s + local filename=Unset-set 932s + local attrspec=Unset 932s + echo 'Test file with Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-set Unset 932s + badattr1 Unset-unset -Unset 932s + local filename=Unset-unset 932s + local attrspec=-Unset 932s + echo 'Test file with -Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unset -Unset 932s + badattr1 Unset-unspec '!Unset' 932s + local filename=Unset-unspec 932s + local 'attrspec=!Unset' 932s + echo 'Test file with !Unset' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unset-unspec '!Unset' 932s + local val 932s + read attr 932s + badattr Unspecified 932s + attrname=Unspecified 932s + shift 932s + case "$attrname" in 932s + badattr1 Unspecified-set Unspecified 932s + local filename=Unspecified-set 932s + local attrspec=Unspecified 932s + echo 'Test file with Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-set Unspecified 932s + badattr1 Unspecified-unset -Unspecified 932s + local filename=Unspecified-unset 932s + local attrspec=-Unspecified 932s + echo 'Test file with -Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unset -Unspecified 932s + badattr1 Unspecified-unspec '!Unspecified' 932s + local filename=Unspecified-unspec 932s + local 'attrspec=!Unspecified' 932s + echo 'Test file with !Unspecified' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/Unspecified-unspec '!Unspecified' 932s + local val 932s + read attr 932s + badattr String 932s + attrname=String 932s + shift 932s + case "$attrname" in 932s + badattr1 String-set String 932s + local filename=String-set 932s + local attrspec=String 932s + echo 'Test file with String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-set String 932s + badattr1 String-unset -String 932s + local filename=String-unset 932s + local attrspec=-String 932s + echo 'Test file with -String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unset -String 932s + badattr1 String-unspec '!String' 932s + local filename=String-unspec 932s + local 'attrspec=!String' 932s + echo 'Test file with !String' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/String-unspec '!String' 932s + local val 932s + read attr 932s + badattr export-ignore 932s + attrname=export-ignore 932s + shift 932s + case "$attrname" in 932s + badattr1 export-ignore-set export-ignore 932s + local filename=export-ignore-set 932s + local attrspec=export-ignore 932s + echo 'Test file with export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-set export-ignore 932s + badattr1 export-ignore-unset -export-ignore 932s + local filename=export-ignore-unset 932s + local attrspec=-export-ignore 932s + echo 'Test file with -export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-unset -export-ignore 932s + badattr1 export-ignore-unspec '!export-ignore' 932s + local filename=export-ignore-unspec 932s + local 'attrspec=!export-ignore' 932s + echo 'Test file with !export-ignore' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-ignore-unspec '!export-ignore' 932s + local val 932s + read attr 932s + badattr export-subst 932s + attrname=export-subst 932s + shift 932s + case "$attrname" in 932s + badattr1 export-subst-set export-subst 932s + local filename=export-subst-set 932s + local attrspec=export-subst 932s + echo 'Test file with export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-set export-subst 932s + badattr1 export-subst-unset -export-subst 932s + local filename=export-subst-unset 932s + local attrspec=-export-subst 932s + echo 'Test file with -export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-unset -export-subst 932s + badattr1 export-subst-unspec '!export-subst' 932s + local filename=export-subst-unspec 932s + local 'attrspec=!export-subst' 932s + echo 'Test file with !export-subst' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/export-subst-unspec '!export-subst' 932s + local val 932s + read attr 932s + badattr delta 932s + attrname=delta 932s + shift 932s + case "$attrname" in 932s + badattr1 delta-set delta 932s + local filename=delta-set 932s + local attrspec=delta 932s + echo 'Test file with delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-set delta 932s + badattr1 delta-unset -delta 932s + local filename=delta-unset 932s + local attrspec=-delta 932s + echo 'Test file with -delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-unset -delta 932s + badattr1 delta-unspec '!delta' 932s + local filename=delta-unspec 932s + local 'attrspec=!delta' 932s + echo 'Test file with !delta' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/delta-unspec '!delta' 932s + local val 932s + read attr 932s + badattr encoding 932s + attrname=encoding 932s + shift 932s + case "$attrname" in 932s + badattr1 encoding-set encoding 932s + local filename=encoding-set 932s + local attrspec=encoding 932s + echo 'Test file with encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-set encoding 932s + badattr1 encoding-unset -encoding 932s + local filename=encoding-unset 932s + local attrspec=-encoding 932s + echo 'Test file with -encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-unset -encoding 932s + badattr1 encoding-unspec '!encoding' 932s + local filename=encoding-unspec 932s + local 'attrspec=!encoding' 932s + echo 'Test file with !encoding' 932s + printf 'crlf: \r\n' 932s + echo 'id $Id: $' 932s + echo 'id $Id: SPLARK $' 932s + printf '\xEF\xBB\xBF <- UTF-8 BOM\n' 932s + echo af/encoding-unspec '!encoding' 932s + local val 932s + read attr 932s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 932s + : ----- generate the orig ----- 932s + origtar=example_1.0.orig.tar.gz 932s + tar --exclude=debian --exclude=.git -zcf example_1.0.orig.tar.gz example 932s + : ----- test 1.0 native ----- 932s + sfmt_setup 1.1 native 932s + v=1.1 932s + sfmt=native 932s + pdb=example.native 932s + local addpatch=native_addpatch 932s + local convert=native_convert 932s + cp -a example example.native-edit 932s + cd example.native-edit 932s + native_convert 932s + : 932s + dch -v 1.1 -m convert 933s + rm -rf .git 933s + cp ../gitattrs .gitattributes 933s + native_addpatch gitattrs 933s + : 933s + cp -a ../af ../.dotfile-attr . 933s + native_addpatch files 933s + : 933s + cp ../sums . 933s + native_addpatch sums 933s + : 933s + dpkg-source -b . 933s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 933s dpkg-source: warning: source directory 'example.native-edit' is not - 'example-1.1' 933s dpkg-source: info: using source format '1.0' 933s dpkg-source: info: building example in example_1.1.tar.gz 933s dpkg-source: info: building example in example_1.1.dsc 933s + cd .. 933s + sfmt_import norm 933s + inst=norm 933s + dgitargs= 933s + branch=import.native-norm 933s + dscf=example_1.1.dsc 933s + sums=sums.native-norm 933s + wd=example.native-import-norm 933s + mkdir example.native-import-norm 933s + cd example.native-import-norm 933s + git init 933s hint: Using 'master' as the name for the initial branch. This default branch name 933s hint: is subject to change. To configure the initial branch name to use in all 933s hint: of your new repositories, which will suppress this warning, call: 933s hint: 933s hint: git config --global init.defaultBranch 933s hint: 933s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 933s hint: 'development'. The just-created branch can be renamed via this command: 933s hint: 933s hint: git branch -m 933s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm/.git/ 933s + t-dgit-warn-check 0 import-dsc ../example_1.1.dsc +import.native-norm.broken 933s + local warnok=0 933s + shift 933s + local err=stderr.example.native-import-norm 933s + LC_MESSAGES=C 933s + t-dgit import-dsc ../example_1.1.dsc +import.native-norm.broken 933s + tee ../stderr.example.native-import-norm 933s + local dgit=dgit 933s + pwd 933s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 933s + : ' 933s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 933s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.1.dsc +import.native-norm.broken 933s | git rev-parse --show-toplevel 933s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --global '.*' 933s | git config -z --get-regexp --system '.*' 933s | git check-ref-format --normalize refs/heads/import.native-norm.broken 933s => `refs/heads/import.native-norm.broken' 933s | git symbolic-ref -q HEAD 933s => `refs/heads/master' 933s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.native-norm.broken' 933s => `' 933s dgit: warning: importing unsigned .dsc 933s Dgit metadata in .dsc: NO git hash 933s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm/.git/dgit/unpack 933s considering reusing example_1.1.tar.gz: (No such file or directory) linked. 933s using existing example_1.1.tar.gz 933s considering saving example_1.1.tar.gz: (File exists) no need. 933s + dpkg-source -x -- example.dsc 933s dpkg-source: warning: extracting unsigned source package (example.dsc) 933s dpkg-source: info: extracting example in example-1.1 933s dpkg-source: info: unpacking example_1.1.tar.gz 933s CD example-1.1 933s | find -name .git -prune -print0 933s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 933s + git add -Af . 933s | git write-tree 933s => `92b3445db485c4ab49e77e904ae3ac2f9c75f162' 933s import clog search... 933s | dpkg-parsechangelog --format rfc822 --all 933s import clog 1.1 package changelog, entry no.1... 933s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:46 +0000' 933s => `1743424426 +0000' 933s import main commit 933s | git hash-object -w -t commit ../commit.tmp 933s => `b3d9f21bc71823d7216a38a87eab03fe59e3d5fa' 933s synthesised git commit from .dsc 1.1 933s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 933s + git update-ref -m 'dgit import-dsc: ../example_1.1.dsc +' refs/heads/import.native-norm.broken b3d9f21bc71823d7216a38a87eab03fe59e3d5fa 933s | git ls-tree -lrz -- b3d9f21bc71823d7216a38a87eab03fe59e3d5fa: 933s dgit: warning: source tree contains .gitattributes 933s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 933s dgit: import-dsc: results are in git ref refs/heads/import.native-norm.broken 933s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 933s ' 933s + set +e 933s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.native-import-norm 933s dgit: warning: source tree contains .gitattributes 933s + rc=0 933s + set -e 933s + test 0 = 0 933s + git checkout import.native-norm.broken 933s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 933s Switched to branch 'import.native-norm.broken' 933s + sums_check_broken 933s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 933s + for s in ../sums ../$sums.broken 933s + sed 's/[0-9a-f]* //' ../sums 933s + for s in ../sums ../$sums.broken 933s + sed 's/[0-9a-f]* //' ../sums.native-norm.broken 933s + diff -U0 ../sums.nosums ../sums.native-norm.broken.nosums 933s + set +e 933s + diff -U0 ../sums ../sums.native-norm.broken 933s --- ../sums 2025-03-31 12:33:46.080000000 +0000 933s +++ ../sums.native-norm.broken 2025-03-31 12:33:46.692000000 +0000 933s @@ -1 +1 @@ 933s -c02cc0a90a4594bdbba03bd040f628b1a134b660927b29e4f2982de733e658e0 .dotfile-attr 933s +0f4508dc38f8337ff4930617a66f14d1a2a0e5f180cc096fff819d7b9cfeec47 .dotfile-attr 933s @@ -42 +42 @@ 933s -dc7fcbe7b31b42054c61ab25016ad8acc38e3ec6c7d6f3164c3eecc9bd21aaac af/eol=crlf 933s +84a0b2d416076091682e90dc6d5a50a7f97579da19c213f111a534f67b62318f af/eol=crlf 933s @@ -53,2 +53,2 @@ 933s -6d010b304f7cd6f24053dff6b7f23a8a3ec453744ca13988b485cf7b9f347a05 af/filter=dgit-test-crazy-f 933s -d0e2a386441e824a4dc71b09c9563dfb43d5a8c42c6c96f60f4c6825a3096493 af/ident-set 933s +a5b2a88047853e600c31a9b9ed084759d558a18a87055749da22069aec94c407 af/filter=dgit-test-crazy-f 933s +a5c2426e6027fd8f5f355ac65e728da212a8e6f1b322ae0f797967e7f9ad7ab6 af/ident-set 933s @@ -66 +66 @@ 933s -a58789607ac44e8c43710c6304aa824808a20454e7c74cff629e2d0973274b70 af/text-set 933s +856170efc311a9162ba5a2bdd6cae6f437cb7ad290e714517eb0f7004698436b af/text-set 933s @@ -79 +79 @@ 933s -47190c791cccbcc57f590962d79626e814f268ad748407aa02b0851067bf8c2b af/working-tree-encoding=UTF-16 933s +a05852543ae2b0ccac502af29c22188ee25604acb4895adcfe891d49210b3db5 af/working-tree-encoding=UTF-16 933s + rc=1 933s + set -e 933s + test 1 = 1 933s + t-dgit setup-new-tree 933s + local dgit=dgit 933s + pwd 933s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 933s + : ' 933s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 933s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-new-tree 933s | git rev-parse --show-toplevel 933s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --global '.*' 933s | git config -z --get-regexp --system '.*' 933s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 933s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 933s + git config user.name 'dgit test git user' 933s is_gitattrs_setup: found nothing 933s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 933s ' 933s + t-dgit-warn-check 1 import-dsc ../example_1.1.dsc +import.native-norm 933s + local warnok=1 933s + shift 933s + local err=stderr.example.native-import-norm 933s + LC_MESSAGES=C 933s + t-dgit import-dsc ../example_1.1.dsc +import.native-norm 933s + tee ../stderr.example.native-import-norm 933s + local dgit=dgit 933s + pwd 933s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 933s + : ' 933s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 933s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.1.dsc +import.native-norm 933s | git rev-parse --show-toplevel 933s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --local '.*' 933s | git config -z --get-regexp --global '.*' 933s | git config -z --get-regexp --system '.*' 933s | git check-ref-format --normalize refs/heads/import.native-norm 933s => `refs/heads/import.native-norm' 933s | git symbolic-ref -q HEAD 933s => `refs/heads/import.native-norm.broken' 933s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.native-norm' 933s => `' 933s dgit: warning: importing unsigned .dsc 933s Dgit metadata in .dsc: NO git hash 933s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm/.git/dgit/unpack 933s considering reusing example_1.1.tar.gz: (No such file or directory) linked. 933s using existing example_1.1.tar.gz 933s considering saving example_1.1.tar.gz: (File exists) no need. 933s + dpkg-source -x -- example.dsc 934s dpkg-source: warning: extracting unsigned source package (example.dsc) 934s dpkg-source: info: extracting example in example-1.1 934s dpkg-source: info: unpacking example_1.1.tar.gz 934s CD example-1.1 934s | find -name .git -prune -print0 934s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 934s + git add -Af . 934s | git write-tree 934s => `92b3445db485c4ab49e77e904ae3ac2f9c75f162' 934s import clog search... 934s | dpkg-parsechangelog --format rfc822 --all 934s import clog 1.1 package changelog, entry no.1... 934s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:46 +0000' 934s => `1743424426 +0000' 934s import main commit 934s | git hash-object -w -t commit ../commit.tmp 934s => `b3d9f21bc71823d7216a38a87eab03fe59e3d5fa' 934s synthesised git commit from .dsc 1.1 934s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 934s + git update-ref -m 'dgit import-dsc: ../example_1.1.dsc +' refs/heads/import.native-norm b3d9f21bc71823d7216a38a87eab03fe59e3d5fa 934s dgit: import-dsc: results are in git ref refs/heads/import.native-norm 934s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 934s ' 934s + set +e 934s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.native-import-norm 934s + rc=1 934s + set -e 934s + test 1 = 1 934s + git checkout import.native-norm 934s Switched to branch 'import.native-norm' 934s M .dotfile-attr 934s M af/eol=crlf 934s M af/filter=dgit-test-crazy-f 934s M af/ident-set 934s M af/text-set 934s M af/working-tree-encoding=UTF-16 934s + touch .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 934s + git reset --hard 934s HEAD is now at b3d9f21 example (1.1) UNRELEASED; urgency=medium 934s + sums_check 934s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 934s + diff -U0 ../sums ../sums.native-norm.checkout 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:.dotfile-attr 934s + sed -e 's#-$#.dotfile-attr#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Delay-set 934s + sed -e 's#-$#af/Delay-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Delay-unset 934s + sed -e 's#-$#af/Delay-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Delay-unspec 934s + sed -e 's#-$#af/Delay-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Example-set 934s + sed -e 's#-$#af/Example-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Example-unset 934s + sed -e 's#-$#af/Example-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Example-unspec 934s + sed -e 's#-$#af/Example-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Note-set 934s + sed -e 's#-$#af/Note-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/Note-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/Note-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Note-unspec 934s + sed -e 's#-$#af/Note-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Set-set 934s + sed -e 's#-$#af/Set-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/Set-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/Set-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Set-unspec 934s + sed -e 's#-$#af/Set-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/String-set 934s + sed -e 's#-$#af/String-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/String-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/String-unset 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/String-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/String-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Unset-set 934s + sed -e 's#-$#af/Unset-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Unset-unset 934s + sed -e 's#-$#af/Unset-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/Unset-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/Unset-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Unspecified-set 934s + sed -e 's#-$#af/Unspecified-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/Unspecified-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/Unspecified-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/Unspecified-unspec 934s + sed -e 's#-$#af/Unspecified-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/binary-set 934s + sed -e 's#-$#af/binary-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/binary-unset 934s + sed -e 's#-$#af/binary-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/binary-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/binary-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/conflict-marker-size-set 934s + sed -e 's#-$#af/conflict-marker-size-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/conflict-marker-size-unset 934s + sed -e 's#-$#af/conflict-marker-size-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/conflict-marker-size-unspec 934s + sed -e 's#-$#af/conflict-marker-size-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/delta-set 934s + sed -e 's#-$#af/delta-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/delta-unset 934s + sed -e 's#-$#af/delta-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/delta-unspec 934s + sed -e 's#-$#af/delta-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/diff-set 934s + sed -e 's#-$#af/diff-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/diff-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/diff-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/diff-unspec 934s + sed -e 's#-$#af/diff-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/encoding-set#' 934s + git cat-file blob refs/heads/import.native-norm:af/encoding-set 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/encoding-unset 934s + sed -e 's#-$#af/encoding-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/encoding-unspec 934s + sed -e 's#-$#af/encoding-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/encoding=no-such-encoding 934s + sed -e 's#-$#af/encoding=no-such-encoding#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/eol-set 934s + sed -e 's#-$#af/eol-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/eol-unset 934s + sed -e 's#-$#af/eol-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/eol-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/eol-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/eol=crlf 934s + sed -e 's#-$#af/eol=crlf#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/eol=lf 934s + sed -e 's#-$#af/eol=lf#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/export-ignore-set 934s + sed -e 's#-$#af/export-ignore-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sed -e 's#-$#af/export-ignore-unset#' 934s + sha256sum 934s + git cat-file blob refs/heads/import.native-norm:af/export-ignore-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/export-ignore-unspec 934s + sed -e 's#-$#af/export-ignore-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/export-subst-set 934s + sed -e 's#-$#af/export-subst-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/export-subst-unset 934s + sed -e 's#-$#af/export-subst-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/export-subst-unspec 934s + sed -e 's#-$#af/export-subst-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/filter-set 934s + sed -e 's#-$#af/filter-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/filter-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/filter-unset 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/filter-unspec 934s + sed -e 's#-$#af/filter-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/filter=dgit-test-crazy-f 934s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/ident-set 934s + sed -e 's#-$#af/ident-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/ident-unset 934s + sed -e 's#-$#af/ident-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/ident-unspec 934s + sed -e 's#-$#af/ident-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/merge-set#' 934s + git cat-file blob refs/heads/import.native-norm:af/merge-set 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/merge-unset 934s + sed -e 's#-$#af/merge-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/merge-unspec 934s + sed -e 's#-$#af/merge-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/merge=binary#' 934s + git cat-file blob refs/heads/import.native-norm:af/merge=binary 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/merge=text 934s + sed -e 's#-$#af/merge=text#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/merge=union#' 934s + git cat-file blob refs/heads/import.native-norm:af/merge=union 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/required-set 934s + sed -e 's#-$#af/required-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/required-unset#' 934s + git cat-file blob refs/heads/import.native-norm:af/required-unset 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/required-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/required-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/text-set 934s + sed -e 's#-$#af/text-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/text-unset 934s + sed -e 's#-$#af/text-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/text-unspec 934s + sed -e 's#-$#af/text-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/text=auto 934s + sed -e 's#-$#af/text=auto#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/union-set 934s + sed -e 's#-$#af/union-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/union-unset 934s + sed -e 's#-$#af/union-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/union-unspec 934s + sed -e 's#-$#af/union-unspec#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/whitespace-set 934s + sed -e 's#-$#af/whitespace-set#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/whitespace-unset 934s + sed -e 's#-$#af/whitespace-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/whitespace-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/whitespace-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/working-tree-encoding-unset 934s + sed -e 's#-$#af/working-tree-encoding-unset#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/working-tree-encoding-unspec#' 934s + git cat-file blob refs/heads/import.native-norm:af/working-tree-encoding-unspec 934s + for f in .dotfile-attr af/* 934s + git cat-file blob refs/heads/import.native-norm:af/working-tree-encoding=ISO-8859-1 934s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 934s + sha256sum 934s + for f in .dotfile-attr af/* 934s + sha256sum 934s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 934s + git cat-file blob refs/heads/import.native-norm:af/working-tree-encoding=UTF-16 934s + diff -U0 ../sums ../sums.native-norm 934s + cd .. 934s + : ----- test 1.0 diff ----- 934s + sfmt_setup 1.1 diff 934s + v=1.1 934s + sfmt=diff 934s + pdb=example.diff 934s + local addpatch=diff_addpatch 934s + local convert=diff_convert 934s + cp -a example example.diff-edit 934s + cd example.diff-edit 934s + diff_convert 934s + : 934s + dch -v 1.1 -m convert 934s + rm -rf .git 934s + cp ../gitattrs .gitattributes 934s + diff_addpatch gitattrs 934s + : 934s + cp -a ../af ../.dotfile-attr . 934s + diff_addpatch files 934s + : 934s + cp ../sums . 934s + diff_addpatch sums 934s + : 934s + dpkg-source -b . 934s dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) 934s dpkg-source: warning: source directory 'example.diff-edit' is not - 'example-1.1' 934s dpkg-source: info: using source format '1.0' 934s dpkg-source: info: building example in example_1.1.tar.gz 934s dpkg-source: info: building example in example_1.1.dsc 934s + cd .. 934s + sfmt_import norm 934s + inst=norm 934s + dgitargs= 934s + branch=import.diff-norm 934s + dscf=example_1.1.dsc 934s + sums=sums.diff-norm 934s + wd=example.diff-import-norm 934s + mkdir example.diff-import-norm 934s + cd example.diff-import-norm 934s + git init 934s hint: Using 'master' as the name for the initial branch. This default branch name 934s hint: is subject to change. To configure the initial branch name to use in all 934s hint: of your new repositories, which will suppress this warning, call: 934s hint: 934s hint: git config --global init.defaultBranch 934s hint: 934s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 934s hint: 'development'. The just-created branch can be renamed via this command: 934s hint: 934s hint: git branch -m 934s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm/.git/ 934s + t-dgit-warn-check 0 import-dsc ../example_1.1.dsc +import.diff-norm.broken 934s + local warnok=0 934s + shift 934s + local err=stderr.example.diff-import-norm 934s + LC_MESSAGES=C 934s + t-dgit import-dsc ../example_1.1.dsc +import.diff-norm.broken 934s + tee ../stderr.example.diff-import-norm 934s + local dgit=dgit 934s + pwd 934s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 934s + : ' 934s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 934s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.1.dsc +import.diff-norm.broken 934s | git rev-parse --show-toplevel 934s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm' 934s | git config -z --get-regexp --local '.*' 934s | git config -z --get-regexp --local '.*' 934s | git config -z --get-regexp --global '.*' 934s | git config -z --get-regexp --system '.*' 934s | git check-ref-format --normalize refs/heads/import.diff-norm.broken 934s => `refs/heads/import.diff-norm.broken' 934s | git symbolic-ref -q HEAD 934s => `refs/heads/master' 934s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.diff-norm.broken' 934s => `' 934s dgit: warning: importing unsigned .dsc 934s Dgit metadata in .dsc: NO git hash 934s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm/.git/dgit/unpack 934s considering reusing example_1.1.tar.gz: (No such file or directory) linked. 934s using existing example_1.1.tar.gz 934s considering saving example_1.1.tar.gz: (File exists) no need. 934s + dpkg-source -x -- example.dsc 934s dpkg-source: warning: extracting unsigned source package (example.dsc) 934s dpkg-source: info: extracting example in example-1.1 934s dpkg-source: info: unpacking example_1.1.tar.gz 934s CD example-1.1 934s | find -name .git -prune -print0 934s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 934s + git add -Af . 934s | git write-tree 934s => `a73595742944184dbcd4fc933a31c6505a67171a' 934s import clog search... 934s | dpkg-parsechangelog --format rfc822 --all 934s import clog 1.1 package changelog, entry no.1... 934s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:47 +0000' 934s => `1743424427 +0000' 934s import main commit 934s | git hash-object -w -t commit ../commit.tmp 934s => `317addff26abe4ed43e942af9465b688b1260b1d' 934s synthesised git commit from .dsc 1.1 934s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 934s + git update-ref -m 'dgit import-dsc: ../example_1.1.dsc +' refs/heads/import.diff-norm.broken 317addff26abe4ed43e942af9465b688b1260b1d 934s | git ls-tree -lrz -- 317addff26abe4ed43e942af9465b688b1260b1d: 934s dgit: warning: source tree contains .gitattributes 934s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 934s dgit: import-dsc: results are in git ref refs/heads/import.diff-norm.broken 934s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 934s ' 934s + set +e 934s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.diff-import-norm 934s dgit: warning: source tree contains .gitattributes 934s + rc=0 934s + set -e 934s + test 0 = 0 934s + git checkout import.diff-norm.broken 934s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 934s Switched to branch 'import.diff-norm.broken' 934s + sums_check_broken 934s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 934s + for s in ../sums ../$sums.broken 934s + sed 's/[0-9a-f]* //' ../sums 934s + for s in ../sums ../$sums.broken 934s + sed 's/[0-9a-f]* //' ../sums.diff-norm.broken 934s + diff -U0 ../sums.nosums ../sums.diff-norm.broken.nosums 934s + set +e 934s + diff -U0 ../sums ../sums.diff-norm.broken 934s --- ../sums 2025-03-31 12:33:46.080000000 +0000 934s +++ ../sums.diff-norm.broken 2025-03-31 12:33:48.036000000 +0000 934s @@ -1 +1 @@ 934s -c02cc0a90a4594bdbba03bd040f628b1a134b660927b29e4f2982de733e658e0 .dotfile-attr 934s +0f4508dc38f8337ff4930617a66f14d1a2a0e5f180cc096fff819d7b9cfeec47 .dotfile-attr 934s @@ -42 +42 @@ 934s -dc7fcbe7b31b42054c61ab25016ad8acc38e3ec6c7d6f3164c3eecc9bd21aaac af/eol=crlf 934s +84a0b2d416076091682e90dc6d5a50a7f97579da19c213f111a534f67b62318f af/eol=crlf 934s @@ -53,2 +53,2 @@ 934s -6d010b304f7cd6f24053dff6b7f23a8a3ec453744ca13988b485cf7b9f347a05 af/filter=dgit-test-crazy-f 934s -d0e2a386441e824a4dc71b09c9563dfb43d5a8c42c6c96f60f4c6825a3096493 af/ident-set 934s +a5b2a88047853e600c31a9b9ed084759d558a18a87055749da22069aec94c407 af/filter=dgit-test-crazy-f 934s +a5c2426e6027fd8f5f355ac65e728da212a8e6f1b322ae0f797967e7f9ad7ab6 af/ident-set 934s @@ -66 +66 @@ 934s -a58789607ac44e8c43710c6304aa824808a20454e7c74cff629e2d0973274b70 af/text-set 934s +856170efc311a9162ba5a2bdd6cae6f437cb7ad290e714517eb0f7004698436b af/text-set 934s @@ -79 +79 @@ 934s -47190c791cccbcc57f590962d79626e814f268ad748407aa02b0851067bf8c2b af/working-tree-encoding=UTF-16 934s +a05852543ae2b0ccac502af29c22188ee25604acb4895adcfe891d49210b3db5 af/working-tree-encoding=UTF-16 934s + rc=1 934s + set -e 934s + test 1 = 1 934s + t-dgit setup-new-tree 934s + local dgit=dgit 934s + pwd 934s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 934s + : ' 934s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 934s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-new-tree 935s | git rev-parse --show-toplevel 935s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm' 935s | git config -z --get-regexp --local '.*' 935s | git config -z --get-regexp --local '.*' 935s | git config -z --get-regexp --global '.*' 935s | git config -z --get-regexp --system '.*' 935s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 935s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 935s + git config user.name 'dgit test git user' 935s is_gitattrs_setup: found nothing 935s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 935s ' 935s + t-dgit-warn-check 1 import-dsc ../example_1.1.dsc +import.diff-norm 935s + local warnok=1 935s + shift 935s + local err=stderr.example.diff-import-norm 935s + LC_MESSAGES=C 935s + tee ../stderr.example.diff-import-norm 935s + t-dgit import-dsc ../example_1.1.dsc +import.diff-norm 935s + local dgit=dgit 935s + pwd 935s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 935s + : ' 935s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 935s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.1.dsc +import.diff-norm 935s | git rev-parse --show-toplevel 935s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm' 935s | git config -z --get-regexp --local '.*' 935s | git config -z --get-regexp --local '.*' 935s | git config -z --get-regexp --global '.*' 935s | git config -z --get-regexp --system '.*' 935s | git check-ref-format --normalize refs/heads/import.diff-norm 935s => `refs/heads/import.diff-norm' 935s | git symbolic-ref -q HEAD 935s => `refs/heads/import.diff-norm.broken' 935s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.diff-norm' 935s => `' 935s dgit: warning: importing unsigned .dsc 935s Dgit metadata in .dsc: NO git hash 935s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm/.git/dgit/unpack 935s considering reusing example_1.1.tar.gz: (No such file or directory) linked. 935s using existing example_1.1.tar.gz 935s considering saving example_1.1.tar.gz: (File exists) no need. 935s + dpkg-source -x -- example.dsc 935s dpkg-source: warning: extracting unsigned source package (example.dsc) 935s dpkg-source: info: extracting example in example-1.1 935s dpkg-source: info: unpacking example_1.1.tar.gz 935s CD example-1.1 935s | find -name .git -prune -print0 935s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 935s + git add -Af . 935s | git write-tree 935s => `a73595742944184dbcd4fc933a31c6505a67171a' 935s import clog search... 935s | dpkg-parsechangelog --format rfc822 --all 935s import clog 1.1 package changelog, entry no.1... 935s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:47 +0000' 935s => `1743424427 +0000' 935s import main commit 935s | git hash-object -w -t commit ../commit.tmp 935s => `317addff26abe4ed43e942af9465b688b1260b1d' 935s synthesised git commit from .dsc 1.1 935s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 935s + git update-ref -m 'dgit import-dsc: ../example_1.1.dsc +' refs/heads/import.diff-norm 317addff26abe4ed43e942af9465b688b1260b1d 935s dgit: import-dsc: results are in git ref refs/heads/import.diff-norm 935s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 935s ' 935s + set +e 935s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.diff-import-norm 935s + rc=1 935s + set -e 935s + test 1 = 1 935s + git checkout import.diff-norm 935s Switched to branch 'import.diff-norm' 935s M .dotfile-attr 935s M af/eol=crlf 935s M af/filter=dgit-test-crazy-f 935s M af/ident-set 935s M af/text-set 935s M af/working-tree-encoding=UTF-16 935s + touch .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 935s + git reset --hard 935s HEAD is now at 317addf example (1.1) UNRELEASED; urgency=medium 935s + sums_check 935s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 935s + diff -U0 ../sums ../sums.diff-norm.checkout 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:.dotfile-attr 935s + sed -e 's#-$#.dotfile-attr#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Delay-set 935s + sed -e 's#-$#af/Delay-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Delay-unset 935s + sed -e 's#-$#af/Delay-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Delay-unspec 935s + sed -e 's#-$#af/Delay-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Example-set 935s + sed -e 's#-$#af/Example-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Example-unset 935s + sed -e 's#-$#af/Example-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Example-unspec 935s + sed -e 's#-$#af/Example-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Note-set 935s + sed -e 's#-$#af/Note-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Note-unset 935s + sed -e 's#-$#af/Note-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Note-unspec 935s + sed -e 's#-$#af/Note-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Set-set 935s + sed -e 's#-$#af/Set-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Set-unset 935s + sed -e 's#-$#af/Set-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Set-unspec 935s + sed -e 's#-$#af/Set-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/String-set 935s + sed -e 's#-$#af/String-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/String-unset 935s + sed -e 's#-$#af/String-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/String-unspec 935s + sed -e 's#-$#af/String-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unset-set 935s + sed -e 's#-$#af/Unset-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unset-unset 935s + sed -e 's#-$#af/Unset-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unset-unspec 935s + sed -e 's#-$#af/Unset-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unspecified-set 935s + sed -e 's#-$#af/Unspecified-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unspecified-unset 935s + sed -e 's#-$#af/Unspecified-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/Unspecified-unspec 935s + sed -e 's#-$#af/Unspecified-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/binary-set 935s + sed -e 's#-$#af/binary-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/binary-unset 935s + sed -e 's#-$#af/binary-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/binary-unspec 935s + sed -e 's#-$#af/binary-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/conflict-marker-size-set 935s + sed -e 's#-$#af/conflict-marker-size-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/conflict-marker-size-unset 935s + sed -e 's#-$#af/conflict-marker-size-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/conflict-marker-size-unspec 935s + sed -e 's#-$#af/conflict-marker-size-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/delta-set 935s + sed -e 's#-$#af/delta-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/delta-unset 935s + sed -e 's#-$#af/delta-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/delta-unspec 935s + sed -e 's#-$#af/delta-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/diff-set 935s + sed -e 's#-$#af/diff-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/diff-unset 935s + sed -e 's#-$#af/diff-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/diff-unspec 935s + sed -e 's#-$#af/diff-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/encoding-set 935s + sed -e 's#-$#af/encoding-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/encoding-unset 935s + sed -e 's#-$#af/encoding-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/encoding-unspec 935s + sed -e 's#-$#af/encoding-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/encoding=no-such-encoding 935s + sed -e 's#-$#af/encoding=no-such-encoding#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/eol-set 935s + sed -e 's#-$#af/eol-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/eol-unset 935s + sed -e 's#-$#af/eol-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/eol-unspec 935s + sed -e 's#-$#af/eol-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/eol=crlf 935s + sed -e 's#-$#af/eol=crlf#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/eol=lf 935s + sed -e 's#-$#af/eol=lf#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-ignore-set 935s + sed -e 's#-$#af/export-ignore-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-ignore-unset 935s + sed -e 's#-$#af/export-ignore-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-ignore-unspec 935s + sed -e 's#-$#af/export-ignore-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-subst-set 935s + sed -e 's#-$#af/export-subst-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-subst-unset 935s + sed -e 's#-$#af/export-subst-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/export-subst-unspec 935s + sed -e 's#-$#af/export-subst-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/filter-set 935s + sed -e 's#-$#af/filter-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/filter-unset 935s + sed -e 's#-$#af/filter-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/filter-unspec 935s + sed -e 's#-$#af/filter-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/filter=dgit-test-crazy-f 935s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/ident-set 935s + sed -e 's#-$#af/ident-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/ident-unset 935s + sed -e 's#-$#af/ident-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/ident-unspec 935s + sed -e 's#-$#af/ident-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge-set 935s + sed -e 's#-$#af/merge-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge-unset 935s + sed -e 's#-$#af/merge-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge-unspec 935s + sed -e 's#-$#af/merge-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge=binary 935s + sed -e 's#-$#af/merge=binary#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge=text 935s + sed -e 's#-$#af/merge=text#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/merge=union 935s + sed -e 's#-$#af/merge=union#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/required-set 935s + sed -e 's#-$#af/required-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/required-unset 935s + sed -e 's#-$#af/required-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/required-unspec 935s + sed -e 's#-$#af/required-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/text-set 935s + sed -e 's#-$#af/text-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/text-unset 935s + sed -e 's#-$#af/text-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/text-unspec 935s + sed -e 's#-$#af/text-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/text=auto 935s + sed -e 's#-$#af/text=auto#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/union-set 935s + sed -e 's#-$#af/union-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/union-unset 935s + sed -e 's#-$#af/union-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/union-unspec 935s + sed -e 's#-$#af/union-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/whitespace-set 935s + sed -e 's#-$#af/whitespace-set#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/whitespace-unset 935s + sed -e 's#-$#af/whitespace-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/whitespace-unspec 935s + sed -e 's#-$#af/whitespace-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/working-tree-encoding-unset 935s + sed -e 's#-$#af/working-tree-encoding-unset#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/working-tree-encoding-unspec 935s + sed -e 's#-$#af/working-tree-encoding-unspec#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/working-tree-encoding=ISO-8859-1 935s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 935s + sha256sum 935s + for f in .dotfile-attr af/* 935s + git cat-file blob refs/heads/import.diff-norm:af/working-tree-encoding=UTF-16 935s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 935s + sha256sum 935s + diff -U0 ../sums ../sums.diff-norm 935s + cd .. 935s + : ----- test '3.0 (quilt)' ----- 935s + sfmt_setup 1.0-1 quilt 935s + v=1.0-1 935s + sfmt=quilt 935s + pdb=example.quilt 935s + local addpatch=quilt_addpatch 935s + local convert=quilt_convert 935s + cp -a example example.quilt-edit 935s + cd example.quilt-edit 935s + quilt_convert 935s + mkdir -p debian/source 935s + echo '3.0 (quilt)' 935s + dch -v 1.0-1 -m convert 935s dch warning: Previous package version was Debian native whilst new version is not 935s + rm -rf .git 935s + cp ../gitattrs .gitattributes 935s + quilt_addpatch gitattrs 935s + pname=gitattrs 935s + cat 935s + EDITOR='perl -pi /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/editor.pl' 935s + dpkg-source -iX --commit . gitattrs 935s dpkg-source: info: local changes detected, the modified files are: 935s example.quilt-edit/.gitattributes 935s dpkg-source: info: local changes have been recorded in a new patch: example.quilt-edit/debian/patches/gitattrs 935s + test -f debian/patches/gitattrs 935s + cp -a ../af ../.dotfile-attr . 935s + quilt_addpatch files 935s + pname=files 935s + cat 935s + EDITOR='perl -pi /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/editor.pl' 935s + dpkg-source -iX --commit . files 935s dpkg-source: info: using patch list from debian/patches/series 936s dpkg-source: info: local changes detected, the modified files are: 936s example.quilt-edit/.dotfile-attr 936s example.quilt-edit/af/Delay-set 936s example.quilt-edit/af/Delay-unset 936s example.quilt-edit/af/Delay-unspec 936s example.quilt-edit/af/Example-set 936s example.quilt-edit/af/Example-unset 936s example.quilt-edit/af/Example-unspec 936s example.quilt-edit/af/Note-set 936s example.quilt-edit/af/Note-unset 936s example.quilt-edit/af/Note-unspec 936s example.quilt-edit/af/Set-set 936s example.quilt-edit/af/Set-unset 936s example.quilt-edit/af/Set-unspec 936s example.quilt-edit/af/String-set 936s example.quilt-edit/af/String-unset 936s example.quilt-edit/af/String-unspec 936s example.quilt-edit/af/Unset-set 936s example.quilt-edit/af/Unset-unset 936s example.quilt-edit/af/Unset-unspec 936s example.quilt-edit/af/Unspecified-set 936s example.quilt-edit/af/Unspecified-unset 936s example.quilt-edit/af/Unspecified-unspec 936s example.quilt-edit/af/binary-set 936s example.quilt-edit/af/binary-unset 936s example.quilt-edit/af/binary-unspec 936s example.quilt-edit/af/conflict-marker-size-set 936s example.quilt-edit/af/conflict-marker-size-unset 936s example.quilt-edit/af/conflict-marker-size-unspec 936s example.quilt-edit/af/delta-set 936s example.quilt-edit/af/delta-unset 936s example.quilt-edit/af/delta-unspec 936s example.quilt-edit/af/diff-set 936s example.quilt-edit/af/diff-unset 936s example.quilt-edit/af/diff-unspec 936s example.quilt-edit/af/encoding-set 936s example.quilt-edit/af/encoding-unset 936s example.quilt-edit/af/encoding-unspec 936s example.quilt-edit/af/encoding=no-such-encoding 936s example.quilt-edit/af/eol-set 936s example.quilt-edit/af/eol-unset 936s example.quilt-edit/af/eol-unspec 936s example.quilt-edit/af/eol=crlf 936s example.quilt-edit/af/eol=lf 936s example.quilt-edit/af/export-ignore-set 936s example.quilt-edit/af/export-ignore-unset 936s example.quilt-edit/af/export-ignore-unspec 936s example.quilt-edit/af/export-subst-set 936s example.quilt-edit/af/export-subst-unset 936s example.quilt-edit/af/export-subst-unspec 936s example.quilt-edit/af/filter-set 936s example.quilt-edit/af/filter-unset 936s example.quilt-edit/af/filter-unspec 936s example.quilt-edit/af/filter=dgit-test-crazy-f 936s example.quilt-edit/af/ident-set 936s example.quilt-edit/af/ident-unset 936s example.quilt-edit/af/ident-unspec 936s example.quilt-edit/af/merge-set 936s example.quilt-edit/af/merge-unset 936s example.quilt-edit/af/merge-unspec 936s example.quilt-edit/af/merge=binary 936s example.quilt-edit/af/merge=text 936s example.quilt-edit/af/merge=union 936s example.quilt-edit/af/required-set 936s example.quilt-edit/af/required-unset 936s example.quilt-edit/af/required-unspec 936s example.quilt-edit/af/text-set 936s example.quilt-edit/af/text-unset 936s example.quilt-edit/af/text-unspec 936s example.quilt-edit/af/text=auto 936s example.quilt-edit/af/union-set 936s example.quilt-edit/af/union-unset 936s example.quilt-edit/af/union-unspec 936s example.quilt-edit/af/whitespace-set 936s example.quilt-edit/af/whitespace-unset 936s example.quilt-edit/af/whitespace-unspec 936s example.quilt-edit/af/working-tree-encoding-unset 936s example.quilt-edit/af/working-tree-encoding-unspec 936s example.quilt-edit/af/working-tree-encoding=ISO-8859-1 936s example.quilt-edit/af/working-tree-encoding=UTF-16 936s dpkg-source: info: local changes have been recorded in a new patch: example.quilt-edit/debian/patches/files 936s + test -f debian/patches/files 936s + cp ../sums . 936s + quilt_addpatch sums 936s + pname=sums 936s + cat 936s + EDITOR='perl -pi /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/editor.pl' 936s + dpkg-source -iX --commit . sums 936s dpkg-source: info: using patch list from debian/patches/series 936s dpkg-source: info: local changes detected, the modified files are: 936s example.quilt-edit/sums 936s dpkg-source: info: local changes have been recorded in a new patch: example.quilt-edit/debian/patches/sums 936s + test -f debian/patches/sums 936s + dpkg-source -b . 936s dpkg-source: info: using source format '3.0 (quilt)' 936s dpkg-source: info: building example using existing ./example_1.0.orig.tar.gz 936s dpkg-source: info: using patch list from debian/patches/series 936s dpkg-source: info: building example in example_1.0-1.debian.tar.xz 936s dpkg-source: info: building example in example_1.0-1.dsc 936s + cd .. 936s + sfmt_import norm 936s + inst=norm 936s + dgitargs= 936s + branch=import.quilt-norm 936s + dscf=example_1.0-1.dsc 936s + sums=sums.quilt-norm 936s + wd=example.quilt-import-norm 936s + mkdir example.quilt-import-norm 936s + cd example.quilt-import-norm 936s + git init 936s hint: Using 'master' as the name for the initial branch. This default branch name 936s hint: is subject to change. To configure the initial branch name to use in all 936s hint: of your new repositories, which will suppress this warning, call: 936s hint: 936s hint: git config --global init.defaultBranch 936s hint: 936s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 936s hint: 'development'. The just-created branch can be renamed via this command: 936s hint: 936s hint: git branch -m 936s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm/.git/ 936s + t-dgit-warn-check 0 import-dsc ../example_1.0-1.dsc +import.quilt-norm.broken 936s + local warnok=0 936s + shift 936s + local err=stderr.example.quilt-import-norm 936s + LC_MESSAGES=C 936s + t-dgit import-dsc ../example_1.0-1.dsc +import.quilt-norm.broken 936s + tee ../stderr.example.quilt-import-norm 936s + local dgit=dgit 936s + pwd 936s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 936s + : ' 936s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 936s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.0-1.dsc +import.quilt-norm.broken 936s | git rev-parse --show-toplevel 936s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm' 936s | git config -z --get-regexp --local '.*' 936s | git config -z --get-regexp --local '.*' 936s | git config -z --get-regexp --global '.*' 936s | git config -z --get-regexp --system '.*' 936s | git check-ref-format --normalize refs/heads/import.quilt-norm.broken 936s => `refs/heads/import.quilt-norm.broken' 936s | git symbolic-ref -q HEAD 936s => `refs/heads/master' 936s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.quilt-norm.broken' 936s => `' 936s dgit: warning: importing unsigned .dsc 936s Dgit metadata in .dsc: NO git hash 936s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm/.git/dgit/unpack 936s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 936s using existing example_1.0.orig.tar.gz 936s considering saving example_1.0.orig.tar.gz: (File exists) no need. 936s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 936s using existing example_1.0-1.debian.tar.xz 936s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 936s import considering example_1.0.orig.tar.gz Y .gz orig 936s + chmod -R '+rwX' _unpack-tar 936s CD _unpack-tar 936s | find -name .git -prune -print0 936s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 936s + git add -Af . 936s | git write-tree 936s => `fdedcd44a456ab6feaba5df92682162374065f6b' 936s | git ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 936s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 936s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 936s CD .. 936s import considering example_1.0-1.debian.tar.xz Y .xz (none) 936s + chmod -R '+rwX' _unpack-tar 936s CD _unpack-tar 936s | find -name .git -prune -print0 936s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 936s + git add -Af . 936s | git write-tree 936s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 936s | git ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 936s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 936s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 936s CD .. 936s + dpkg-source --skip-patches -x -- example.dsc 936s dpkg-source: warning: extracting unsigned source package (example.dsc) 936s dpkg-source: info: extracting example in example-1.0 936s dpkg-source: info: unpacking example_1.0.orig.tar.gz 936s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 936s CD example-1.0 936s | find -name .git -prune -print0 936s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 936s + git add -Af . 936s | git write-tree 936s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 936s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 936s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 936s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 936s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 937s + git add -Af . 937s | git write-tree 937s => `e2ad906893da0422c12826f4295302e132b9411b' 937s import clog search... 937s | dpkg-parsechangelog --format rfc822 --all 937s import clog 1.0-1 package changelog, entry no.1... 937s import clog 1.0-1 vs 1.0... 937s import clog 1.0-1 becomes r1 937s import clog 1.0 package changelog, entry no.2... 937s import clog 1.0 vs 1.0... 937s import clog 1.0 becomes r1 937s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 937s => `1743424428 +0000' 937s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 937s => `1431548802 +0000' 937s import tartrees authline Ian Jackson 1743424428 +0000 937s import tartrees r1authline Ian Jackson 1431548802 +0000 937s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 937s | git hash-object -w -t commit --stdin 937s => 70ede04cf05feab175506d8c78fb46392001965e 937s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 937s | git hash-object -w -t commit --stdin 937s => d58ee25caf63580b71bc6b533ed0394e0a29207d 937s import main commit 937s | git hash-object -w -t commit ../commit.tmp 937s => `b647c9a6a515c48170568ec77286622700ab7079' 937s import apply patches... 937s | git hash-object -w -t commit --stdin 937s => 34b428194f4ec517d64a460fca7251da8ffb40a6 937s + git checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 937s + git checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 937s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 937s => `1743424428 +0000' 937s + git checkout -q unpa 937s + git update-ref -d refs/heads/patch-queue/unpa 937s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 937s | git rev-parse 'HEAD~0' 937s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 937s | git rev-parse HEAD: 937s => `e2ad906893da0422c12826f4295302e132b9411b' 937s synthesised git commit from .dsc 1.0-1 937s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 937s + git update-ref -m 'dgit import-dsc: ../example_1.0-1.dsc +' refs/heads/import.quilt-norm.broken 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 937s | git ls-tree -lrz -- 8dd0dacba8cdadfa771a1173f7406cf7b88b908c: 937s dgit: warning: source tree contains .gitattributes 937s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 937s dgit: import-dsc: results are in git ref refs/heads/import.quilt-norm.broken 937s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 937s ' 937s + set +e 937s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-norm 937s dgit: warning: source tree contains .gitattributes 937s + rc=0 937s + set -e 937s + test 0 = 0 937s + git checkout import.quilt-norm.broken 937s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 937s Switched to branch 'import.quilt-norm.broken' 937s + sums_check_broken 937s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 937s + for s in ../sums ../$sums.broken 937s + sed 's/[0-9a-f]* //' ../sums 937s + for s in ../sums ../$sums.broken 937s + sed 's/[0-9a-f]* //' ../sums.quilt-norm.broken 937s + diff -U0 ../sums.nosums ../sums.quilt-norm.broken.nosums 937s + set +e 937s + diff -U0 ../sums ../sums.quilt-norm.broken 937s --- ../sums 2025-03-31 12:33:46.080000000 +0000 937s +++ ../sums.quilt-norm.broken 2025-03-31 12:33:50.344000000 +0000 937s @@ -1 +1 @@ 937s -c02cc0a90a4594bdbba03bd040f628b1a134b660927b29e4f2982de733e658e0 .dotfile-attr 937s +0f4508dc38f8337ff4930617a66f14d1a2a0e5f180cc096fff819d7b9cfeec47 .dotfile-attr 937s @@ -42 +42 @@ 937s -dc7fcbe7b31b42054c61ab25016ad8acc38e3ec6c7d6f3164c3eecc9bd21aaac af/eol=crlf 937s +84a0b2d416076091682e90dc6d5a50a7f97579da19c213f111a534f67b62318f af/eol=crlf 937s @@ -53,2 +53,2 @@ 937s -6d010b304f7cd6f24053dff6b7f23a8a3ec453744ca13988b485cf7b9f347a05 af/filter=dgit-test-crazy-f 937s -d0e2a386441e824a4dc71b09c9563dfb43d5a8c42c6c96f60f4c6825a3096493 af/ident-set 937s +a5b2a88047853e600c31a9b9ed084759d558a18a87055749da22069aec94c407 af/filter=dgit-test-crazy-f 937s +a5c2426e6027fd8f5f355ac65e728da212a8e6f1b322ae0f797967e7f9ad7ab6 af/ident-set 937s @@ -66 +66 @@ 937s -a58789607ac44e8c43710c6304aa824808a20454e7c74cff629e2d0973274b70 af/text-set 937s +856170efc311a9162ba5a2bdd6cae6f437cb7ad290e714517eb0f7004698436b af/text-set 937s @@ -79 +79 @@ 937s -47190c791cccbcc57f590962d79626e814f268ad748407aa02b0851067bf8c2b af/working-tree-encoding=UTF-16 937s +a05852543ae2b0ccac502af29c22188ee25604acb4895adcfe891d49210b3db5 af/working-tree-encoding=UTF-16 937s + rc=1 937s + set -e 937s + test 1 = 1 937s + t-dgit setup-new-tree 937s + local dgit=dgit 937s + pwd 937s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 937s + : ' 937s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 937s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-new-tree 937s | git rev-parse --show-toplevel 937s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm' 937s | git config -z --get-regexp --local '.*' 937s | git config -z --get-regexp --local '.*' 937s | git config -z --get-regexp --global '.*' 937s | git config -z --get-regexp --system '.*' 937s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 937s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 937s + git config user.name 'dgit test git user' 937s is_gitattrs_setup: found nothing 937s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 937s ' 937s + t-dgit-warn-check 1 import-dsc ../example_1.0-1.dsc +import.quilt-norm 937s + local warnok=1 937s + shift 937s + local err=stderr.example.quilt-import-norm 937s + LC_MESSAGES=C 937s + t-dgit import-dsc ../example_1.0-1.dsc +import.quilt-norm 937s + tee ../stderr.example.quilt-import-norm 937s + local dgit=dgit 937s + pwd 937s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 937s + : ' 937s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 937s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A import-dsc ../example_1.0-1.dsc +import.quilt-norm 937s | git rev-parse --show-toplevel 937s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm' 937s | git config -z --get-regexp --local '.*' 937s | git config -z --get-regexp --local '.*' 937s | git config -z --get-regexp --global '.*' 937s | git config -z --get-regexp --system '.*' 937s | git check-ref-format --normalize refs/heads/import.quilt-norm 937s => `refs/heads/import.quilt-norm' 937s | git symbolic-ref -q HEAD 937s => `refs/heads/import.quilt-norm.broken' 937s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.quilt-norm' 937s => `' 937s dgit: warning: importing unsigned .dsc 937s Dgit metadata in .dsc: NO git hash 937s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm/.git/dgit/unpack 937s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 937s using existing example_1.0.orig.tar.gz 937s considering saving example_1.0.orig.tar.gz: (File exists) no need. 937s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 937s using existing example_1.0-1.debian.tar.xz 937s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 937s import considering example_1.0.orig.tar.gz Y .gz orig 937s + chmod -R '+rwX' _unpack-tar 937s CD _unpack-tar 937s | find -name .git -prune -print0 937s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 937s + git add -Af . 937s | git write-tree 937s => `fdedcd44a456ab6feaba5df92682162374065f6b' 937s | git ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 937s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 937s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 937s CD .. 937s import considering example_1.0-1.debian.tar.xz Y .xz (none) 937s + chmod -R '+rwX' _unpack-tar 937s CD _unpack-tar 937s | find -name .git -prune -print0 937s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 937s + git add -Af . 937s | git write-tree 937s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 937s | git ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 937s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 937s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 937s CD .. 937s + dpkg-source --skip-patches -x -- example.dsc 937s dpkg-source: warning: extracting unsigned source package (example.dsc) 937s dpkg-source: info: extracting example in example-1.0 937s dpkg-source: info: unpacking example_1.0.orig.tar.gz 937s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 937s CD example-1.0 937s | find -name .git -prune -print0 937s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 937s + git add -Af . 937s | git write-tree 937s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 937s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 937s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 937s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 937s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 937s + git add -Af . 937s | git write-tree 937s => `e2ad906893da0422c12826f4295302e132b9411b' 937s import clog search... 937s | dpkg-parsechangelog --format rfc822 --all 938s import clog 1.0-1 package changelog, entry no.1... 938s import clog 1.0-1 vs 1.0... 938s import clog 1.0-1 becomes r1 938s import clog 1.0 package changelog, entry no.2... 938s import clog 1.0 vs 1.0... 938s import clog 1.0 becomes r1 938s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 938s => `1743424428 +0000' 938s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 938s => `1431548802 +0000' 938s import tartrees authline Ian Jackson 1743424428 +0000 938s import tartrees r1authline Ian Jackson 1431548802 +0000 938s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 938s | git hash-object -w -t commit --stdin 938s => 70ede04cf05feab175506d8c78fb46392001965e 938s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 938s | git hash-object -w -t commit --stdin 938s => d58ee25caf63580b71bc6b533ed0394e0a29207d 938s import main commit 938s | git hash-object -w -t commit ../commit.tmp 938s => `b647c9a6a515c48170568ec77286622700ab7079' 938s import apply patches... 938s | git hash-object -w -t commit --stdin 938s => 34b428194f4ec517d64a460fca7251da8ffb40a6 938s + git checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 938s + git checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 938s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 938s => `1743424428 +0000' 938s + git checkout -q unpa 938s + git update-ref -d refs/heads/patch-queue/unpa 938s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 938s | git rev-parse 'HEAD~0' 938s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 938s | git rev-parse HEAD: 938s => `e2ad906893da0422c12826f4295302e132b9411b' 938s synthesised git commit from .dsc 1.0-1 938s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 938s + git update-ref -m 'dgit import-dsc: ../example_1.0-1.dsc +' refs/heads/import.quilt-norm 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 938s dgit: import-dsc: results are in git ref refs/heads/import.quilt-norm 938s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 938s ' 938s + set +e 938s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-norm 938s + rc=1 938s + set -e 938s + test 1 = 1 938s + git checkout import.quilt-norm 938s Switched to branch 'import.quilt-norm' 938s M .dotfile-attr 938s M af/eol=crlf 938s M af/filter=dgit-test-crazy-f 938s M af/ident-set 938s M af/text-set 938s M af/working-tree-encoding=UTF-16 938s + touch .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 938s + git reset --hard 938s HEAD is now at 8dd0dac dgit test patch sums 938s + sums_check 938s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 938s + diff -U0 ../sums ../sums.quilt-norm.checkout 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:.dotfile-attr 938s + sed -e 's#-$#.dotfile-attr#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Delay-set 938s + sed -e 's#-$#af/Delay-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Delay-unset 938s + sed -e 's#-$#af/Delay-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Delay-unspec 938s + sed -e 's#-$#af/Delay-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Example-set 938s + sed -e 's#-$#af/Example-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Example-unset 938s + sed -e 's#-$#af/Example-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Example-unspec 938s + sed -e 's#-$#af/Example-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Note-set 938s + sed -e 's#-$#af/Note-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Note-unset 938s + sed -e 's#-$#af/Note-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Note-unspec 938s + sed -e 's#-$#af/Note-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Set-set 938s + sed -e 's#-$#af/Set-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Set-unset 938s + sha256sum 938s + sed -e 's#-$#af/Set-unset#' 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Set-unspec 938s + sed -e 's#-$#af/Set-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/String-set 938s + sed -e 's#-$#af/String-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/String-unset 938s + sed -e 's#-$#af/String-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/String-unspec 938s + sed -e 's#-$#af/String-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unset-set 938s + sed -e 's#-$#af/Unset-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unset-unset 938s + sed -e 's#-$#af/Unset-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unset-unspec 938s + sed -e 's#-$#af/Unset-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unspecified-set 938s + sed -e 's#-$#af/Unspecified-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unspecified-unset 938s + sed -e 's#-$#af/Unspecified-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/Unspecified-unspec 938s + sed -e 's#-$#af/Unspecified-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/binary-set 938s + sed -e 's#-$#af/binary-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/binary-unset 938s + sed -e 's#-$#af/binary-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/binary-unspec 938s + sed -e 's#-$#af/binary-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/conflict-marker-size-set 938s + sed -e 's#-$#af/conflict-marker-size-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/conflict-marker-size-unset 938s + sed -e 's#-$#af/conflict-marker-size-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/conflict-marker-size-unspec 938s + sed -e 's#-$#af/conflict-marker-size-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/delta-set 938s + sed -e 's#-$#af/delta-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/delta-unset 938s + sed -e 's#-$#af/delta-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/delta-unspec 938s + sed -e 's#-$#af/delta-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/diff-set 938s + sed -e 's#-$#af/diff-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/diff-unset 938s + sed -e 's#-$#af/diff-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/diff-unspec 938s + sed -e 's#-$#af/diff-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/encoding-set 938s + sed -e 's#-$#af/encoding-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/encoding-unset 938s + sed -e 's#-$#af/encoding-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/encoding-unspec 938s + sed -e 's#-$#af/encoding-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/encoding=no-such-encoding 938s + sha256sum 938s + sed -e 's#-$#af/encoding=no-such-encoding#' 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/eol-set 938s + sed -e 's#-$#af/eol-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/eol-unset 938s + sed -e 's#-$#af/eol-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/eol-unspec 938s + sed -e 's#-$#af/eol-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/eol=crlf 938s + sed -e 's#-$#af/eol=crlf#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/eol=lf 938s + sed -e 's#-$#af/eol=lf#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-ignore-set 938s + sed -e 's#-$#af/export-ignore-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-ignore-unset 938s + sed -e 's#-$#af/export-ignore-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-ignore-unspec 938s + sed -e 's#-$#af/export-ignore-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-subst-set 938s + sed -e 's#-$#af/export-subst-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-subst-unset 938s + sed -e 's#-$#af/export-subst-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/export-subst-unspec 938s + sed -e 's#-$#af/export-subst-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/filter-set 938s + sed -e 's#-$#af/filter-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/filter-unset 938s + sed -e 's#-$#af/filter-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/filter-unspec 938s + sed -e 's#-$#af/filter-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/filter=dgit-test-crazy-f 938s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/ident-set 938s + sed -e 's#-$#af/ident-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/ident-unset 938s + sed -e 's#-$#af/ident-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/ident-unspec 938s + sed -e 's#-$#af/ident-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge-set 938s + sed -e 's#-$#af/merge-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge-unset 938s + sed -e 's#-$#af/merge-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge-unspec 938s + sed -e 's#-$#af/merge-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge=binary 938s + sed -e 's#-$#af/merge=binary#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge=text 938s + sed -e 's#-$#af/merge=text#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/merge=union 938s + sed -e 's#-$#af/merge=union#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/required-set 938s + sed -e 's#-$#af/required-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/required-unset 938s + sed -e 's#-$#af/required-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/required-unspec 938s + sed -e 's#-$#af/required-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/text-set 938s + sed -e 's#-$#af/text-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/text-unset 938s + sed -e 's#-$#af/text-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/text-unspec 938s + sed -e 's#-$#af/text-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/text=auto 938s + sed -e 's#-$#af/text=auto#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/union-set 938s + sed -e 's#-$#af/union-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/union-unset 938s + sed -e 's#-$#af/union-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/union-unspec 938s + sed -e 's#-$#af/union-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/whitespace-set 938s + sed -e 's#-$#af/whitespace-set#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/whitespace-unset 938s + sed -e 's#-$#af/whitespace-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/whitespace-unspec 938s + sed -e 's#-$#af/whitespace-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/working-tree-encoding-unset 938s + sed -e 's#-$#af/working-tree-encoding-unset#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/working-tree-encoding-unspec 938s + sed -e 's#-$#af/working-tree-encoding-unspec#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/working-tree-encoding=ISO-8859-1 938s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 938s + sha256sum 938s + for f in .dotfile-attr af/* 938s + git cat-file blob refs/heads/import.quilt-norm:af/working-tree-encoding=UTF-16 938s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 938s + sha256sum 938s + diff -U0 ../sums ../sums.quilt-norm 938s + cd .. 938s + sfmt_import absurd --force-import-gitapply-absurd 938s + inst=absurd 938s + dgitargs=--force-import-gitapply-absurd 938s + branch=import.quilt-absurd 938s + dscf=example_1.0-1.dsc 938s + sums=sums.quilt-absurd 938s + wd=example.quilt-import-absurd 938s + mkdir example.quilt-import-absurd 938s + cd example.quilt-import-absurd 938s + git init 938s hint: Using 'master' as the name for the initial branch. This default branch name 938s hint: is subject to change. To configure the initial branch name to use in all 938s hint: of your new repositories, which will suppress this warning, call: 938s hint: 938s hint: git config --global init.defaultBranch 938s hint: 938s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 938s hint: 'development'. The just-created branch can be renamed via this command: 938s hint: 938s hint: git branch -m 938s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd/.git/ 938s + t-dgit-warn-check 0 --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd.broken 938s + local warnok=0 938s + shift 938s + local err=stderr.example.quilt-import-absurd 938s + LC_MESSAGES=C 938s + t-dgit --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd.broken 938s + tee ../stderr.example.quilt-import-absurd 938s + local dgit=dgit 938s + pwd 938s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 938s + : ' 938s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 938s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd.broken 938s | git rev-parse --show-toplevel 938s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd' 938s | git config -z --get-regexp --local '.*' 938s | git config -z --get-regexp --local '.*' 938s | git config -z --get-regexp --global '.*' 938s | git config -z --get-regexp --system '.*' 938s | git check-ref-format --normalize refs/heads/import.quilt-absurd.broken 938s => `refs/heads/import.quilt-absurd.broken' 938s | git symbolic-ref -q HEAD 938s => `refs/heads/master' 938s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.quilt-absurd.broken' 938s => `' 938s dgit: warning: importing unsigned .dsc 938s Dgit metadata in .dsc: NO git hash 938s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd/.git/dgit/unpack 938s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 938s using existing example_1.0.orig.tar.gz 938s considering saving example_1.0.orig.tar.gz: (File exists) no need. 938s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 938s using existing example_1.0-1.debian.tar.xz 938s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 938s import considering example_1.0.orig.tar.gz Y .gz orig 938s + chmod -R '+rwX' _unpack-tar 938s CD _unpack-tar 938s | find -name .git -prune -print0 938s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 938s + git add -Af . 938s | git write-tree 938s => `fdedcd44a456ab6feaba5df92682162374065f6b' 938s | git ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 938s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 938s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 938s CD .. 938s import considering example_1.0-1.debian.tar.xz Y .xz (none) 938s + chmod -R '+rwX' _unpack-tar 938s CD _unpack-tar 938s | find -name .git -prune -print0 938s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 938s + git add -Af . 938s | git write-tree 938s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 938s | git ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 938s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 938s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 938s CD .. 938s + dpkg-source --skip-patches -x -- example.dsc 938s dpkg-source: warning: extracting unsigned source package (example.dsc) 938s dpkg-source: info: extracting example in example-1.0 938s dpkg-source: info: unpacking example_1.0.orig.tar.gz 938s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 938s CD example-1.0 938s | find -name .git -prune -print0 938s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 938s + git add -Af . 938s | git write-tree 938s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 938s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 938s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 938s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 938s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 938s + git add -Af . 938s | git write-tree 938s => `e2ad906893da0422c12826f4295302e132b9411b' 938s import clog search... 938s | dpkg-parsechangelog --format rfc822 --all 938s import clog 1.0-1 package changelog, entry no.1... 938s import clog 1.0-1 vs 1.0... 938s import clog 1.0-1 becomes r1 938s import clog 1.0 package changelog, entry no.2... 938s import clog 1.0 vs 1.0... 938s import clog 1.0 becomes r1 938s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 938s => `1743424428 +0000' 938s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 938s => `1431548802 +0000' 938s import tartrees authline Ian Jackson 1743424428 +0000 938s import tartrees r1authline Ian Jackson 1431548802 +0000 938s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 938s | git hash-object -w -t commit --stdin 938s => 70ede04cf05feab175506d8c78fb46392001965e 938s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 938s | git hash-object -w -t commit --stdin 939s => d58ee25caf63580b71bc6b533ed0394e0a29207d 939s import main commit 939s | git hash-object -w -t commit ../commit.tmp 939s => `b647c9a6a515c48170568ec77286622700ab7079' 939s import apply patches... 939s | git hash-object -w -t commit --stdin 939s => 34b428194f4ec517d64a460fca7251da8ffb40a6 939s + git checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 939s + git checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 939s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 939s => `1743424428 +0000' 939s + git checkout -q unpa 939s + git update-ref -d refs/heads/patch-queue/unpa 939s warning: skipping checks or functionality due to --force-import-gitapply-absurd 939s + git checkout -q unpa 939s + git update-ref -d refs/heads/patch-queue/unpa 939s warning: only absurd git-apply! 939s dgit: trying slow absurd-git-apply... 939s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 939s | git rev-parse 'HEAD~0' 939s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 939s | git rev-parse HEAD: 939s => `e2ad906893da0422c12826f4295302e132b9411b' 939s synthesised git commit from .dsc 1.0-1 939s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 939s + git update-ref -m 'dgit import-dsc: ../example_1.0-1.dsc +' refs/heads/import.quilt-absurd.broken 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 939s | git ls-tree -lrz -- 8dd0dacba8cdadfa771a1173f7406cf7b88b908c: 939s dgit: warning: source tree contains .gitattributes 939s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 939s dgit: import-dsc: results are in git ref refs/heads/import.quilt-absurd.broken 939s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 939s ' 939s + set +e 939s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-absurd 939s dgit: warning: source tree contains .gitattributes 939s + rc=0 939s + set -e 939s + test 0 = 0 939s + git checkout import.quilt-absurd.broken 939s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 939s Switched to branch 'import.quilt-absurd.broken' 939s + sums_check_broken 939s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 939s + for s in ../sums ../$sums.broken 939s + sed 's/[0-9a-f]* //' ../sums 939s + for s in ../sums ../$sums.broken 939s + sed 's/[0-9a-f]* //' ../sums.quilt-absurd.broken 939s + diff -U0 ../sums.nosums ../sums.quilt-absurd.broken.nosums 939s + set +e 939s + diff -U0 ../sums ../sums.quilt-absurd.broken 939s --- ../sums 2025-03-31 12:33:46.080000000 +0000 939s +++ ../sums.quilt-absurd.broken 2025-03-31 12:33:52.632000000 +0000 939s @@ -1 +1 @@ 939s -c02cc0a90a4594bdbba03bd040f628b1a134b660927b29e4f2982de733e658e0 .dotfile-attr 939s +0f4508dc38f8337ff4930617a66f14d1a2a0e5f180cc096fff819d7b9cfeec47 .dotfile-attr 939s @@ -42 +42 @@ 939s -dc7fcbe7b31b42054c61ab25016ad8acc38e3ec6c7d6f3164c3eecc9bd21aaac af/eol=crlf 939s +84a0b2d416076091682e90dc6d5a50a7f97579da19c213f111a534f67b62318f af/eol=crlf 939s @@ -53,2 +53,2 @@ 939s -6d010b304f7cd6f24053dff6b7f23a8a3ec453744ca13988b485cf7b9f347a05 af/filter=dgit-test-crazy-f 939s -d0e2a386441e824a4dc71b09c9563dfb43d5a8c42c6c96f60f4c6825a3096493 af/ident-set 939s +a5b2a88047853e600c31a9b9ed084759d558a18a87055749da22069aec94c407 af/filter=dgit-test-crazy-f 939s +a5c2426e6027fd8f5f355ac65e728da212a8e6f1b322ae0f797967e7f9ad7ab6 af/ident-set 939s @@ -66 +66 @@ 939s -a58789607ac44e8c43710c6304aa824808a20454e7c74cff629e2d0973274b70 af/text-set 939s +856170efc311a9162ba5a2bdd6cae6f437cb7ad290e714517eb0f7004698436b af/text-set 939s @@ -79 +79 @@ 939s -47190c791cccbcc57f590962d79626e814f268ad748407aa02b0851067bf8c2b af/working-tree-encoding=UTF-16 939s +a05852543ae2b0ccac502af29c22188ee25604acb4895adcfe891d49210b3db5 af/working-tree-encoding=UTF-16 939s + rc=1 939s + set -e 939s + test 1 = 1 939s + t-dgit setup-new-tree 939s + local dgit=dgit 939s + pwd 939s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 939s + : ' 939s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 939s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-new-tree 939s | git rev-parse --show-toplevel 939s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd' 939s | git config -z --get-regexp --local '.*' 939s | git config -z --get-regexp --local '.*' 939s | git config -z --get-regexp --global '.*' 939s | git config -z --get-regexp --system '.*' 939s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 939s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 939s + git config user.name 'dgit test git user' 939s is_gitattrs_setup: found nothing 939s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 939s ' 939s + t-dgit-warn-check 1 --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd 939s + local warnok=1 939s + shift 939s + local err=stderr.example.quilt-import-absurd 939s + LC_MESSAGES=C 939s + t-dgit --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd 939s + tee ../stderr.example.quilt-import-absurd 939s + local dgit=dgit 939s + pwd 939s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 939s + : ' 939s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 939s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A --force-import-gitapply-absurd import-dsc ../example_1.0-1.dsc +import.quilt-absurd 939s | git rev-parse --show-toplevel 939s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd' 939s | git config -z --get-regexp --local '.*' 939s | git config -z --get-regexp --local '.*' 939s | git config -z --get-regexp --global '.*' 939s | git config -z --get-regexp --system '.*' 939s | git check-ref-format --normalize refs/heads/import.quilt-absurd 939s => `refs/heads/import.quilt-absurd' 939s | git symbolic-ref -q HEAD 939s => `refs/heads/import.quilt-absurd.broken' 939s | git for-each-ref '--format=%(objectname)' '[r]efs/heads/import.quilt-absurd' 939s => `' 939s dgit: warning: importing unsigned .dsc 939s Dgit metadata in .dsc: NO git hash 939s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd/.git/dgit/unpack 939s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 939s using existing example_1.0.orig.tar.gz 939s considering saving example_1.0.orig.tar.gz: (File exists) no need. 939s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 939s using existing example_1.0-1.debian.tar.xz 939s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 939s import considering example_1.0.orig.tar.gz Y .gz orig 939s + chmod -R '+rwX' _unpack-tar 939s CD _unpack-tar 939s | find -name .git -prune -print0 939s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 939s + git add -Af . 939s | git write-tree 939s => `fdedcd44a456ab6feaba5df92682162374065f6b' 939s | git ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 939s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 939s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 939s CD .. 939s import considering example_1.0-1.debian.tar.xz Y .xz (none) 939s + chmod -R '+rwX' _unpack-tar 939s CD _unpack-tar 939s | find -name .git -prune -print0 939s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 939s + git add -Af . 939s | git write-tree 939s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 939s | git ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 939s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 939s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 939s CD .. 939s + dpkg-source --skip-patches -x -- example.dsc 940s dpkg-source: warning: extracting unsigned source package (example.dsc) 940s dpkg-source: info: extracting example in example-1.0 940s dpkg-source: info: unpacking example_1.0.orig.tar.gz 940s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 940s CD example-1.0 940s | find -name .git -prune -print0 940s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 940s + git add -Af . 940s | git write-tree 940s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 940s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 940s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 940s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 940s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 940s + git add -Af . 940s | git write-tree 940s => `e2ad906893da0422c12826f4295302e132b9411b' 940s import clog search... 940s | dpkg-parsechangelog --format rfc822 --all 940s import clog 1.0-1 package changelog, entry no.1... 940s import clog 1.0-1 vs 1.0... 940s import clog 1.0-1 becomes r1 940s import clog 1.0 package changelog, entry no.2... 940s import clog 1.0 vs 1.0... 940s import clog 1.0 becomes r1 940s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 940s => `1743424428 +0000' 940s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 940s => `1431548802 +0000' 940s import tartrees authline Ian Jackson 1743424428 +0000 940s import tartrees r1authline Ian Jackson 1431548802 +0000 940s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 940s | git hash-object -w -t commit --stdin 940s => 70ede04cf05feab175506d8c78fb46392001965e 940s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 940s | git hash-object -w -t commit --stdin 940s => d58ee25caf63580b71bc6b533ed0394e0a29207d 940s import main commit 940s | git hash-object -w -t commit ../commit.tmp 940s => `b647c9a6a515c48170568ec77286622700ab7079' 940s import apply patches... 940s | git hash-object -w -t commit --stdin 940s => 34b428194f4ec517d64a460fca7251da8ffb40a6 940s + git checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 940s + git checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 940s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 940s => `1743424428 +0000' 940s + git checkout -q unpa 940s + git update-ref -d refs/heads/patch-queue/unpa 940s warning: skipping checks or functionality due to --force-import-gitapply-absurd 940s + git checkout -q unpa 940s + git update-ref -d refs/heads/patch-queue/unpa 940s warning: only absurd git-apply! 940s dgit: trying slow absurd-git-apply... 940s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 940s | git rev-parse 'HEAD~0' 940s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 940s | git rev-parse HEAD: 940s => `e2ad906893da0422c12826f4295302e132b9411b' 940s synthesised git commit from .dsc 1.0-1 940s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 940s + git update-ref -m 'dgit import-dsc: ../example_1.0-1.dsc +' refs/heads/import.quilt-absurd 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 940s dgit: import-dsc: results are in git ref refs/heads/import.quilt-absurd 940s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 940s ' 940s + set +e 940s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-absurd 940s + rc=1 940s + set -e 940s + test 1 = 1 940s + git checkout import.quilt-absurd 940s Switched to branch 'import.quilt-absurd' 940s M .dotfile-attr 940s M af/eol=crlf 940s M af/filter=dgit-test-crazy-f 940s M af/ident-set 940s M af/text-set 940s M af/working-tree-encoding=UTF-16 940s + touch .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 940s + git reset --hard 940s HEAD is now at 8dd0dac dgit test patch sums 940s + sums_check 940s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 940s + diff -U0 ../sums ../sums.quilt-absurd.checkout 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:.dotfile-attr 940s + sed -e 's#-$#.dotfile-attr#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Delay-set 940s + sed -e 's#-$#af/Delay-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Delay-unset 940s + sed -e 's#-$#af/Delay-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Delay-unspec 940s + sed -e 's#-$#af/Delay-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Example-set 940s + sed -e 's#-$#af/Example-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Example-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Example-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Example-unspec 940s + sed -e 's#-$#af/Example-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Note-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Note-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Note-unset 940s + sed -e 's#-$#af/Note-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Note-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Note-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Set-set 940s + sed -e 's#-$#af/Set-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Set-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Set-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Set-unspec 940s + sed -e 's#-$#af/Set-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/String-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/String-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/String-unset 940s + sed -e 's#-$#af/String-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/String-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/String-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unset-set 940s + sed -e 's#-$#af/Unset-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unset-unset 940s + sed -e 's#-$#af/Unset-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unset-unspec 940s + sed -e 's#-$#af/Unset-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Unspecified-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unspecified-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unspecified-unset 940s + sed -e 's#-$#af/Unspecified-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/Unspecified-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/Unspecified-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/binary-set 940s + sed -e 's#-$#af/binary-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/binary-unset 940s + sed -e 's#-$#af/binary-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/binary-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/binary-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/conflict-marker-size-set 940s + sed -e 's#-$#af/conflict-marker-size-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/conflict-marker-size-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/conflict-marker-size-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/conflict-marker-size-unspec 940s + sed -e 's#-$#af/conflict-marker-size-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/delta-set 940s + sed -e 's#-$#af/delta-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/delta-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/delta-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/delta-unspec 940s + sed -e 's#-$#af/delta-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/diff-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/diff-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/diff-unset 940s + sed -e 's#-$#af/diff-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/diff-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/diff-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/encoding-set 940s + sed -e 's#-$#af/encoding-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/encoding-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/encoding-unset 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/encoding-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/encoding-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/encoding=no-such-encoding 940s + sed -e 's#-$#af/encoding=no-such-encoding#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/eol-set 940s + sed -e 's#-$#af/eol-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/eol-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/eol-unset 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/eol-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/eol-unspec 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/eol=crlf#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/eol=crlf 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/eol=lf 940s + sed -e 's#-$#af/eol=lf#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/export-ignore-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-ignore-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-ignore-unset 940s + sed -e 's#-$#af/export-ignore-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-ignore-unspec 940s + sed -e 's#-$#af/export-ignore-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/export-subst-set#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-subst-set 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-subst-unset 940s + sed -e 's#-$#af/export-subst-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/export-subst-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/export-subst-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/filter-set 940s + sed -e 's#-$#af/filter-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/filter-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/filter-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/filter-unspec 940s + sed -e 's#-$#af/filter-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/filter=dgit-test-crazy-f 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/ident-set 940s + sed -e 's#-$#af/ident-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/ident-unset 940s + sed -e 's#-$#af/ident-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/ident-unspec 940s + sed -e 's#-$#af/ident-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge-set 940s + sed -e 's#-$#af/merge-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge-unset 940s + sed -e 's#-$#af/merge-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/merge-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge=binary 940s + sed -e 's#-$#af/merge=binary#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge=text 940s + sed -e 's#-$#af/merge=text#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/merge=union#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/merge=union 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/required-set 940s + sed -e 's#-$#af/required-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/required-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/required-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/required-unspec 940s + sed -e 's#-$#af/required-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/text-set 940s + sed -e 's#-$#af/text-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/text-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/text-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/text-unspec 940s + sed -e 's#-$#af/text-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/text=auto#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/text=auto 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/union-set 940s + sed -e 's#-$#af/union-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/union-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/union-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/union-unspec 940s + sed -e 's#-$#af/union-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/whitespace-set 940s + sed -e 's#-$#af/whitespace-set#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/whitespace-unset#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/whitespace-unset 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/whitespace-unspec 940s + sed -e 's#-$#af/whitespace-unspec#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/working-tree-encoding-unset 940s + sed -e 's#-$#af/working-tree-encoding-unset#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + sha256sum 940s + sed -e 's#-$#af/working-tree-encoding-unspec#' 940s + git cat-file blob refs/heads/import.quilt-absurd:af/working-tree-encoding-unspec 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/working-tree-encoding=ISO-8859-1 940s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 940s + sha256sum 940s + for f in .dotfile-attr af/* 940s + git cat-file blob refs/heads/import.quilt-absurd:af/working-tree-encoding=UTF-16 940s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 940s + sha256sum 940s + diff -U0 ../sums ../sums.quilt-absurd 940s + cd .. 940s + : ----- 'test clone (with "3.0 (quilt)")' ----- 940s + mv example_1.0.orig.tar.gz example_1.0-1.debian.tar.xz example_1.0-1.dsc /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror/pool/main/ 940s + t-archive-query sid 940s + local suite=sid 940s + local dscf=main/example_1.0-1.dsc 940s + t-archive-query-aq sid example 1.0-1 main/example_1.0-1.dsc 940s + local suite=sid 940s + local p=example 940s + local v=1.0-1 940s + local dscf=main/example_1.0-1.dsc 940s + local sha 940s ++ sha256sum 940s + sha='68787a70a166c55a902e557a3d4e334922772e72bfe2c442a1b054193b326fee -' 940s + echo '1.0-1 68787a70a166c55a902e557a3d4e334922772e72bfe2c442a1b054193b326fee main/example_1.0-1.dsc' 940s + t-aq-archive-updated sid example 940s + local suite=sid 940s + local p=example 940s + local suitedir=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 940s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid 940s + perl -wne ' 940s use JSON; 940s use strict; 940s our @v; 940s m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die; 940s push @v, { 940s "version" => "$1", 940s "sha256sum" => "$2", 940s "component" => "$3", 940s "filename" => "$4", 940s }; 940s END { 940s my $json = JSON->new->canonical(); 940s print $json->encode(\@v) or die $!; 940s } 940s ' 940s + t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false clone example sid example.clone.broken 940s + local warnok=0 940s + shift 940s + local err=stderr.example.quilt-import-absurd 940s + LC_MESSAGES=C 940s + t-dgit -cdgit.default.setup-gitattributes=false clone example sid example.clone.broken 940s + tee ../stderr.example.quilt-import-absurd 940s + local dgit=dgit 940s + pwd 940s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 940s + : ' 940s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 940s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -cdgit.default.setup-gitattributes=false clone example sid example.clone.broken 941s | git config -z --get-regexp --global '.*' 941s | git config -z --get-regexp --system '.*' 941s clone main body 941s CD example.clone.broken 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 941s canonical suite name is sid 941s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 941s => `0' 941s + git -c -cdgit.default.setup-gitattributes=false init -q 941s | git config -z --get-regexp --local '.*' 941s + git -c -cdgit.default.setup-gitattributes=false config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 941s + git -c -cdgit.default.setup-gitattributes=false config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 941s + git -c -cdgit.default.setup-gitattributes=false config user.name 'dgit test git user' 941s starting new git history 941s + git -c -cdgit.default.setup-gitattributes=false config remote.dgit.skipdefaultupdate true 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid/example... 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.dsc... 941s get_archive_dsc: Version 1.0-1 941s last upload to archive: NO git hash 941s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 941s => `' 941s previous reference hash= 941s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 941s => `' 941s fetch_from_archive: lastfetch= 941s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.broken/.git/dgit/unpack 941s considering reusing example_1.0.orig.tar.gz: (No such file or directory) (No such file or directory) absent. 941s ./example_1.0.orig.tar.gz does not exist, need to fetch 941s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0.orig.tar.gz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0.orig.tar.gz 941s % Total % Received % Xferd Average Speed Time Time Time Current 941s Dload Upload Total Spent Left Speed 941s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 229 100 229 0 0 4659k 0 --:--:-- --:--:-- --:--:-- 4659k 941s considering saving example_1.0.orig.tar.gz: linked. 941s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) (No such file or directory) absent. 941s ./example_1.0-1.debian.tar.xz does not exist, need to fetch 941s + curl --proto-redir '-all,http,https' -L -f -o ./example_1.0-1.debian.tar.xz -- file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.debian.tar.xz 941s % Total % Received % Xferd Average Speed Time Time Time Current 941s Dload Upload Total Spent Left Speed 941s 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 5820 100 5820 0 0 55.5M 0 --:--:-- --:--:-- --:--:-- 55.5M 941s considering saving example_1.0-1.debian.tar.xz: linked. 941s import considering example_1.0.orig.tar.gz Y .gz orig 941s + chmod -R '+rwX' _unpack-tar 941s CD _unpack-tar 941s | find -name .git -prune -print0 941s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 941s + git -c -cdgit.default.setup-gitattributes=false add -Af . 941s | git -c -cdgit.default.setup-gitattributes=false write-tree 941s => `fdedcd44a456ab6feaba5df92682162374065f6b' 941s | git -c -cdgit.default.setup-gitattributes=false ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 941s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 941s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 941s CD .. 941s import considering example_1.0-1.debian.tar.xz Y .xz (none) 941s + chmod -R '+rwX' _unpack-tar 941s CD _unpack-tar 941s | find -name .git -prune -print0 941s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 941s + git -c -cdgit.default.setup-gitattributes=false add -Af . 941s | git -c -cdgit.default.setup-gitattributes=false write-tree 941s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 941s | git -c -cdgit.default.setup-gitattributes=false ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 941s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 941s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 941s CD .. 941s + dpkg-source --no-check --skip-patches -x -- example.dsc 941s dpkg-source: info: extracting example in example-1.0 941s dpkg-source: info: unpacking example_1.0.orig.tar.gz 941s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 941s CD example-1.0 941s | find -name .git -prune -print0 941s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 941s + git -c -cdgit.default.setup-gitattributes=false add -Af . 941s | git -c -cdgit.default.setup-gitattributes=false write-tree 941s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 941s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 941s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 941s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 941s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 941s + git -c -cdgit.default.setup-gitattributes=false add -Af . 941s | git -c -cdgit.default.setup-gitattributes=false write-tree 941s => `e2ad906893da0422c12826f4295302e132b9411b' 941s import clog search... 941s | dpkg-parsechangelog --format rfc822 --all 941s import clog 1.0-1 package changelog, entry no.1... 941s import clog 1.0-1 vs 1.0... 941s import clog 1.0-1 becomes r1 941s import clog 1.0 package changelog, entry no.2... 941s import clog 1.0 vs 1.0... 941s import clog 1.0 becomes r1 941s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 941s => `1743424428 +0000' 941s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 941s => `1431548802 +0000' 941s import tartrees authline Ian Jackson 1743424428 +0000 941s import tartrees r1authline Ian Jackson 1431548802 +0000 941s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 941s | git hash-object -w -t commit --stdin 941s => 70ede04cf05feab175506d8c78fb46392001965e 941s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 941s | git hash-object -w -t commit --stdin 941s => d58ee25caf63580b71bc6b533ed0394e0a29207d 941s import main commit 941s | git hash-object -w -t commit ../commit.tmp 941s => `b647c9a6a515c48170568ec77286622700ab7079' 941s import apply patches... 941s | git hash-object -w -t commit --stdin 941s => 34b428194f4ec517d64a460fca7251da8ffb40a6 941s + git -c -cdgit.default.setup-gitattributes=false checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 941s + git -c -cdgit.default.setup-gitattributes=false checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 941s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 941s => `1743424428 +0000' 941s + git -c -cdgit.default.setup-gitattributes=false checkout -q unpa 941s + git -c -cdgit.default.setup-gitattributes=false update-ref -d refs/heads/patch-queue/unpa 941s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 941s | git rev-parse 'HEAD~0' 941s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 941s | git -c -cdgit.default.setup-gitattributes=false rev-parse HEAD: 941s => `e2ad906893da0422c12826f4295302e132b9411b' 941s synthesised git commit from .dsc 1.0-1 941s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.broken 941s fetch mergeinfos: 941s commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c Import of source package 941s fetch hash=8dd0dacba8cdadfa771a1173f7406cf7b88b908c 941s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 941s | git -c -cdgit.default.setup-gitattributes=false log -n2 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 941s => `commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c'... 941s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 941s => `' 941s is_gitattrs_setup: found nothing 941s | git -c -cdgit.default.setup-gitattributes=false ls-tree -lrz -- 8dd0dacba8cdadfa771a1173f7406cf7b88b908c: 941s dgit: warning: fetched source tree contains .gitattributes 941s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 941s + git -c -cdgit.default.setup-gitattributes=false reset --hard refs/remotes/dgit/dgit/sid 941s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 941s HEAD is now at 8dd0dac dgit test patch sums 941s + bash -ec ' set -o pipefail 941s git ls-tree -r --name-only -z HEAD | '\\' 941s xargs -0r touch -h -r . -- 941s ' 941s dgit ok: ready for work in example.clone.broken 941s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.broken 941s del_lrfetchrefs... 941s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 941s ' 941s + set +e 941s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-absurd 941s dgit: warning: fetched source tree contains .gitattributes 941s + rc=0 941s + set -e 941s + test 0 = 0 941s + cd example.clone.broken 941s + sums=sums.broken 941s + sums_check_broken 941s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 941s + for s in ../sums ../$sums.broken 941s + sed 's/[0-9a-f]* //' ../sums 941s + for s in ../sums ../$sums.broken 941s + sed 's/[0-9a-f]* //' ../sums.broken.broken 941s + diff -U0 ../sums.nosums ../sums.broken.broken.nosums 941s + set +e 941s + diff -U0 ../sums ../sums.broken.broken 941s --- ../sums 2025-03-31 12:33:46.080000000 +0000 941s +++ ../sums.broken.broken 2025-03-31 12:33:54.780000000 +0000 941s @@ -1 +1 @@ 941s -c02cc0a90a4594bdbba03bd040f628b1a134b660927b29e4f2982de733e658e0 .dotfile-attr 941s +0f4508dc38f8337ff4930617a66f14d1a2a0e5f180cc096fff819d7b9cfeec47 .dotfile-attr 941s @@ -42 +42 @@ 941s -dc7fcbe7b31b42054c61ab25016ad8acc38e3ec6c7d6f3164c3eecc9bd21aaac af/eol=crlf 941s +84a0b2d416076091682e90dc6d5a50a7f97579da19c213f111a534f67b62318f af/eol=crlf 941s @@ -53,2 +53,2 @@ 941s -6d010b304f7cd6f24053dff6b7f23a8a3ec453744ca13988b485cf7b9f347a05 af/filter=dgit-test-crazy-f 941s -d0e2a386441e824a4dc71b09c9563dfb43d5a8c42c6c96f60f4c6825a3096493 af/ident-set 941s +a5b2a88047853e600c31a9b9ed084759d558a18a87055749da22069aec94c407 af/filter=dgit-test-crazy-f 941s +a5c2426e6027fd8f5f355ac65e728da212a8e6f1b322ae0f797967e7f9ad7ab6 af/ident-set 941s @@ -66 +66 @@ 941s -a58789607ac44e8c43710c6304aa824808a20454e7c74cff629e2d0973274b70 af/text-set 941s +856170efc311a9162ba5a2bdd6cae6f437cb7ad290e714517eb0f7004698436b af/text-set 941s @@ -79 +79 @@ 941s -47190c791cccbcc57f590962d79626e814f268ad748407aa02b0851067bf8c2b af/working-tree-encoding=UTF-16 941s +a05852543ae2b0ccac502af29c22188ee25604acb4895adcfe891d49210b3db5 af/working-tree-encoding=UTF-16 941s + rc=1 941s + set -e 941s + test 1 = 1 941s + cd .. 941s + t-dgit-warn-check 1 clone example sid example.clone 941s + local warnok=1 941s + shift 941s + local err=stderr.example.quilt-import-absurd 941s + LC_MESSAGES=C 941s + t-dgit clone example sid example.clone 941s + tee ../stderr.example.quilt-import-absurd 941s + local dgit=dgit 941s + pwd 941s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 941s + : ' 941s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 941s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A clone example sid example.clone 941s | git config -z --get-regexp --global '.*' 941s | git config -z --get-regexp --system '.*' 941s clone main body 941s CD example.clone 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 941s canonical suite name is sid 941s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 941s => `0' 941s + git init -q 941s | git config -z --get-regexp --local '.*' 941s + git config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 941s + git config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 941s + git config user.name 'dgit test git user' 941s is_gitattrs_setup: found nothing 941s starting new git history 941s + git config remote.dgit.skipdefaultupdate true 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid/example... 941s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.dsc... 941s get_archive_dsc: Version 1.0-1 941s last upload to archive: NO git hash 941s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 941s => `' 941s previous reference hash= 941s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 941s => `' 941s fetch_from_archive: lastfetch= 941s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone/.git/dgit/unpack 941s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 941s using existing example_1.0.orig.tar.gz 941s considering saving example_1.0.orig.tar.gz: (File exists) no need. 941s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 941s using existing example_1.0-1.debian.tar.xz 941s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 941s import considering example_1.0.orig.tar.gz Y .gz orig 941s + chmod -R '+rwX' _unpack-tar 941s CD _unpack-tar 941s | find -name .git -prune -print0 941s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 941s + git add -Af . 941s | git write-tree 941s => `fdedcd44a456ab6feaba5df92682162374065f6b' 941s | git ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 941s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 941s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 941s CD .. 941s import considering example_1.0-1.debian.tar.xz Y .xz (none) 941s + chmod -R '+rwX' _unpack-tar 941s CD _unpack-tar 941s | find -name .git -prune -print0 941s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 941s + git add -Af . 941s | git write-tree 941s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 941s | git ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 941s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 941s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 941s CD .. 941s + dpkg-source --no-check --skip-patches -x -- example.dsc 942s dpkg-source: info: extracting example in example-1.0 942s dpkg-source: info: unpacking example_1.0.orig.tar.gz 942s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 942s CD example-1.0 942s | find -name .git -prune -print0 942s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git playtree-setup . 942s + git add -Af . 942s | git write-tree 942s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 942s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 942s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 942s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 942s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 942s + git add -Af . 942s | git write-tree 942s => `e2ad906893da0422c12826f4295302e132b9411b' 942s import clog search... 942s | dpkg-parsechangelog --format rfc822 --all 942s import clog 1.0-1 package changelog, entry no.1... 942s import clog 1.0-1 vs 1.0... 942s import clog 1.0-1 becomes r1 942s import clog 1.0 package changelog, entry no.2... 942s import clog 1.0 vs 1.0... 942s import clog 1.0 becomes r1 942s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 942s => `1743424428 +0000' 942s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 942s => `1431548802 +0000' 942s import tartrees authline Ian Jackson 1743424428 +0000 942s import tartrees r1authline Ian Jackson 1431548802 +0000 942s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 942s | git hash-object -w -t commit --stdin 942s => 70ede04cf05feab175506d8c78fb46392001965e 942s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 942s | git hash-object -w -t commit --stdin 942s => d58ee25caf63580b71bc6b533ed0394e0a29207d 942s import main commit 942s | git hash-object -w -t commit ../commit.tmp 942s => `b647c9a6a515c48170568ec77286622700ab7079' 942s import apply patches... 942s | git hash-object -w -t commit --stdin 942s => 34b428194f4ec517d64a460fca7251da8ffb40a6 942s + git checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 942s + git checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 942s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 942s => `1743424428 +0000' 942s + git checkout -q unpa 942s + git update-ref -d refs/heads/patch-queue/unpa 942s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 942s | git rev-parse 'HEAD~0' 942s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 942s | git rev-parse HEAD: 942s => `e2ad906893da0422c12826f4295302e132b9411b' 942s synthesised git commit from .dsc 1.0-1 942s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone 942s fetch mergeinfos: 942s commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c Import of source package 942s fetch hash=8dd0dacba8cdadfa771a1173f7406cf7b88b908c 942s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 942s | git log -n2 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 942s => `commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c'... 942s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 942s => `' 942s + git reset --hard refs/remotes/dgit/dgit/sid 942s HEAD is now at 8dd0dac dgit test patch sums 942s + bash -ec ' set -o pipefail 942s git ls-tree -r --name-only -z HEAD | '\\' 942s xargs -0r touch -h -r . -- 942s ' 942s dgit ok: ready for work in example.clone 942s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone 942s del_lrfetchrefs... 942s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 942s ' 942s + set +e 942s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-absurd 942s + rc=1 942s + set -e 942s + test 1 = 1 942s + cd example.clone 942s + sums=sums.clone 942s + branch=dgit/sid 942s + sums_check 942s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 942s + diff -U0 ../sums ../sums.clone.checkout 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:.dotfile-attr 942s + sed -e 's#-$#.dotfile-attr#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Delay-set 942s + sed -e 's#-$#af/Delay-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Delay-unset 942s + sed -e 's#-$#af/Delay-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Delay-unspec 942s + sed -e 's#-$#af/Delay-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Example-set 942s + sed -e 's#-$#af/Example-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Example-unset 942s + sed -e 's#-$#af/Example-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Example-unspec 942s + sed -e 's#-$#af/Example-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Note-set 942s + sed -e 's#-$#af/Note-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Note-unset 942s + sed -e 's#-$#af/Note-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Note-unspec 942s + sed -e 's#-$#af/Note-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Set-set 942s + sed -e 's#-$#af/Set-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Set-unset 942s + sed -e 's#-$#af/Set-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Set-unspec 942s + sed -e 's#-$#af/Set-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/String-set 942s + sed -e 's#-$#af/String-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/String-unset 942s + sed -e 's#-$#af/String-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/String-unspec 942s + sed -e 's#-$#af/String-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Unset-set 942s + sed -e 's#-$#af/Unset-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/Unset-unset#' 942s + git cat-file blob refs/heads/dgit/sid:af/Unset-unset 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Unset-unspec 942s + sed -e 's#-$#af/Unset-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-set 942s + sed -e 's#-$#af/Unspecified-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/Unspecified-unset#' 942s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-unset 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-unspec 942s + sed -e 's#-$#af/Unspecified-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/binary-set#' 942s + git cat-file blob refs/heads/dgit/sid:af/binary-set 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/binary-unset#' 942s + git cat-file blob refs/heads/dgit/sid:af/binary-unset 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/binary-unspec 942s + sed -e 's#-$#af/binary-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-set 942s + sed -e 's#-$#af/conflict-marker-size-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-unset 942s + sed -e 's#-$#af/conflict-marker-size-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-unspec 942s + sed -e 's#-$#af/conflict-marker-size-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/delta-set#' 942s + git cat-file blob refs/heads/dgit/sid:af/delta-set 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/delta-unset 942s + sed -e 's#-$#af/delta-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/delta-unspec 942s + sed -e 's#-$#af/delta-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/diff-set 942s + sed -e 's#-$#af/diff-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + sha256sum 942s + sed -e 's#-$#af/diff-unset#' 942s + git cat-file blob refs/heads/dgit/sid:af/diff-unset 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/diff-unspec 942s + sed -e 's#-$#af/diff-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/encoding-set 942s + sed -e 's#-$#af/encoding-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/encoding-unset 942s + sed -e 's#-$#af/encoding-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/encoding-unspec 942s + sed -e 's#-$#af/encoding-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/encoding=no-such-encoding 942s + sed -e 's#-$#af/encoding=no-such-encoding#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/eol-set 942s + sed -e 's#-$#af/eol-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/eol-unset 942s + sed -e 's#-$#af/eol-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/eol-unspec 942s + sed -e 's#-$#af/eol-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/eol=crlf 942s + sed -e 's#-$#af/eol=crlf#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/eol=lf 942s + sed -e 's#-$#af/eol=lf#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-set 942s + sed -e 's#-$#af/export-ignore-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-unset 942s + sed -e 's#-$#af/export-ignore-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-unspec 942s + sed -e 's#-$#af/export-ignore-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-subst-set 942s + sed -e 's#-$#af/export-subst-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-subst-unset 942s + sed -e 's#-$#af/export-subst-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/export-subst-unspec 942s + sed -e 's#-$#af/export-subst-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/filter-set 942s + sed -e 's#-$#af/filter-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/filter-unset 942s + sed -e 's#-$#af/filter-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/filter-unspec 942s + sed -e 's#-$#af/filter-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/filter=dgit-test-crazy-f 942s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/ident-set 942s + sed -e 's#-$#af/ident-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/ident-unset 942s + sed -e 's#-$#af/ident-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/ident-unspec 942s + sed -e 's#-$#af/ident-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge-set 942s + sed -e 's#-$#af/merge-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge-unset 942s + sed -e 's#-$#af/merge-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge-unspec 942s + sed -e 's#-$#af/merge-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge=binary 942s + sed -e 's#-$#af/merge=binary#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge=text 942s + sed -e 's#-$#af/merge=text#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/merge=union 942s + sed -e 's#-$#af/merge=union#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/required-set 942s + sed -e 's#-$#af/required-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/required-unset 942s + sed -e 's#-$#af/required-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/required-unspec 942s + sed -e 's#-$#af/required-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/text-set 942s + sed -e 's#-$#af/text-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/text-unset 942s + sed -e 's#-$#af/text-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/text-unspec 942s + sed -e 's#-$#af/text-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/text=auto 942s + sed -e 's#-$#af/text=auto#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/union-set 942s + sed -e 's#-$#af/union-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/union-unset 942s + sed -e 's#-$#af/union-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/union-unspec 942s + sed -e 's#-$#af/union-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/whitespace-set 942s + sed -e 's#-$#af/whitespace-set#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/whitespace-unset 942s + sed -e 's#-$#af/whitespace-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/whitespace-unspec 942s + sed -e 's#-$#af/whitespace-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding-unset 942s + sed -e 's#-$#af/working-tree-encoding-unset#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding-unspec 942s + sed -e 's#-$#af/working-tree-encoding-unspec#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding=ISO-8859-1 942s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 942s + sha256sum 942s + for f in .dotfile-attr af/* 942s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding=UTF-16 942s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 942s + sha256sum 942s + diff -U0 ../sums ../sums.clone 942s + cd .. 942s + t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false clone example sid example.clone.old 942s + local warnok=0 942s + shift 942s + local err=stderr.example.quilt-import-absurd 942s + LC_MESSAGES=C 942s + t-dgit -cdgit.default.setup-gitattributes=false clone example sid example.clone.old 942s + tee ../stderr.example.quilt-import-absurd 942s + local dgit=dgit 942s + pwd 942s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 942s + : ' 942s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 942s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A -cdgit.default.setup-gitattributes=false clone example sid example.clone.old 942s | git config -z --get-regexp --global '.*' 942s | git config -z --get-regexp --system '.*' 942s clone main body 942s CD example.clone.old 942s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/suites... 942s canonical suite name is sid 942s | /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/ssh 'alice@git' ': dgit test-dummy git-check example ; set -e; cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/git; if test -d example.git; then echo 1; else echo 0; fi' 942s => `0' 942s + git -c -cdgit.default.setup-gitattributes=false init -q 942s | git config -z --get-regexp --local '.*' 942s + git -c -cdgit.default.setup-gitattributes=false config merge.dpkg-mergechangelogs.name 'debian/changelog merge driver' 942s + git -c -cdgit.default.setup-gitattributes=false config merge.dpkg-mergechangelogs.driver 'dpkg-mergechangelogs -m %O %A %B %A' 942s + git -c -cdgit.default.setup-gitattributes=false config user.name 'dgit test git user' 942s starting new git history 942s + git -c -cdgit.default.setup-gitattributes=false config remote.dgit.skipdefaultupdate true 942s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/aq/dsc_in_suite/sid/example... 942s query: fetching file:///tmp/autopkgtest.ztMUxl/autopkgtest_tmp/mirror//pool/main/example_1.0-1.dsc... 942s get_archive_dsc: Version 1.0-1 942s last upload to archive: NO git hash 942s | git for-each-ref '--format=%(objectname)' '[r]efs/dgit-fetch/test-dummy/dgit/sid' 942s => `' 942s previous reference hash= 942s | git for-each-ref '--format=%(objectname)' '[r]efs/remotes/dgit/dgit/sid' 942s => `' 942s fetch_from_archive: lastfetch= 942s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old/.git/dgit/unpack 942s considering reusing example_1.0.orig.tar.gz: (No such file or directory) linked. 942s using existing example_1.0.orig.tar.gz 942s considering saving example_1.0.orig.tar.gz: (File exists) no need. 942s considering reusing example_1.0-1.debian.tar.xz: (No such file or directory) linked. 942s using existing example_1.0-1.debian.tar.xz 942s considering saving example_1.0-1.debian.tar.xz: (File exists) no need. 942s import considering example_1.0.orig.tar.gz Y .gz orig 942s + chmod -R '+rwX' _unpack-tar 942s CD _unpack-tar 942s | find -name .git -prune -print0 942s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 942s + git -c -cdgit.default.setup-gitattributes=false add -Af . 942s | git -c -cdgit.default.setup-gitattributes=false write-tree 942s => `fdedcd44a456ab6feaba5df92682162374065f6b' 942s | git -c -cdgit.default.setup-gitattributes=false ls-tree -z fdedcd44a456ab6feaba5df92682162374065f6b 942s => `040000 tree ffe5b3ad4ce1ddd1837887479ff401020d194e65\x09example\x00' 942s one subtree ffe5b3ad4ce1ddd1837887479ff401020d194e65 942s CD .. 942s import considering example_1.0-1.debian.tar.xz Y .xz (none) 942s + chmod -R '+rwX' _unpack-tar 942s CD _unpack-tar 942s | find -name .git -prune -print0 942s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 942s + git -c -cdgit.default.setup-gitattributes=false add -Af . 942s | git -c -cdgit.default.setup-gitattributes=false write-tree 942s => `ffb8183451f4716edd3552e9262ca0e6c3305f9f' 942s | git -c -cdgit.default.setup-gitattributes=false ls-tree -z ffb8183451f4716edd3552e9262ca0e6c3305f9f 942s => `040000 tree 028812cb986206704f02eeac9f6cf485e4fb42b8\x09debian\x00' 942s one subtree 028812cb986206704f02eeac9f6cf485e4fb42b8 942s CD .. 942s + dpkg-source --no-check --skip-patches -x -- example.dsc 943s dpkg-source: info: extracting example in example-1.0 943s dpkg-source: info: unpacking example_1.0.orig.tar.gz 943s dpkg-source: info: unpacking example_1.0-1.debian.tar.xz 943s CD example-1.0 943s | find -name .git -prune -print0 943s + env PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/etc/perl:/usr/local/lib/x86_64-linux-gnu/perl/5.34.0:/usr/local/share/perl/5.34.0:/usr/lib/x86_64-linux-gnu/perl5/5.34:/usr/share/perl5:/usr/lib/x86_64-linux-gnu/perl-base:/usr/lib/x86_64-linux-gnu/perl/5.34:/usr/share/perl/5.34:/usr/local/lib/site_perl:/usr/share/dgit:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin git -c -cdgit.default.setup-gitattributes=false playtree-setup . 943s + git -c -cdgit.default.setup-gitattributes=false add -Af . 943s | git -c -cdgit.default.setup-gitattributes=false write-tree 943s => `7fa7eb497f9732f526ce32457aa1bb26d232bfc2' 943s checking for vendor-specific debian/patches/ubuntu.series (Dpkg::Vendor `current vendor') 943s checking for vendor-specific debian/patches/test-dummy.series ((base) distro being accessed) 943s checking for vendor-specific debian/patches/test-dummy.series ((nominal) distro being accessed) 943s + sh -ec 'exec >/dev/null; exec "$@"' x dpkg-source --before-build . 943s + git -c -cdgit.default.setup-gitattributes=false add -Af . 943s | git -c -cdgit.default.setup-gitattributes=false write-tree 943s => `e2ad906893da0422c12826f4295302e132b9411b' 943s import clog search... 943s | dpkg-parsechangelog --format rfc822 --all 943s import clog 1.0-1 package changelog, entry no.1... 943s import clog 1.0-1 vs 1.0... 943s import clog 1.0-1 becomes r1 943s import clog 1.0 package changelog, entry no.2... 943s import clog 1.0 vs 1.0... 943s import clog 1.0 becomes r1 943s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 943s => `1743424428 +0000' 943s | date '+%s %z' -d 'Wed, 13 May 2015 21:26:42 +0100' 943s => `1431548802 +0000' 943s import tartrees authline Ian Jackson 1743424428 +0000 943s import tartrees r1authline Ian Jackson 1431548802 +0000 943s import tartree example_1.0.orig.tar.gz ffe5b3ad4ce1ddd1837887479ff401020d194e65 943s | git hash-object -w -t commit --stdin 943s => 70ede04cf05feab175506d8c78fb46392001965e 943s import tartree example_1.0-1.debian.tar.xz 028812cb986206704f02eeac9f6cf485e4fb42b8 943s | git hash-object -w -t commit --stdin 943s => d58ee25caf63580b71bc6b533ed0394e0a29207d 943s import main commit 943s | git hash-object -w -t commit ../commit.tmp 943s => `b647c9a6a515c48170568ec77286622700ab7079' 943s import apply patches... 943s | git hash-object -w -t commit --stdin 943s => 34b428194f4ec517d64a460fca7251da8ffb40a6 943s + git -c -cdgit.default.setup-gitattributes=false checkout -q -b dapplied 34b428194f4ec517d64a460fca7251da8ffb40a6 943s + git -c -cdgit.default.setup-gitattributes=false checkout -q -b unpa b647c9a6a515c48170568ec77286622700ab7079 943s | date '+%s %z' -d 'Mon, 31 Mar 2025 12:33:48 +0000' 943s => `1743424428 +0000' 943s + git -c -cdgit.default.setup-gitattributes=false checkout -q unpa 943s + git -c -cdgit.default.setup-gitattributes=false update-ref -d refs/heads/patch-queue/unpa 943s + sh -ec 'exec >/dev/null 2>>../../gbp-pq-output; exec "$@"' x gbp pq import 943s | git rev-parse 'HEAD~0' 943s => `8dd0dacba8cdadfa771a1173f7406cf7b88b908c' 943s | git -c -cdgit.default.setup-gitattributes=false rev-parse HEAD: 943s => `e2ad906893da0422c12826f4295302e132b9411b' 943s synthesised git commit from .dsc 1.0-1 943s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old 943s fetch mergeinfos: 943s commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c Import of source package 943s fetch hash=8dd0dacba8cdadfa771a1173f7406cf7b88b908c 943s + git update-ref -m 'dgit fetch sid' DGIT_ARCHIVE 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 943s | git -c -cdgit.default.setup-gitattributes=false log -n2 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 943s => `commit 8dd0dacba8cdadfa771a1173f7406cf7b88b908c'... 943s | git update-ref -m 'dgit fetch' refs/remotes/dgit/dgit/sid 8dd0dacba8cdadfa771a1173f7406cf7b88b908c 943s => `' 943s is_gitattrs_setup: found nothing 943s | git -c -cdgit.default.setup-gitattributes=false ls-tree -lrz -- 8dd0dacba8cdadfa771a1173f7406cf7b88b908c: 943s dgit: warning: fetched source tree contains .gitattributes 943s dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree. 943s + git -c -cdgit.default.setup-gitattributes=false reset --hard refs/remotes/dgit/dgit/sid 943s error: failed to encode 'af/working-tree-encoding=ISO-8859-1' from UTF-8 to ISO-8859-1 943s HEAD is now at 8dd0dac dgit test patch sums 943s + bash -ec ' set -o pipefail 943s git ls-tree -r --name-only -z HEAD | '\\' 943s xargs -0r touch -h -r . -- 943s ' 943s dgit ok: ready for work in example.clone.old 943s CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old 943s del_lrfetchrefs... 943s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 943s ' 943s + set +e 943s + egrep 'warning: .* contains \.gitattributes' ../stderr.example.quilt-import-absurd 943s dgit: warning: fetched source tree contains .gitattributes 943s + rc=0 943s + set -e 943s + test 0 = 0 943s + cd example.clone.old 943s + mkdir -p .git/info 943s + cat 943s + t-dgit setup-gitattributes 943s + local dgit=dgit 943s + pwd 943s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old 943s + : ' 943s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 943s + dgit --dgit=dgit --dget:-u --dput:--config=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/dput.cf --config-lookup-explode=dgit-distro.debian.alias-canon -dtest-dummy -D -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A setup-gitattributes 943s | git rev-parse --show-toplevel 943s => `/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old' 943s | git config -z --get-regexp --local '.*' 943s | git config -z --get-regexp --local '.*' 943s | git config -z --get-regexp --global '.*' 943s | git config -z --get-regexp --system '.*' 943s is_gitattrs_setup: found old macro 943s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 943s ' 943s + git reset --hard 943s HEAD is now at 8dd0dac dgit test patch sums 943s + sums=sums.old 943s + sums_check 943s + sha256sum .dotfile-attr af/Delay-set af/Delay-unset af/Delay-unspec af/Example-set af/Example-unset af/Example-unspec af/Note-set af/Note-unset af/Note-unspec af/Set-set af/Set-unset af/Set-unspec af/String-set af/String-unset af/String-unspec af/Unset-set af/Unset-unset af/Unset-unspec af/Unspecified-set af/Unspecified-unset af/Unspecified-unspec af/binary-set af/binary-unset af/binary-unspec af/conflict-marker-size-set af/conflict-marker-size-unset af/conflict-marker-size-unspec af/delta-set af/delta-unset af/delta-unspec af/diff-set af/diff-unset af/diff-unspec af/encoding-set af/encoding-unset af/encoding-unspec af/encoding=no-such-encoding af/eol-set af/eol-unset af/eol-unspec af/eol=crlf af/eol=lf af/export-ignore-set af/export-ignore-unset af/export-ignore-unspec af/export-subst-set af/export-subst-unset af/export-subst-unspec af/filter-set af/filter-unset af/filter-unspec af/filter=dgit-test-crazy-f af/ident-set af/ident-unset af/ident-unspec af/merge-set af/merge-unset af/merge-unspec af/merge=binary af/merge=text af/merge=union af/required-set af/required-unset af/required-unspec af/text-set af/text-unset af/text-unspec af/text=auto af/union-set af/union-unset af/union-unspec af/whitespace-set af/whitespace-unset af/whitespace-unspec af/working-tree-encoding-unset af/working-tree-encoding-unspec af/working-tree-encoding=ISO-8859-1 af/working-tree-encoding=UTF-16 943s + diff -U0 ../sums ../sums.old.checkout 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:.dotfile-attr 943s + sed -e 's#-$#.dotfile-attr#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Delay-set 943s + sed -e 's#-$#af/Delay-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Delay-unset 943s + sed -e 's#-$#af/Delay-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Delay-unspec 943s + sed -e 's#-$#af/Delay-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Example-set 943s + sed -e 's#-$#af/Example-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Example-unset 943s + sed -e 's#-$#af/Example-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Example-unspec 943s + sed -e 's#-$#af/Example-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Note-set 943s + sed -e 's#-$#af/Note-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Note-unset 943s + sed -e 's#-$#af/Note-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Note-unspec 943s + sed -e 's#-$#af/Note-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Set-set 943s + sed -e 's#-$#af/Set-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Set-unset 943s + sed -e 's#-$#af/Set-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Set-unspec 943s + sed -e 's#-$#af/Set-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/String-set 943s + sed -e 's#-$#af/String-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/String-unset 943s + sed -e 's#-$#af/String-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/String-unspec 943s + sed -e 's#-$#af/String-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unset-set 943s + sed -e 's#-$#af/Unset-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unset-unset 943s + sed -e 's#-$#af/Unset-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unset-unspec 943s + sed -e 's#-$#af/Unset-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-set 943s + sed -e 's#-$#af/Unspecified-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-unset 943s + sed -e 's#-$#af/Unspecified-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/Unspecified-unspec 943s + sed -e 's#-$#af/Unspecified-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/binary-set 943s + sed -e 's#-$#af/binary-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/binary-unset 943s + sed -e 's#-$#af/binary-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/binary-unspec 943s + sed -e 's#-$#af/binary-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-set 943s + sed -e 's#-$#af/conflict-marker-size-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-unset 943s + sed -e 's#-$#af/conflict-marker-size-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/conflict-marker-size-unspec 943s + sed -e 's#-$#af/conflict-marker-size-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/delta-set 943s + sed -e 's#-$#af/delta-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/delta-unset 943s + sed -e 's#-$#af/delta-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/delta-unspec 943s + sed -e 's#-$#af/delta-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/diff-set 943s + sed -e 's#-$#af/diff-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/diff-unset 943s + sed -e 's#-$#af/diff-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/diff-unspec 943s + sed -e 's#-$#af/diff-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/encoding-set 943s + sed -e 's#-$#af/encoding-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/encoding-unset 943s + sed -e 's#-$#af/encoding-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/encoding-unspec 943s + sed -e 's#-$#af/encoding-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/encoding=no-such-encoding 943s + sed -e 's#-$#af/encoding=no-such-encoding#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/eol-set 943s + sed -e 's#-$#af/eol-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/eol-unset 943s + sed -e 's#-$#af/eol-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/eol-unspec 943s + sed -e 's#-$#af/eol-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/eol=crlf 943s + sed -e 's#-$#af/eol=crlf#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/eol=lf 943s + sed -e 's#-$#af/eol=lf#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-set 943s + sed -e 's#-$#af/export-ignore-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-unset 943s + sed -e 's#-$#af/export-ignore-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-ignore-unspec 943s + sed -e 's#-$#af/export-ignore-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-subst-set 943s + sed -e 's#-$#af/export-subst-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-subst-unset 943s + sed -e 's#-$#af/export-subst-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/export-subst-unspec 943s + sed -e 's#-$#af/export-subst-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/filter-set 943s + sed -e 's#-$#af/filter-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/filter-unset 943s + sed -e 's#-$#af/filter-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/filter-unspec 943s + sed -e 's#-$#af/filter-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/filter=dgit-test-crazy-f 943s + sed -e 's#-$#af/filter=dgit-test-crazy-f#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/ident-set 943s + sed -e 's#-$#af/ident-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/ident-unset 943s + sed -e 's#-$#af/ident-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/ident-unspec 943s + sed -e 's#-$#af/ident-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge-set 943s + sed -e 's#-$#af/merge-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge-unset 943s + sed -e 's#-$#af/merge-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge-unspec 943s + sed -e 's#-$#af/merge-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge=binary 943s + sed -e 's#-$#af/merge=binary#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge=text 943s + sed -e 's#-$#af/merge=text#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/merge=union 943s + sed -e 's#-$#af/merge=union#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/required-set 943s + sed -e 's#-$#af/required-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/required-unset 943s + sed -e 's#-$#af/required-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/required-unspec 943s + sed -e 's#-$#af/required-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/text-set 943s + sed -e 's#-$#af/text-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/text-unset 943s + sed -e 's#-$#af/text-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/text-unspec 943s + sed -e 's#-$#af/text-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/text=auto 943s + sed -e 's#-$#af/text=auto#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/union-set 943s + sed -e 's#-$#af/union-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/union-unset 943s + sed -e 's#-$#af/union-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/union-unspec 943s + sed -e 's#-$#af/union-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/whitespace-set 943s + sed -e 's#-$#af/whitespace-set#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/whitespace-unset 943s + sed -e 's#-$#af/whitespace-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/whitespace-unspec 943s + sed -e 's#-$#af/whitespace-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding-unset 943s + sed -e 's#-$#af/working-tree-encoding-unset#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding-unspec 943s + sed -e 's#-$#af/working-tree-encoding-unspec#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding=ISO-8859-1 943s + sed -e 's#-$#af/working-tree-encoding=ISO-8859-1#' 943s + sha256sum 943s + for f in .dotfile-attr af/* 943s + git cat-file blob refs/heads/dgit/sid:af/working-tree-encoding=UTF-16 943s + sed -e 's#-$#af/working-tree-encoding=UTF-16#' 943s + sha256sum 943s + diff -U0 ../sums ../sums.old 943s + cd .. 943s + t-ok 943s + : ======================================== 943s + t-check-only-bpd 943s + '[' .. = .. ']' 943s + return 943s + t-fscks 943s + shopt -s nullglob 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.broken 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone.old 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.clone 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.diff-import-norm 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.native-import-norm 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-absurd 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example.quilt-import-norm 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + for d in $tmp/*/.git $tmp/git/*.git 943s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 943s + t-git-fsck 943s ++ git rev-parse --git-dir 943s + local fsckerrs=.git/dgit-test-fsck.errs 943s + set +e 943s + LC_MESSAGES=C 943s + git fsck --no-dangling --strict 943s + tee .git/dgit-test-fsck.errs 943s + ps='0 0' 943s + set -e 943s + local pats 943s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 943s + test '0 0' = '0 0' 943s + pats+=(-e 'notice: HEAD points to an unborn branch') 943s + pats+=(-e 'notice: No default references') 943s + set +e 943s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 943s + rc=1 943s + set -e 943s + case $rc in 943s + t-save-artifacts 943s + artifacts=/tmp/autopkgtest.ztMUxl/gitattributes-artifacts 943s + '[' x/tmp/autopkgtest.ztMUxl/gitattributes-artifacts = x ']' 943s + '[' xtmp = x ']' 943s + GZIP=-1v 943s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gitattributes-artifacts/gitattributes.tar.gz '--exclude=*.tar' . 943s gzip: warning: GZIP environment variable is deprecated; use an alias or script 943s 83.5% 943s + echo ok. 943s ok. 943s + rc=0 943s + set +x 943s + set +e 943s + pwd 943s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 943s + '[' x '!=' x ']' 943s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 943s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 943s + set -e 943s + test 0 = 0 944s autopkgtest [12:33:58]: test gitattributes: -----------------------] 944s gitattributes PASS 944s autopkgtest [12:33:58]: test gitattributes: - - - - - - - - - - results - - - - - - - - - - 944s autopkgtest [12:33:58]: test gdr-newupstream: preparing testbed 996s autopkgtest [12:34:50]: testbed dpkg architecture: amd64 996s autopkgtest [12:34:50]: testbed apt version: 2.4.13 996s autopkgtest [12:34:50]: @@@@@@@@@@@@@@@@@@@@ test bed setup 996s autopkgtest [12:34:50]: testbed release detected to be: jammy 997s autopkgtest [12:34:51]: updating testbed package index (apt update) 997s Hit:1 http://ftpmaster.internal/ubuntu jammy InRelease 997s Hit:2 http://ftpmaster.internal/ubuntu jammy-updates InRelease 997s Hit:3 http://ftpmaster.internal/ubuntu jammy-security InRelease 997s Get:4 http://ftpmaster.internal/ubuntu jammy-proposed InRelease [279 kB] 997s Get:5 http://ftpmaster.internal/ubuntu jammy-proposed/restricted Sources [24.8 kB] 997s Get:6 http://ftpmaster.internal/ubuntu jammy-proposed/universe Sources [32.8 kB] 997s Get:7 http://ftpmaster.internal/ubuntu jammy-proposed/main Sources [118 kB] 997s Get:8 http://ftpmaster.internal/ubuntu jammy-proposed/main i386 Packages [108 kB] 997s Get:9 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 Packages [395 kB] 997s Get:10 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 c-n-f Metadata [2636 B] 997s Get:11 http://ftpmaster.internal/ubuntu jammy-proposed/restricted i386 Packages [1704 B] 997s Get:12 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 Packages [610 kB] 997s Get:13 http://ftpmaster.internal/ubuntu jammy-proposed/restricted amd64 c-n-f Metadata [116 B] 997s Get:14 http://ftpmaster.internal/ubuntu jammy-proposed/universe i386 Packages [41.2 kB] 997s Get:15 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 Packages [102 kB] 997s Get:16 http://ftpmaster.internal/ubuntu jammy-proposed/universe amd64 c-n-f Metadata [2168 B] 997s Get:17 http://ftpmaster.internal/ubuntu jammy-proposed/multiverse amd64 c-n-f Metadata [116 B] 1000s Fetched 1719 kB in 1s (2810 kB/s) 1002s Reading package lists... 1002s autopkgtest [12:34:56]: upgrading testbed (apt dist-upgrade and autopurge) 1002s Reading package lists... 1002s Building dependency tree... 1002s Reading state information... 1003s Calculating upgrade...Starting pkgProblemResolver with broken count: 0 1003s Starting 2 pkgProblemResolver with broken count: 0 1003s Done 1003s Entering ResolveByKeep 1004s 1004s The following packages will be upgraded: 1004s apt apt-utils libapt-pkg6.0 1004s 3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1004s Need to get 2486 kB of archives. 1004s After this operation, 0 B of additional disk space will be used. 1004s Get:1 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 libapt-pkg6.0 amd64 2.4.14 [912 kB] 1004s Get:2 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt amd64 2.4.14 [1363 kB] 1004s Get:3 http://ftpmaster.internal/ubuntu jammy-proposed/main amd64 apt-utils amd64 2.4.14 [211 kB] 1004s Fetched 2486 kB in 0s (30.9 MB/s) 1004s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 1004s Preparing to unpack .../libapt-pkg6.0_2.4.14_amd64.deb ... 1004s Unpacking libapt-pkg6.0:amd64 (2.4.14) over (2.4.13) ... 1005s Setting up libapt-pkg6.0:amd64 (2.4.14) ... 1005s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 1005s Preparing to unpack .../archives/apt_2.4.14_amd64.deb ... 1005s Unpacking apt (2.4.14) over (2.4.13) ... 1005s Setting up apt (2.4.14) ... 1005s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 1005s Preparing to unpack .../apt-utils_2.4.14_amd64.deb ... 1005s Unpacking apt-utils (2.4.14) over (2.4.13) ... 1005s Setting up apt-utils (2.4.14) ... 1005s Processing triggers for man-db (2.10.2-1) ... 1005s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1007s Reading package lists... 1007s Building dependency tree... 1007s Reading state information... 1008s Starting pkgProblemResolver with broken count: 0 1008s Starting 2 pkgProblemResolver with broken count: 0 1008s Done 1008s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1008s autopkgtest [12:35:02]: rebooting testbed after setup commands that affected boot 1022s Reading package lists... 1022s Building dependency tree... 1022s Reading state information... 1023s Starting pkgProblemResolver with broken count: 0 1023s Starting 2 pkgProblemResolver with broken count: 0 1023s Done 1023s The following NEW packages will be installed: 1023s chiark-utils-bin devscripts fakeroot faketime git git-buildpackage 1023s git-debrebase git-man libb-hooks-op-check-perl 1023s libclass-method-modifiers-perl libclass-xsaccessor-perl 1023s libdevel-callchecker-perl libdynaloader-functions-perl libencode-locale-perl 1023s liberror-perl libfakeroot libfaketime libfile-dirlist-perl 1023s libfile-fnmatch-perl libfile-homedir-perl libfile-listing-perl 1023s libfile-touch-perl libfile-which-perl libhtml-parser-perl 1023s libhtml-tagset-perl libhtml-tree-perl libhttp-cookies-perl libhttp-date-perl 1023s libhttp-message-perl libhttp-negotiate-perl libimport-into-perl 1023s libio-html-perl libio-pty-perl libio-socket-ssl-perl libipc-run-perl 1023s liblwp-mediatypes-perl liblwp-protocol-https-perl libmodule-runtime-perl 1023s libmoo-perl libnet-http-perl libnet-ssleay-perl libparams-classify-perl 1023s librole-tiny-perl libsub-quote-perl libtimedate-perl libtry-tiny-perl 1023s liburi-perl libwww-perl libwww-robotrules-perl patchutils 1023s perl-openssl-defaults python3-dateutil wdiff 1023s 0 upgraded, 53 newly installed, 0 to remove and 0 not upgraded. 1023s Need to get 8194 kB of archives. 1023s After this operation, 35.3 MB of additional disk space will be used. 1023s Get:1 http://ftpmaster.internal/ubuntu jammy/main amd64 libfakeroot amd64 1.28-1ubuntu1 [31.5 kB] 1023s Get:2 http://ftpmaster.internal/ubuntu jammy/main amd64 fakeroot amd64 1.28-1ubuntu1 [60.4 kB] 1023s Get:3 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-dirlist-perl all 0.05-2 [7100 B] 1023s Get:4 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-which-perl all 1.23-1 [13.8 kB] 1023s Get:5 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-homedir-perl all 1.006-1 [38.3 kB] 1023s Get:6 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-touch-perl all 0.12-1 [9024 B] 1023s Get:7 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-pty-perl amd64 1:1.15-2build2 [35.1 kB] 1023s Get:8 http://ftpmaster.internal/ubuntu jammy/main amd64 libipc-run-perl all 20200505.0-1 [89.8 kB] 1023s Get:9 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-method-modifiers-perl all 2.13-1 [16.2 kB] 1023s Get:10 http://ftpmaster.internal/ubuntu jammy/main amd64 libclass-xsaccessor-perl amd64 1.19-3build9 [34.1 kB] 1023s Get:11 http://ftpmaster.internal/ubuntu jammy/main amd64 libb-hooks-op-check-perl amd64 0.22-1build5 [10.3 kB] 1023s Get:12 http://ftpmaster.internal/ubuntu jammy/main amd64 libdynaloader-functions-perl all 0.003-1.1 [12.1 kB] 1023s Get:13 http://ftpmaster.internal/ubuntu jammy/main amd64 libdevel-callchecker-perl amd64 0.008-1ubuntu4 [14.9 kB] 1023s Get:14 http://ftpmaster.internal/ubuntu jammy/main amd64 libparams-classify-perl amd64 0.015-1build5 [22.0 kB] 1023s Get:15 http://ftpmaster.internal/ubuntu jammy/main amd64 libmodule-runtime-perl all 0.016-1 [16.2 kB] 1023s Get:16 http://ftpmaster.internal/ubuntu jammy/main amd64 libimport-into-perl all 1.002005-1 [11.0 kB] 1023s Get:17 http://ftpmaster.internal/ubuntu jammy/main amd64 librole-tiny-perl all 2.002004-1 [16.3 kB] 1023s Get:18 http://ftpmaster.internal/ubuntu jammy/main amd64 libsub-quote-perl all 2.006006-1 [19.5 kB] 1023s Get:19 http://ftpmaster.internal/ubuntu jammy/main amd64 libmoo-perl all 2.005004-3 [48.0 kB] 1023s Get:20 http://ftpmaster.internal/ubuntu jammy/main amd64 libencode-locale-perl all 1.05-1.1 [11.8 kB] 1023s Get:21 http://ftpmaster.internal/ubuntu jammy/main amd64 libtimedate-perl all 2.3300-2 [34.0 kB] 1023s Get:22 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-date-perl all 6.05-1 [9920 B] 1023s Get:23 http://ftpmaster.internal/ubuntu jammy/main amd64 libfile-listing-perl all 6.14-1 [11.2 kB] 1023s Get:24 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tagset-perl all 3.20-4 [12.5 kB] 1023s Get:25 http://ftpmaster.internal/ubuntu jammy/main amd64 liburi-perl all 5.10-1 [78.8 kB] 1023s Get:26 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-parser-perl amd64 3.76-1build2 [88.4 kB] 1023s Get:27 http://ftpmaster.internal/ubuntu jammy/main amd64 libhtml-tree-perl all 5.07-2 [200 kB] 1023s Get:28 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-html-perl all 1.004-2 [15.4 kB] 1023s Get:29 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-mediatypes-perl all 6.04-1 [19.5 kB] 1023s Get:30 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-message-perl all 6.36-1 [76.8 kB] 1023s Get:31 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-cookies-perl all 6.10-1 [18.4 kB] 1023s Get:32 http://ftpmaster.internal/ubuntu jammy/main amd64 libhttp-negotiate-perl all 6.01-1 [12.5 kB] 1023s Get:33 http://ftpmaster.internal/ubuntu jammy/main amd64 perl-openssl-defaults amd64 5build2 [7542 B] 1023s Get:34 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-ssleay-perl amd64 1.92-1build2 [327 kB] 1023s Get:35 http://ftpmaster.internal/ubuntu jammy/main amd64 libio-socket-ssl-perl all 2.074-2 [192 kB] 1023s Get:36 http://ftpmaster.internal/ubuntu jammy/main amd64 libnet-http-perl all 6.22-1 [23.2 kB] 1023s Get:37 http://ftpmaster.internal/ubuntu jammy/main amd64 liblwp-protocol-https-perl all 6.10-1 [10.9 kB] 1023s Get:38 http://ftpmaster.internal/ubuntu jammy/main amd64 libtry-tiny-perl all 0.31-1 [21.8 kB] 1023s Get:39 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-robotrules-perl all 6.02-1 [12.6 kB] 1023s Get:40 http://ftpmaster.internal/ubuntu jammy/main amd64 libwww-perl all 6.61-1 [141 kB] 1023s Get:41 http://ftpmaster.internal/ubuntu jammy/main amd64 patchutils amd64 0.4.2-1build2 [77.8 kB] 1023s Get:42 http://ftpmaster.internal/ubuntu jammy/main amd64 wdiff amd64 1.2.2-2build3 [29.6 kB] 1023s Get:43 http://ftpmaster.internal/ubuntu jammy/main amd64 devscripts amd64 2.22.1ubuntu1 [1057 kB] 1023s Get:44 http://ftpmaster.internal/ubuntu jammy/main amd64 liberror-perl all 0.17029-1 [26.5 kB] 1023s Get:45 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git-man all 1:2.34.1-1ubuntu1.12 [955 kB] 1023s Get:46 http://ftpmaster.internal/ubuntu jammy-updates/main amd64 git amd64 1:2.34.1-1ubuntu1.12 [3165 kB] 1023s Get:47 http://ftpmaster.internal/ubuntu jammy/main amd64 python3-dateutil all 2.8.1-6 [78.4 kB] 1023s Get:48 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-buildpackage all 0.9.25 [799 kB] 1023s Get:49 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfile-fnmatch-perl amd64 0.02-2build8 [10.5 kB] 1023s Get:50 http://ftpmaster.internal/ubuntu jammy/universe amd64 git-debrebase all 9.15 [67.5 kB] 1023s Get:51 http://ftpmaster.internal/ubuntu jammy/universe amd64 chiark-utils-bin amd64 6.1.2+nmu1 [52.9 kB] 1023s Get:52 http://ftpmaster.internal/ubuntu jammy/universe amd64 libfaketime amd64 0.9.8-9 [35.3 kB] 1023s Get:53 http://ftpmaster.internal/ubuntu jammy/universe amd64 faketime amd64 0.9.8-9 [10.1 kB] 1024s Fetched 8194 kB in 0s (59.1 MB/s) 1024s Selecting previously unselected package libfakeroot:amd64. 1024s (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 67963 files and directories currently installed.) 1024s Preparing to unpack .../00-libfakeroot_1.28-1ubuntu1_amd64.deb ... 1024s Unpacking libfakeroot:amd64 (1.28-1ubuntu1) ... 1024s Selecting previously unselected package fakeroot. 1024s Preparing to unpack .../01-fakeroot_1.28-1ubuntu1_amd64.deb ... 1024s Unpacking fakeroot (1.28-1ubuntu1) ... 1024s Selecting previously unselected package libfile-dirlist-perl. 1024s Preparing to unpack .../02-libfile-dirlist-perl_0.05-2_all.deb ... 1024s Unpacking libfile-dirlist-perl (0.05-2) ... 1024s Selecting previously unselected package libfile-which-perl. 1024s Preparing to unpack .../03-libfile-which-perl_1.23-1_all.deb ... 1024s Unpacking libfile-which-perl (1.23-1) ... 1024s Selecting previously unselected package libfile-homedir-perl. 1024s Preparing to unpack .../04-libfile-homedir-perl_1.006-1_all.deb ... 1024s Unpacking libfile-homedir-perl (1.006-1) ... 1024s Selecting previously unselected package libfile-touch-perl. 1024s Preparing to unpack .../05-libfile-touch-perl_0.12-1_all.deb ... 1024s Unpacking libfile-touch-perl (0.12-1) ... 1024s Selecting previously unselected package libio-pty-perl. 1024s Preparing to unpack .../06-libio-pty-perl_1%3a1.15-2build2_amd64.deb ... 1024s Unpacking libio-pty-perl (1:1.15-2build2) ... 1024s Selecting previously unselected package libipc-run-perl. 1024s Preparing to unpack .../07-libipc-run-perl_20200505.0-1_all.deb ... 1024s Unpacking libipc-run-perl (20200505.0-1) ... 1024s Selecting previously unselected package libclass-method-modifiers-perl. 1024s Preparing to unpack .../08-libclass-method-modifiers-perl_2.13-1_all.deb ... 1024s Unpacking libclass-method-modifiers-perl (2.13-1) ... 1024s Selecting previously unselected package libclass-xsaccessor-perl. 1024s Preparing to unpack .../09-libclass-xsaccessor-perl_1.19-3build9_amd64.deb ... 1024s Unpacking libclass-xsaccessor-perl (1.19-3build9) ... 1024s Selecting previously unselected package libb-hooks-op-check-perl. 1024s Preparing to unpack .../10-libb-hooks-op-check-perl_0.22-1build5_amd64.deb ... 1024s Unpacking libb-hooks-op-check-perl (0.22-1build5) ... 1024s Selecting previously unselected package libdynaloader-functions-perl. 1024s Preparing to unpack .../11-libdynaloader-functions-perl_0.003-1.1_all.deb ... 1024s Unpacking libdynaloader-functions-perl (0.003-1.1) ... 1024s Selecting previously unselected package libdevel-callchecker-perl. 1024s Preparing to unpack .../12-libdevel-callchecker-perl_0.008-1ubuntu4_amd64.deb ... 1024s Unpacking libdevel-callchecker-perl (0.008-1ubuntu4) ... 1024s Selecting previously unselected package libparams-classify-perl. 1024s Preparing to unpack .../13-libparams-classify-perl_0.015-1build5_amd64.deb ... 1024s Unpacking libparams-classify-perl (0.015-1build5) ... 1024s Selecting previously unselected package libmodule-runtime-perl. 1024s Preparing to unpack .../14-libmodule-runtime-perl_0.016-1_all.deb ... 1024s Unpacking libmodule-runtime-perl (0.016-1) ... 1024s Selecting previously unselected package libimport-into-perl. 1024s Preparing to unpack .../15-libimport-into-perl_1.002005-1_all.deb ... 1024s Unpacking libimport-into-perl (1.002005-1) ... 1024s Selecting previously unselected package librole-tiny-perl. 1024s Preparing to unpack .../16-librole-tiny-perl_2.002004-1_all.deb ... 1024s Unpacking librole-tiny-perl (2.002004-1) ... 1024s Selecting previously unselected package libsub-quote-perl. 1024s Preparing to unpack .../17-libsub-quote-perl_2.006006-1_all.deb ... 1024s Unpacking libsub-quote-perl (2.006006-1) ... 1024s Selecting previously unselected package libmoo-perl. 1024s Preparing to unpack .../18-libmoo-perl_2.005004-3_all.deb ... 1024s Unpacking libmoo-perl (2.005004-3) ... 1024s Selecting previously unselected package libencode-locale-perl. 1024s Preparing to unpack .../19-libencode-locale-perl_1.05-1.1_all.deb ... 1024s Unpacking libencode-locale-perl (1.05-1.1) ... 1024s Selecting previously unselected package libtimedate-perl. 1024s Preparing to unpack .../20-libtimedate-perl_2.3300-2_all.deb ... 1024s Unpacking libtimedate-perl (2.3300-2) ... 1024s Selecting previously unselected package libhttp-date-perl. 1024s Preparing to unpack .../21-libhttp-date-perl_6.05-1_all.deb ... 1024s Unpacking libhttp-date-perl (6.05-1) ... 1024s Selecting previously unselected package libfile-listing-perl. 1024s Preparing to unpack .../22-libfile-listing-perl_6.14-1_all.deb ... 1024s Unpacking libfile-listing-perl (6.14-1) ... 1024s Selecting previously unselected package libhtml-tagset-perl. 1024s Preparing to unpack .../23-libhtml-tagset-perl_3.20-4_all.deb ... 1024s Unpacking libhtml-tagset-perl (3.20-4) ... 1024s Selecting previously unselected package liburi-perl. 1024s Preparing to unpack .../24-liburi-perl_5.10-1_all.deb ... 1024s Unpacking liburi-perl (5.10-1) ... 1024s Selecting previously unselected package libhtml-parser-perl:amd64. 1024s Preparing to unpack .../25-libhtml-parser-perl_3.76-1build2_amd64.deb ... 1024s Unpacking libhtml-parser-perl:amd64 (3.76-1build2) ... 1024s Selecting previously unselected package libhtml-tree-perl. 1024s Preparing to unpack .../26-libhtml-tree-perl_5.07-2_all.deb ... 1024s Unpacking libhtml-tree-perl (5.07-2) ... 1024s Selecting previously unselected package libio-html-perl. 1024s Preparing to unpack .../27-libio-html-perl_1.004-2_all.deb ... 1024s Unpacking libio-html-perl (1.004-2) ... 1024s Selecting previously unselected package liblwp-mediatypes-perl. 1024s Preparing to unpack .../28-liblwp-mediatypes-perl_6.04-1_all.deb ... 1024s Unpacking liblwp-mediatypes-perl (6.04-1) ... 1024s Selecting previously unselected package libhttp-message-perl. 1024s Preparing to unpack .../29-libhttp-message-perl_6.36-1_all.deb ... 1024s Unpacking libhttp-message-perl (6.36-1) ... 1024s Selecting previously unselected package libhttp-cookies-perl. 1024s Preparing to unpack .../30-libhttp-cookies-perl_6.10-1_all.deb ... 1024s Unpacking libhttp-cookies-perl (6.10-1) ... 1024s Selecting previously unselected package libhttp-negotiate-perl. 1024s Preparing to unpack .../31-libhttp-negotiate-perl_6.01-1_all.deb ... 1024s Unpacking libhttp-negotiate-perl (6.01-1) ... 1024s Selecting previously unselected package perl-openssl-defaults:amd64. 1024s Preparing to unpack .../32-perl-openssl-defaults_5build2_amd64.deb ... 1024s Unpacking perl-openssl-defaults:amd64 (5build2) ... 1024s Selecting previously unselected package libnet-ssleay-perl:amd64. 1024s Preparing to unpack .../33-libnet-ssleay-perl_1.92-1build2_amd64.deb ... 1024s Unpacking libnet-ssleay-perl:amd64 (1.92-1build2) ... 1024s Selecting previously unselected package libio-socket-ssl-perl. 1024s Preparing to unpack .../34-libio-socket-ssl-perl_2.074-2_all.deb ... 1024s Unpacking libio-socket-ssl-perl (2.074-2) ... 1024s Selecting previously unselected package libnet-http-perl. 1024s Preparing to unpack .../35-libnet-http-perl_6.22-1_all.deb ... 1024s Unpacking libnet-http-perl (6.22-1) ... 1024s Selecting previously unselected package liblwp-protocol-https-perl. 1024s Preparing to unpack .../36-liblwp-protocol-https-perl_6.10-1_all.deb ... 1024s Unpacking liblwp-protocol-https-perl (6.10-1) ... 1024s Selecting previously unselected package libtry-tiny-perl. 1024s Preparing to unpack .../37-libtry-tiny-perl_0.31-1_all.deb ... 1024s Unpacking libtry-tiny-perl (0.31-1) ... 1024s Selecting previously unselected package libwww-robotrules-perl. 1024s Preparing to unpack .../38-libwww-robotrules-perl_6.02-1_all.deb ... 1024s Unpacking libwww-robotrules-perl (6.02-1) ... 1024s Selecting previously unselected package libwww-perl. 1024s Preparing to unpack .../39-libwww-perl_6.61-1_all.deb ... 1024s Unpacking libwww-perl (6.61-1) ... 1024s Selecting previously unselected package patchutils. 1024s Preparing to unpack .../40-patchutils_0.4.2-1build2_amd64.deb ... 1024s Unpacking patchutils (0.4.2-1build2) ... 1024s Selecting previously unselected package wdiff. 1024s Preparing to unpack .../41-wdiff_1.2.2-2build3_amd64.deb ... 1024s Unpacking wdiff (1.2.2-2build3) ... 1024s Selecting previously unselected package devscripts. 1024s Preparing to unpack .../42-devscripts_2.22.1ubuntu1_amd64.deb ... 1024s Unpacking devscripts (2.22.1ubuntu1) ... 1025s Selecting previously unselected package liberror-perl. 1025s Preparing to unpack .../43-liberror-perl_0.17029-1_all.deb ... 1025s Unpacking liberror-perl (0.17029-1) ... 1025s Selecting previously unselected package git-man. 1025s Preparing to unpack .../44-git-man_1%3a2.34.1-1ubuntu1.12_all.deb ... 1025s Unpacking git-man (1:2.34.1-1ubuntu1.12) ... 1025s Selecting previously unselected package git. 1025s Preparing to unpack .../45-git_1%3a2.34.1-1ubuntu1.12_amd64.deb ... 1025s Unpacking git (1:2.34.1-1ubuntu1.12) ... 1025s Selecting previously unselected package python3-dateutil. 1025s Preparing to unpack .../46-python3-dateutil_2.8.1-6_all.deb ... 1025s Unpacking python3-dateutil (2.8.1-6) ... 1025s Selecting previously unselected package git-buildpackage. 1025s Preparing to unpack .../47-git-buildpackage_0.9.25_all.deb ... 1025s Unpacking git-buildpackage (0.9.25) ... 1025s Selecting previously unselected package libfile-fnmatch-perl. 1025s Preparing to unpack .../48-libfile-fnmatch-perl_0.02-2build8_amd64.deb ... 1025s Unpacking libfile-fnmatch-perl (0.02-2build8) ... 1025s Selecting previously unselected package git-debrebase. 1025s Preparing to unpack .../49-git-debrebase_9.15_all.deb ... 1025s Unpacking git-debrebase (9.15) ... 1025s Selecting previously unselected package chiark-utils-bin. 1025s Preparing to unpack .../50-chiark-utils-bin_6.1.2+nmu1_amd64.deb ... 1025s Unpacking chiark-utils-bin (6.1.2+nmu1) ... 1025s Selecting previously unselected package libfaketime:amd64. 1025s Preparing to unpack .../51-libfaketime_0.9.8-9_amd64.deb ... 1025s Unpacking libfaketime:amd64 (0.9.8-9) ... 1025s Selecting previously unselected package faketime. 1025s Preparing to unpack .../52-faketime_0.9.8-9_amd64.deb ... 1025s Unpacking faketime (0.9.8-9) ... 1025s Setting up wdiff (1.2.2-2build3) ... 1025s Setting up libfile-which-perl (1.23-1) ... 1025s Setting up libdynaloader-functions-perl (0.003-1.1) ... 1025s Setting up libclass-method-modifiers-perl (2.13-1) ... 1025s Setting up libio-pty-perl (1:1.15-2build2) ... 1025s Setting up libhtml-tagset-perl (3.20-4) ... 1025s Setting up liblwp-mediatypes-perl (6.04-1) ... 1025s Setting up libtry-tiny-perl (0.31-1) ... 1025s Setting up perl-openssl-defaults:amd64 (5build2) ... 1025s Setting up libencode-locale-perl (1.05-1.1) ... 1025s Setting up libfakeroot:amd64 (1.28-1ubuntu1) ... 1025s Setting up chiark-utils-bin (6.1.2+nmu1) ... 1025s Setting up fakeroot (1.28-1ubuntu1) ... 1025s update-alternatives: using /usr/bin/fakeroot-sysv to provide /usr/bin/fakeroot (fakeroot) in auto mode 1025s Setting up liberror-perl (0.17029-1) ... 1025s Setting up patchutils (0.4.2-1build2) ... 1025s Setting up libio-html-perl (1.004-2) ... 1025s Setting up libb-hooks-op-check-perl (0.22-1build5) ... 1025s Setting up libipc-run-perl (20200505.0-1) ... 1025s Setting up libfile-fnmatch-perl (0.02-2build8) ... 1025s Setting up libtimedate-perl (2.3300-2) ... 1025s Setting up librole-tiny-perl (2.002004-1) ... 1025s Setting up git-man (1:2.34.1-1ubuntu1.12) ... 1025s Setting up python3-dateutil (2.8.1-6) ... 1025s Setting up libsub-quote-perl (2.006006-1) ... 1025s Setting up libclass-xsaccessor-perl (1.19-3build9) ... 1025s Setting up libfile-dirlist-perl (0.05-2) ... 1025s Setting up libfile-homedir-perl (1.006-1) ... 1025s Setting up liburi-perl (5.10-1) ... 1025s Setting up libfile-touch-perl (0.12-1) ... 1025s Setting up libfaketime:amd64 (0.9.8-9) ... 1025s Setting up libnet-ssleay-perl:amd64 (1.92-1build2) ... 1025s Setting up faketime (0.9.8-9) ... 1025s Setting up libhttp-date-perl (6.05-1) ... 1025s Setting up libfile-listing-perl (6.14-1) ... 1025s Setting up libnet-http-perl (6.22-1) ... 1025s Setting up libdevel-callchecker-perl (0.008-1ubuntu4) ... 1025s Setting up git (1:2.34.1-1ubuntu1.12) ... 1025s Setting up libwww-robotrules-perl (6.02-1) ... 1025s Setting up libhtml-parser-perl:amd64 (3.76-1build2) ... 1025s Setting up libio-socket-ssl-perl (2.074-2) ... 1025s Setting up libhttp-message-perl (6.36-1) ... 1025s Setting up libhttp-negotiate-perl (6.01-1) ... 1025s Setting up libhttp-cookies-perl (6.10-1) ... 1025s Setting up libhtml-tree-perl (5.07-2) ... 1025s Setting up libparams-classify-perl (0.015-1build5) ... 1025s Setting up libmodule-runtime-perl (0.016-1) ... 1025s Setting up libimport-into-perl (1.002005-1) ... 1025s Setting up libmoo-perl (2.005004-3) ... 1025s Setting up liblwp-protocol-https-perl (6.10-1) ... 1025s Setting up libwww-perl (6.61-1) ... 1025s Setting up devscripts (2.22.1ubuntu1) ... 1025s Setting up git-buildpackage (0.9.25) ... 1025s Setting up git-debrebase (9.15) ... 1025s Processing triggers for libc-bin (2.35-0ubuntu3.9) ... 1025s Processing triggers for man-db (2.10.2-1) ... 1026s Processing triggers for install-info (6.8-4build1) ... 1026s autopkgtest [12:35:20]: test gdr-newupstream: [----------------------- 1026s ++ set -o pipefail 1026s ++ . tests/lib-core 1026s ++ . tests/lib-restricts 1026s ++ trap ' 1026s rc=$? 1026s set +x 1026s test $rc = 0 || echo " 1026s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1026s 1026s Most relevant logs are just before assignment rc=$rc 1026s Will now do cleanup etc. 1026s " 1026s set -x 1026s set +e 1026s pwd 1026s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1026s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1026s set -e 1026s test $rc = 0 || t-report-failure 1026s ' EXIT 1026s ++ t-filter-out-git-hyphen-dir 1026s ++ local pathent 1026s +++ type -p git-rev-parse 1026s +++ : 1026s ++ pathent= 1026s ++ case "$pathent" in 1026s ++ return 1026s ++ t-set-intree 1026s ++ '[' x = x ']' 1026s ++ return 1026s ++ : -D 1026s ++ export DGIT_TEST_DEBUG 1026s ++ : x 1026s ++ export DGIT_TEST_DEBPUSH_DEBUG 1026s ++ : 1026s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1026s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1026s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1026s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1026s ++ export LC_CTYPE=C.UTF-8 1026s ++ LC_CTYPE=C.UTF-8 1026s ++ unset CDPATH 1026s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1026s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1026s +++ pwd 1026s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1026s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ testname=gdr-newupstream 1026s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ bpd=.. 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1026s ++ '[' x '!=' x ']' 1026s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s +++ pwd 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ t-set-using-tmp 1026s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ export 'DEBFULLNAME=dgit test git user' 1026s ++ DEBFULLNAME='dgit test git user' 1026s ++ git config --global user.email dgit-test@debian.example.net 1026s ++ git config --global user.name 'dgit test git user' 1026s ++ git config --global protocol.ext.allow always 1026s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1026s ++ env -0 1026s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1026s ++ export DEBCHANGE_VENDOR=dpkg 1026s ++ DEBCHANGE_VENDOR=dpkg 1026s ++ unset VISUAL 1026s ++ unset GIT_EDITOR 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1026s ++ cat 1026s ++ schroot=build 1026s ++ : aq 1026s ++ : archive/test-dummy 1026s ++ : sid:unstable 1026s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1026s ++ git config --global dgit.default.old-dsc-distro test-dummy 1026s + t-dependencies NO-DGIT GDR 1026s + : 'Hopefully installed: NO-DGIT GDR' 1026s + t-tstunt-parsechangelog 1026s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + local var=PATH 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + eval ' 1026s case "$PATH" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PATH="$tstunt" ;; 1026s *) PATH="$tstunt:$PATH" ;; 1026s esac 1026s export PATH 1026s ' 1026s ++ case "$PATH" in 1026s ++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ export PATH 1026s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + local var=PERLLIB 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + eval ' 1026s case "$PERLLIB" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PERLLIB="$tstunt" ;; 1026s *) PERLLIB="$tstunt:$PERLLIB" ;; 1026s esac 1026s export PERLLIB 1026s ' 1026s ++ case "$PERLLIB" in 1026s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ export PERLLIB 1026s + local f 1026s + for f in "$@" 1026s + t-tstunt--save-real dpkg-parsechangelog 1026s + local f=dpkg-parsechangelog 1026s + case "$f" in 1026s + local rc 1026s + local real 1026s + set +e 1026s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ type -p dpkg-parsechangelog 1026s + real=/usr/bin/dpkg-parsechangelog 1026s + rc=0 1026s + set -e 1026s + case $rc in 1026s + local varname=dpkg_parsechangelog 1026s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s + eval ' 1026s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1026s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s ' 1026s ++ : /usr/bin/dpkg-parsechangelog 1026s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s + f=./dpkg-parsechangelog 1026s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1026s + for f in "$@" 1026s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1026s + local f=Dpkg/Changelog/Parse.pm 1026s + case "$f" in 1026s + return 1026s + f=./Dpkg/Changelog/Parse.pm 1026s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1026s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1026s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1026s + t-setup-import gdr-convert-gbp-noarchive 1026s + local setupname=gdr-convert-gbp-noarchive 1026s + local setupsrc 1026s + local lock 1026s + '[' x = x ']' 1026s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 1026s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1026s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1026s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 1026s cd "$1"; shift 1026s setupname="$1"; shift 1026s simport="$1"; shift 1026s if [ -e "$simport" ]; then exit 0; fi 1026s env - "$@" \ 1026s "tests/setup/$setupname" 1026s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gdr-convert-gbp-noarchive /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1026s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1026s + shift 1026s + setupname=gdr-convert-gbp-noarchive 1026s + shift 1026s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1026s + shift 1026s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1026s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-newupstream-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-newupstream-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-newupstream -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-newupstream' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 1026s ++ set -o pipefail 1026s ++ . tests/lib-core 1026s ++ . tests/lib-restricts 1026s ++ trap ' 1026s rc=$? 1026s set +x 1026s test $rc = 0 || echo " 1026s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1026s 1026s Most relevant logs are just before assignment rc=$rc 1026s Will now do cleanup etc. 1026s " 1026s set -x 1026s set +e 1026s pwd 1026s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1026s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1026s set -e 1026s test $rc = 0 || t-report-failure 1026s ' EXIT 1026s ++ t-filter-out-git-hyphen-dir 1026s ++ local pathent 1026s +++ type -p git-rev-parse 1026s +++ : 1026s ++ pathent= 1026s ++ case "$pathent" in 1026s ++ return 1026s ++ t-set-intree 1026s ++ '[' x = x ']' 1026s ++ return 1026s ++ : -D 1026s ++ export DGIT_TEST_DEBUG 1026s ++ : x 1026s ++ export DGIT_TEST_DEBPUSH_DEBUG 1026s ++ : 1026s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1026s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1026s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1026s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1026s ++ export LC_CTYPE=C.UTF-8 1026s ++ LC_CTYPE=C.UTF-8 1026s ++ unset CDPATH 1026s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1026s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1026s +++ pwd 1026s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1026s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ testname=gdr-convert-gbp-noarchive 1026s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ bpd=.. 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1026s ++ '[' x '!=' x ']' 1026s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s +++ pwd 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ t-set-using-tmp 1026s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ export 'DEBFULLNAME=dgit test git user' 1026s ++ DEBFULLNAME='dgit test git user' 1026s ++ git config --global user.email dgit-test@debian.example.net 1026s ++ git config --global user.name 'dgit test git user' 1026s ++ git config --global protocol.ext.allow always 1026s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1026s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1026s ++ export DEBCHANGE_VENDOR=dpkg 1026s ++ DEBCHANGE_VENDOR=dpkg 1026s ++ unset VISUAL 1026s ++ unset GIT_EDITOR 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1026s ++ cat 1026s ++ schroot=build 1026s ++ : aq 1026s ++ : archive/test-dummy 1026s ++ : sid:unstable 1026s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1026s ++ git config --global dgit.default.old-dsc-distro test-dummy 1026s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1026s ++ : -D 1026s ++ export GDR_TEST_DEBUG 1026s ++ t-tstunt debchange 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ local var=PATH 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ eval ' 1026s case "$PATH" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PATH="$tstunt" ;; 1026s *) PATH="$tstunt:$PATH" ;; 1026s esac 1026s export PATH 1026s ' 1026s +++ case "$PATH" in 1026s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ export PATH 1026s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ local var=PERLLIB 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ eval ' 1026s case "$PERLLIB" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PERLLIB="$tstunt" ;; 1026s *) PERLLIB="$tstunt:$PERLLIB" ;; 1026s esac 1026s export PERLLIB 1026s ' 1026s +++ case "$PERLLIB" in 1026s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s +++ export PERLLIB 1026s ++ local f 1026s ++ for f in "$@" 1026s ++ t-tstunt--save-real debchange 1026s ++ local f=debchange 1026s ++ case "$f" in 1026s ++ local rc 1026s ++ local real 1026s ++ set +e 1026s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ type -p debchange 1026s ++ real=/usr/bin/debchange 1026s ++ rc=0 1026s ++ set -e 1026s ++ case $rc in 1026s ++ local varname=debchange 1026s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1026s ++ eval ' 1026s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1026s export DGIT_TEST_REAL_DEBCHANGE 1026s ' 1026s +++ : /usr/bin/debchange 1026s +++ export DGIT_TEST_REAL_DEBCHANGE 1026s ++ f=./debchange 1026s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1026s + t-dependencies GDR 1026s + : 'Hopefully installed: GDR' 1026s + export ifarchive=: 1026s + ifarchive=: 1026s + t-chain-test gdr-convert-gbp 1026s + t-chain-test-somehow 1026s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1026s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1026s + export DGIT_TEST_TMPBASE= 1026s + DGIT_TEST_TMPBASE= 1026s + export ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s + ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s + local ct=gdr-convert-gbp 1026s + local d=tests/setup 1026s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1026s + exec tests/setup/gdr-convert-gbp 1026s ++ set -o pipefail 1026s ++ . tests/lib-core 1026s ++ . tests/lib-restricts 1026s ++ trap ' 1026s rc=$? 1026s set +x 1026s test $rc = 0 || echo " 1026s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1026s 1026s Most relevant logs are just before assignment rc=$rc 1026s Will now do cleanup etc. 1026s " 1026s set -x 1026s set +e 1026s pwd 1026s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1026s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1026s set -e 1026s test $rc = 0 || t-report-failure 1026s ' EXIT 1026s ++ t-filter-out-git-hyphen-dir 1026s ++ local pathent 1026s +++ type -p git-rev-parse 1026s +++ : 1026s ++ pathent= 1026s ++ case "$pathent" in 1026s ++ return 1026s ++ t-set-intree 1026s ++ '[' x = x ']' 1026s ++ return 1026s ++ : -D 1026s ++ export DGIT_TEST_DEBUG 1026s ++ : x 1026s ++ export DGIT_TEST_DEBPUSH_DEBUG 1026s ++ : 1026s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1026s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1026s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1026s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1026s ++ export LC_CTYPE=C.UTF-8 1026s ++ LC_CTYPE=C.UTF-8 1026s ++ unset CDPATH 1026s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1026s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1026s +++ pwd 1026s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1026s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ testname=gdr-convert-gbp-noarchive 1026s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1026s ++ bpd=.. 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1026s ++ '[' x '!=' x ']' 1026s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s +++ pwd 1026s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ t-set-using-tmp 1026s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1026s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1026s ++ export 'DEBFULLNAME=dgit test git user' 1026s ++ DEBFULLNAME='dgit test git user' 1026s ++ git config --global user.email dgit-test@debian.example.net 1026s ++ git config --global user.name 'dgit test git user' 1026s ++ git config --global protocol.ext.allow always 1026s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1026s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1026s ++ export DEBCHANGE_VENDOR=dpkg 1026s ++ DEBCHANGE_VENDOR=dpkg 1026s ++ unset VISUAL 1026s ++ unset GIT_EDITOR 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1026s ++ cat 1026s ++ schroot=build 1026s ++ : aq 1026s ++ : archive/test-dummy 1026s ++ : sid:unstable 1026s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1026s ++ git config --global dgit.default.old-dsc-distro test-dummy 1026s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1026s ++ : -D 1026s ++ export GDR_TEST_DEBUG 1026s ++ t-tstunt debchange 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ local var=PATH 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ eval ' 1026s case "$PATH" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PATH="$tstunt" ;; 1026s *) PATH="$tstunt:$PATH" ;; 1026s esac 1026s export PATH 1026s ' 1026s +++ case "$PATH" in 1026s +++ export PATH 1026s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ local var=PERLLIB 1026s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s ++ eval ' 1026s case "$PERLLIB" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PERLLIB="$tstunt" ;; 1026s *) PERLLIB="$tstunt:$PERLLIB" ;; 1026s esac 1026s export PERLLIB 1026s ' 1026s +++ case "$PERLLIB" in 1026s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s +++ export PERLLIB 1026s ++ local f 1026s ++ for f in "$@" 1026s ++ t-tstunt--save-real debchange 1026s ++ local f=debchange 1026s ++ case "$f" in 1026s ++ local rc 1026s ++ local real 1026s ++ set +e 1026s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s +++ type -p debchange 1026s ++ real=/usr/bin/debchange 1026s ++ rc=0 1026s ++ set -e 1026s ++ case $rc in 1026s ++ local varname=debchange 1026s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1026s ++ eval ' 1026s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1026s export DGIT_TEST_REAL_DEBCHANGE 1026s ' 1026s +++ : /usr/bin/debchange 1026s +++ export DGIT_TEST_REAL_DEBCHANGE 1026s ++ f=./debchange 1026s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1026s + : t-setup-import gnupg 1026s + t-dependencies GDR 1026s + : 'Hopefully installed: GDR' 1026s + t-tstunt-parsechangelog 1026s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + local var=PATH 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + eval ' 1026s case "$PATH" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PATH="$tstunt" ;; 1026s *) PATH="$tstunt:$PATH" ;; 1026s esac 1026s export PATH 1026s ' 1026s ++ case "$PATH" in 1026s ++ export PATH 1026s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + local var=PERLLIB 1026s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1026s + eval ' 1026s case "$PERLLIB" in 1026s "$tstunt:"*) ;; 1026s *":$tstunt:"*) ;; 1026s "") PERLLIB="$tstunt" ;; 1026s *) PERLLIB="$tstunt:$PERLLIB" ;; 1026s esac 1026s export PERLLIB 1026s ' 1026s ++ case "$PERLLIB" in 1026s ++ export PERLLIB 1026s + local f 1026s + for f in "$@" 1026s + t-tstunt--save-real dpkg-parsechangelog 1026s + local f=dpkg-parsechangelog 1026s + case "$f" in 1026s + local rc 1026s + local real 1026s + set +e 1026s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1026s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1026s ++ type -p dpkg-parsechangelog 1026s + real=/usr/bin/dpkg-parsechangelog 1026s + rc=0 1026s + set -e 1026s + case $rc in 1026s + local varname=dpkg_parsechangelog 1026s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s + eval ' 1026s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1026s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s ' 1026s ++ : /usr/bin/dpkg-parsechangelog 1026s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1026s + f=./dpkg-parsechangelog 1026s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1026s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1026s + for f in "$@" 1026s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1026s + local f=Dpkg/Changelog/Parse.pm 1026s + case "$f" in 1026s + return 1026s + f=./Dpkg/Changelog/Parse.pm 1026s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1026s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1026s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1026s + t-gdr-gbp-import-core-with-queue 1026s + t-gdr-gbp-import-core 1026s + p=example 1026s + t-worktree 1.1 1026s + rm -rf example 1026s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 1026s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1026s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1026s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1026s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1026s + cd example 1026s + : 'fake up some kind of upstream' 1026s + git checkout -b upstream quilt-tip 1026s Switched to a new branch 'upstream' 1026s + rm -rf debian 1026s + mkdir debian 1026s + echo junk 1026s + git add debian 1026s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1026s [upstream 98d1ef3] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1026s 6 files changed, 1 insertion(+), 36 deletions(-) 1026s delete mode 100644 debian/changelog 1026s delete mode 100644 debian/compat 1026s delete mode 100644 debian/control 1026s delete mode 100644 debian/example.install 1026s mode change 100755 => 100644 debian/rules 1026s delete mode 100644 debian/source/format 1026s + git tag v1.0 1026s + : 'fake up that our quilt-tip was descended from upstream' 1026s + git checkout quilt-tip 1026s Switched to branch 'quilt-tip' 1026s + git merge --no-edit -s ours upstream 1026s Merge made by the 'ours' strategy. 1026s + : 'fake up that our quilt-tip had the patch queue in it' 1026s + git checkout patch-queue/quilt-tip 1026s Switched to branch 'patch-queue/quilt-tip' 1026s + gbp pq export 1027s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1027s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1027s + git add debian/patches 1027s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1027s [quilt-tip 2d660f7] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1027s 4 files changed, 50 insertions(+) 1027s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1027s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1027s create mode 100644 debian/patches/series 1027s create mode 100644 debian/patches/subdir/addnewups 1027s + : 'make branch names more conventional' 1027s + git branch -D master 1027s Deleted branch master (was 17d67db). 1027s + git branch -m quilt-tip master 1027s + not-gdr-processable origin 1027s + git branch gdr-unprocessable/origin 1027s + t-git-debrebase analyse 1027s + local gdr=git-debrebase 1027s + : ' 1027s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1027s + git-debrebase --dgit=dgit -D analyse 1027s + grep 'Unknown Unprocessable' 1027s git-debrebase *** WALK 2d660f75d860eebc7c1d206b7b36383e1ee4add4 1 *main::STDOUT 1027s git-debrebase get_differs 1bc46c9d4678351c17d3f6376286edb58ddee61b bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1027s git-debrebase classify 2d660f75d860eebc7c1d206b7b36383e1ee4add4 $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 1bc46c9d4678351c17d3f6376286edb58ddee61b/0x4 1027s git-debrebase = AddPatches {"Msg" => "patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)\n","CommitId" => "2d660f75d860eebc7c1d206b7b36383e1ee4add4","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 1bc46c9d4678351c17d3f6376286edb58ddee61b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Differs" => 4,"Ix" => 0}],"Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches"} 1027s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1027s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1027s git-debrebase classify 1bc46c9d4678351c17d3f6376286edb58ddee61b $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 98d1ef33f97b1baf0e88f735213286f40a2d2980/0x30 1027s git-debrebase = Pseudomerge {"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 98d1ef33f97b1baf0e88f735213286f40a2d2980\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Merge branch 'upstream' into quilt-tip\n","CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Parents" => [{"Ix" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "98d1ef33f97b1baf0e88f735213286f40a2d2980"}],"Contributor" => $VAR1->{"Parents"}[0],"Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102"} 1027s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1027s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1027s git-debrebase = Upstream {"Msg" => "Add *.o to .gitignore\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}]} 1027s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1027s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1027s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Ix" => 0}]} 1027s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1027s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1027s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Differs" => 32,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Ix" => 0}],"Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165"} 1027s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1027s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1027s git-debrebase = Packaging {"Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 1027s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1027s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1027s git-debrebase = Packaging {"Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Msg" => "WIP\n","CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Type" => "Packaging","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Parents" => [{"Ix" => 0,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32}]} 1027s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1027s git-debrebase ** Unknown 1027s git-debrebase *** WALK BOMB unrecognised 1027s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1027s ' 1027s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1027s + : 'fake up an upstream 2.0' 1027s + git branch make-upstream upstream 1027s + t-make-new-upstream-tarball 2.0 1027s + local uv=2.0 1027s + git checkout make-upstream 1027s Switched to branch 'make-upstream' 1027s + echo 'upstream 2.0' 1027s + git commit -a -m 'upstream 2.0 tarball' 1027s [make-upstream 19f63cb] upstream 2.0 tarball 1027s 1 file changed, 1 insertion(+) 1027s + t-make-orig example 2.0 make-upstream 1027s + local p=example 1027s + local v=2.0 1027s + local tag=make-upstream 1027s + ust=example_2.0.orig.tar.gz 1027s + GZIP=-1 1027s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1027s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1027s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1027s + git branch -D quilt-tip-2 1027s Deleted branch quilt-tip-2 (was 99fcab4). 1027s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1027s + git branch -D gitish-only 1027s Deleted branch gitish-only (was 2b2ddc8). 1027s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1027s + git branch -D quilt-tip-1.1 1027s Deleted branch quilt-tip-1.1 (was 7fc34be). 1027s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1027s + git branch -D patch-queue/quilt-tip 1027s Deleted branch patch-queue/quilt-tip (was d843a68). 1027s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1027s + git branch -D indep-arch 1027s Deleted branch indep-arch (was e215729). 1027s + : 'see what gbp import-orig does' 1027s + git checkout master 1027s Switched to branch 'master' 1027s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1027s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1027s gbp:info: Source package is example 1027s gbp:info: Upstream version is 2.0 1027s gbp:info: Replacing upstream source on 'master' 1027s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1027s + not-gdr-processable merge 1027s + git branch gdr-unprocessable/merge 1027s + t-git-debrebase analyse 1027s + local gdr=git-debrebase 1027s + : ' 1027s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1027s + git-debrebase --dgit=dgit -D analyse 1027s + grep 'Unknown Unprocessable' 1027s git-debrebase *** WALK 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 1 *main::STDOUT 1027s git-debrebase get_differs 2d660f75d860eebc7c1d206b7b36383e1ee4add4 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1027s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1027s git-debrebase classify 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 2d660f75d860eebc7c1d206b7b36383e1ee4add4/0x2 dcacb606b0a29bcbc1331971222caf97f79a139c/0x34 1027s git-debrebase ** Unknown 1027s git-debrebase *** WALK BOMB unrecognised 1027s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1027s ' 1027s 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 Unknown Unprocessable (general two-parent merge) 1027s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1027s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1027s + DEBEMAIL=dgit-tests@example.org 1027s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1027s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 1027s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1027s [master 39a9ae4] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1027s 1 file changed, 6 insertions(+) 1027s + t-dch-commit-r 1027s + t-dch-r-rune t-dch-commit 1027s + local cmd=t-dch-commit 1027s + shift 1027s + local suite=unstable 1027s + t-dch-commit -r -D unstable '' 1027s + t-debchange -r -D unstable '' 1027s + DEBEMAIL=dgit-tests@example.org 1027s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1027s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1027s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1027s libdistro-info-perl is not installed, Debian release names are not known. 1027s libdistro-info-perl is not installed, Ubuntu release names are not known. 1027s + git commit -m 'dch -r -D unstable ' debian/changelog 1027s [master c8629cf] dch -r -D unstable 1027s 1 file changed, 3 insertions(+), 2 deletions(-) 1027s + echo garbage 1027s + git add debian/patches/garbage 1027s + git commit -m 'add garbage' debian/patches/garbage 1027s [master 07528ed] add garbage 1027s 1 file changed, 1 insertion(+) 1027s create mode 100644 debian/patches/garbage 1027s + : t-archive-none example 1027s + : t-git-none 1027s + : t-dgit -wgf --gbp push-source --new 1027s + t-salsa-add-remote 1027s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1027s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1027s + set -e 1027s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1027s + git init --bare 1027s hint: Using 'master' as the name for the initial branch. This default branch name 1027s hint: is subject to change. To configure the initial branch name to use in all 1027s hint: of your new repositories, which will suppress this warning, call: 1027s hint: 1027s hint: git config --global init.defaultBranch 1027s hint: 1027s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1027s hint: 'development'. The just-created branch can be renamed via this command: 1027s hint: 1027s hint: git branch -m 1027s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 1027s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1027s + git push --set-upstream origin master 1027s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1027s * [new branch] master -> master 1027s Branch 'master' set up to track remote branch 'master' from 'origin'. 1027s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1027s + local 'mpat=E:identical in upstream files' 1027s + shift 1027s + set +o pipefail 1027s + LC_MESSAGES=C 1027s + LANGUAGE=C 1027s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1027s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local gdr=git-debrebase 1027s + : ' 1027s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1027s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1027s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1027s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x36 1027s docs/README | 1 + 1027s 1 file changed, 1 insertion(+) 1027s 1027s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1027s git-debrebase: identical in upstream files. See diffstat above, or run 1027s git-debrebase: git diff 98d1ef33f97b1baf0e88f735213286f40a2d2980 HEAD -- :!/debian :/ 1027s + local 'ps=255 0' 1027s + set -o pipefail 1027s + case $ps in 1027s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local 'mpat=E:identical in upstream files' 1027s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local grepper=fgrep 1027s + case "$mpat" in 1027s + case "$mpat" in 1027s + grepper=egrep 1027s + mpat='identical in upstream files' 1027s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s git-debrebase: identical in upstream files. See diffstat above, or run 1027s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1027s + local 'mpat=E:Unused patch file garbage will be discarded' 1027s + shift 1027s + set +o pipefail 1027s + LC_MESSAGES=C 1027s + LANGUAGE=C 1027s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1027s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local gdr=git-debrebase 1027s + : ' 1027s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1027s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1027s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1027s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1027s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1027s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1027s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1027s $VAR2 = bless( do{\(my $o = { 1027s 'drop_empty' => 0, 1027s 'keep_duplicate' => 0, 1027s 'is_pgp_signed' => 0, 1027s 'fields' => { 1027s 'Source' => 'example', 1027s 'Version' => '2.0-1', 1027s 'Distribution' => 'unstable', 1027s 'Urgency' => 'medium', 1027s 'Maintainer' => 'dgit test git user ', 1027s 'Timestamp' => '1530000000', 1027s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1027s 'Changes' => ' 1027s example (2.0-1) unstable; urgency=medium 1027s 1027s [ Ian Jackson ] 1027s * new upstream (did gbp import-orig)' 1027s }, 1027s 'in_order' => [ 1027s 'Source', 1027s 'Version', 1027s 'Distribution', 1027s 'Urgency', 1027s 'Maintainer', 1027s 'Timestamp', 1027s 'Date', 1027s 'Changes' 1027s ], 1027s 'out_order' => [], 1027s 'allow_duplicate' => 0, 1027s 'allow_pgp' => 1, 1027s 'name' => 'debian/changelog, entry no.1' 1027s })}, 'Dpkg::Control::Hash' ); 1027s last finished-looking changelog entry: (2.0-1) unstable 1027s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1027s Failed to stitch in dgit view (see messages above). 1027s dgit --overwrite will be needed on the first dgit push after conversion. 1027s git-debrebase: snags: 1 overriden by individual -f options 1027s 1027s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1027s + local 'ps=255 0' 1027s + set -o pipefail 1027s + case $ps in 1027s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local 'mpat=E:Unused patch file garbage will be discarded' 1027s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s + local grepper=fgrep 1027s + case "$mpat" in 1027s + case "$mpat" in 1027s + grepper=egrep 1027s + mpat='Unused patch file garbage will be discarded' 1027s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1027s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1027s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1027s + local gdr=git-debrebase 1027s + : ' 1027s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1027s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1028s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1028s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1028s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1028s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1028s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1028s $VAR2 = bless( do{\(my $o = { 1028s 'keep_duplicate' => 0, 1028s 'name' => 'debian/changelog, entry no.1', 1028s 'fields' => { 1028s 'Source' => 'example', 1028s 'Version' => '2.0-1', 1028s 'Distribution' => 'unstable', 1028s 'Urgency' => 'medium', 1028s 'Maintainer' => 'dgit test git user ', 1028s 'Timestamp' => '1530000000', 1028s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1028s 'Changes' => ' 1028s example (2.0-1) unstable; urgency=medium 1028s 1028s [ Ian Jackson ] 1028s * new upstream (did gbp import-orig)' 1028s }, 1028s 'allow_pgp' => 1, 1028s 'out_order' => [], 1028s 'is_pgp_signed' => 0, 1028s 'in_order' => [ 1028s 'Source', 1028s 'Version', 1028s 'Distribution', 1028s 'Urgency', 1028s 'Maintainer', 1028s 'Timestamp', 1028s 'Date', 1028s 'Changes' 1028s ], 1028s 'allow_duplicate' => 0, 1028s 'drop_empty' => 0 1028s })}, 'Dpkg::Control::Hash' ); 1028s last finished-looking changelog entry: (2.0-1) unstable 1028s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1028s Failed to stitch in dgit view (see messages above). 1028s dgit --overwrite will be needed on the first dgit push after conversion. 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1028s gbp:info: Trying to apply patches at '07528ed443e7bf250b829b6c1d391c42507ce2b1' 1028s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1028s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1028s git-debrebase ffq check_specs * 1028s git-debrebase ffq merge master 1028s git-debrebase ffq check_remote origin remote fetch/merge branch 1028s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1028s OK, you are ahead of refs/remotes/origin/master 1028s git-debrebase ffq check_remote undef remote push branch 1028s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1028s git-debrebase: snags: 2 overriden by individual -f options 1028s git-debrebase >= update refs/debrebase-last/heads/master f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 0000000000000000000000000000000000000000 1028s git-debrebase >= update HEAD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 07528ed443e7bf250b829b6c1d391c42507ce2b1 1028s git-debrebase >$ 1028s HEAD is now at f5ce088 Add another new upstream file 1028s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1028s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1028s ' 1028s + git branch converted-from-gbp 1028s + v=2.0-2 1028s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1028s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1028s + DEBEMAIL=dgit-tests@example.org 1028s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1028s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 1028s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1028s [master f4c946a] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1028s 1 file changed, 6 insertions(+) 1028s + t-dch-commit-r 1028s + t-dch-r-rune t-dch-commit 1028s + local cmd=t-dch-commit 1028s + shift 1028s + local suite=unstable 1028s + t-dch-commit -r -D unstable '' 1028s + t-debchange -r -D unstable '' 1028s + DEBEMAIL=dgit-tests@example.org 1028s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1028s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1028s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1028s libdistro-info-perl is not installed, Debian release names are not known. 1028s libdistro-info-perl is not installed, Ubuntu release names are not known. 1028s + git commit -m 'dch -r -D unstable ' debian/changelog 1028s [master 2306c75] dch -r -D unstable 1028s 1 file changed, 1 insertion(+), 1 deletion(-) 1028s + : t-dgit -wgf push-source --new 1028s + git push 1028s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1028s 07528ed..2306c75 master -> master 1028s + cd .. 1028s + : t-archive-process-incoming sid 1028s ++ echo example example_2.0.orig.tar.gz 1028s ++ : echo git mirror aq 1028s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 1028s . $troot/lib-gdr 1028s t-tstunt-parsechangelog 1028s p=example 1028s t-git-next-date 1028s ' 1028s + local savevars= 1028s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 1028s + local 'importeval= 1028s . $troot/lib-gdr 1028s t-tstunt-parsechangelog 1028s p=example 1028s t-git-next-date 1028s ' 1028s + local import=IMPORT.gdr-convert-gbp-noarchive 1028s + exec 1028s + local vn 1028s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 1028s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1028s print STDERR "saving-exporting $vn\n"; 1028s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1028s or die $!; 1028s } 1028s ' 1028s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1028s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1028s + set -e 1028s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1028s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 1028s + printf '\n%s\n' ' 1028s . $troot/lib-gdr 1028s t-tstunt-parsechangelog 1028s p=example 1028s t-git-next-date 1028s ' 1028s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1028s + rc=0 1028s + set +x 1028s + set +e 1028s + pwd 1028s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1028s + '[' x '!=' x ']' 1028s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1028s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1028s + set -e 1028s + test 0 = 0 1028s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 1028s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1028s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1028s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1028s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1028s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1028s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1028s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1028s +++ : -D 1028s +++ export GDR_TEST_DEBUG 1028s +++ t-tstunt debchange 1028s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s +++ local var=PATH 1028s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s +++ eval ' 1028s case "$PATH" in 1028s "$tstunt:"*) ;; 1028s *":$tstunt:"*) ;; 1028s "") PATH="$tstunt" ;; 1028s *) PATH="$tstunt:$PATH" ;; 1028s esac 1028s export PATH 1028s ' 1028s ++++ case "$PATH" in 1028s ++++ export PATH 1028s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s +++ local var=PERLLIB 1028s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s +++ eval ' 1028s case "$PERLLIB" in 1028s "$tstunt:"*) ;; 1028s *":$tstunt:"*) ;; 1028s "") PERLLIB="$tstunt" ;; 1028s *) PERLLIB="$tstunt:$PERLLIB" ;; 1028s esac 1028s export PERLLIB 1028s ' 1028s ++++ case "$PERLLIB" in 1028s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++++ export PERLLIB 1028s +++ local f 1028s +++ for f in "$@" 1028s +++ t-tstunt--save-real debchange 1028s +++ local f=debchange 1028s +++ case "$f" in 1028s +++ local rc 1028s +++ local real 1028s +++ set +e 1028s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1028s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1028s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s ++++ type -p debchange 1028s +++ real=/usr/bin/debchange 1028s +++ rc=0 1028s +++ set -e 1028s +++ case $rc in 1028s +++ local varname=debchange 1028s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1028s +++ eval ' 1028s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1028s export DGIT_TEST_REAL_DEBCHANGE 1028s ' 1028s ++++ : /usr/bin/debchange 1028s ++++ export DGIT_TEST_REAL_DEBCHANGE 1028s +++ f=./debchange 1028s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1028s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1028s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1028s ++ t-tstunt-parsechangelog 1028s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1028s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++ local var=PATH 1028s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++ eval ' 1028s case "$PATH" in 1028s "$tstunt:"*) ;; 1028s *":$tstunt:"*) ;; 1028s "") PATH="$tstunt" ;; 1028s *) PATH="$tstunt:$PATH" ;; 1028s esac 1028s export PATH 1028s ' 1028s +++ case "$PATH" in 1028s +++ export PATH 1028s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++ local var=PERLLIB 1028s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1028s ++ eval ' 1028s case "$PERLLIB" in 1028s "$tstunt:"*) ;; 1028s *":$tstunt:"*) ;; 1028s "") PERLLIB="$tstunt" ;; 1028s *) PERLLIB="$tstunt:$PERLLIB" ;; 1028s esac 1028s export PERLLIB 1028s ' 1028s +++ case "$PERLLIB" in 1028s +++ export PERLLIB 1028s ++ local f 1028s ++ for f in "$@" 1028s ++ t-tstunt--save-real dpkg-parsechangelog 1028s ++ local f=dpkg-parsechangelog 1028s ++ case "$f" in 1028s ++ local rc 1028s ++ local real 1028s ++ set +e 1028s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1028s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1028s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1028s +++ type -p dpkg-parsechangelog 1028s ++ real=/usr/bin/dpkg-parsechangelog 1028s ++ rc=0 1028s ++ set -e 1028s ++ case $rc in 1028s ++ local varname=dpkg_parsechangelog 1028s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1028s ++ eval ' 1028s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1028s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1028s ' 1028s +++ : /usr/bin/dpkg-parsechangelog 1028s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1028s ++ f=./dpkg-parsechangelog 1028s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1028s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1028s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1028s ++ for f in "$@" 1028s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1028s ++ local f=Dpkg/Changelog/Parse.pm 1028s ++ case "$f" in 1028s ++ return 1028s ++ f=./Dpkg/Changelog/Parse.pm 1028s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1028s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1028s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1028s ++ p=example 1028s ++ t-git-next-date 1028s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1028s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1028s + cd example 1028s + : 'upstream hat' 1028s + t-gdr-prep-new-upstream 2.1 1028s + uv=2.1 1028s + t-git-next-date 1028s + GIT_COMMITTER_DATE='1530000002 +0100' 1028s + GIT_AUTHOR_DATE='1530000002 +0100' 1028s + git checkout make-upstream 1028s Switched to branch 'make-upstream' 1028s + git reset --hard upstream 1028s HEAD is now at dcacb60 New upstream version 2.0 1028s + t-make-new-upstream-tarball 2.1 1028s + local uv=2.1 1028s + git checkout make-upstream 1028s Already on 'make-upstream' 1028s + echo 'upstream 2.1' 1028s + git commit -a -m 'upstream 2.1 tarball' 1028s [make-upstream 9638c21] upstream 2.1 tarball 1028s 1 file changed, 1 insertion(+) 1028s + t-make-orig example 2.1 make-upstream 1028s + local p=example 1028s + local v=2.1 1028s + local tag=make-upstream 1028s + ust=example_2.1.orig.tar.gz 1028s + GZIP=-1 1028s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 1028s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1028s + git push . make-upstream:upstream 1028s To . 1028s dcacb60..9638c21 make-upstream -> upstream 1028s + git checkout master 1028s Switched to branch 'master' 1028s Your branch is up to date with 'origin/master'. 1028s + t-git-next-date 1028s + GIT_COMMITTER_DATE='1530000003 +0100' 1028s + GIT_AUTHOR_DATE='1530000003 +0100' 1028s + : 'maintainer hat' 1028s + git branch startpoint 1028s + v=2.1-1 1028s + git checkout master 1028s Already on 'master' 1028s Your branch is up to date with 'origin/master'. 1028s + t-expect-fail 'F:Could not determine appropriate upstream commitish' t-git-debrebase new-upstream 2.1-1 1028s + local 'mpat=F:Could not determine appropriate upstream commitish' 1028s + shift 1028s + set +o pipefail 1028s + LC_MESSAGES=C 1028s + LANGUAGE=C 1028s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1028s + t-git-debrebase new-upstream 2.1-1 1028s + local gdr=git-debrebase 1028s + : ' 1028s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1028s + git-debrebase --dgit=dgit -D new-upstream 2.1-1 1028s 1028s git-debrebase: error: Could not determine appropriate upstream commitish. 1028s git-debrebase: (Tried these tags: 2.1 v2.1 upstream/2.1) 1028s git-debrebase: Check version, and specify upstream commitish explicitly. 1028s + local 'ps=255 0' 1028s + set -o pipefail 1028s + case $ps in 1028s + t-grep-mpat 'F:Could not determine appropriate upstream commitish' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1028s + local 'mpat=F:Could not determine appropriate upstream commitish' 1028s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1028s + local grepper=fgrep 1028s + case "$mpat" in 1028s + case "$mpat" in 1028s + grepper=fgrep 1028s + mpat='Could not determine appropriate upstream commitish' 1028s + fgrep -e 'Could not determine appropriate upstream commitish' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1028s git-debrebase: error: Could not determine appropriate upstream commitish. 1028s + git tag v2.1 upstream 1028s + git branch before-new-upstream 1028s + : ----- ordinary new upstream test ----- 1028s + t-git-debrebase new-upstream 2.1 1028s + local gdr=git-debrebase 1028s + : ' 1028s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1028s + git-debrebase --dgit=dgit -D new-upstream 2.1 1028s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1028s git-debrebase ffq check_specs * 1028s git-debrebase ffq merge master 1028s git-debrebase ffq check_remote origin remote fetch/merge branch 1028s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1028s OK, you are ahead of refs/remotes/origin/master 1028s git-debrebase ffq check_remote undef remote push branch 1028s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1028s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 0 - 1028s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1028s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1028s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Type" => "Changelog","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}]} 1028s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1028s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1028s git-debrebase = Changelog {"Parents" => [{"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Ix" => 0,"Differs" => 16}],"Type" => "Changelog","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1028s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1028s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1028s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"}]} 1028s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1028s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1028s git-debrebase = Upstream {"Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2,"Ix" => 0}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"} 1028s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1028s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1028s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}]} 1028s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1028s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1028s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1028s git-debrebase = Anchor {"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1028s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1028s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 6 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1028s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1028s git-debrebase WALK REWRITING NOW cl=HASH(0x5614e51e1b58) procd=HASH(0x5614e5261298) 1028s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1028s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1028s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1028s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1028s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1028s git-debrebase get_differs c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 = 0 1028s git-debrebase *** WALK RETURN c4dedfc862799c2b23916ff3522d513ee1051f1a 514fe3f551f3706f5408598630daac3e7bbc512d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1028s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1028s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1028s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}]} 1028s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1028s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1028s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1028s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]]} 1028s git-debrebase %pieces = {"" => {"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","OldIx" => 0,"NewIx" => 0,"Desc" => "upstream (main piece","Name" => "","New" => "9638c2110033b719cc742997b9527505ffdc1a65"}} 1028s git-debrebase @newpieces = [{"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","OldIx" => 0,"NewIx" => 0,"Desc" => "upstream (main piece","Name" => "","New" => "9638c2110033b719cc742997b9527505ffdc1a65"}] 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1028s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1029s + exec env TZ=UTC faketime -f 2018-06-26 08:00:03 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 1029s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1029s git-debrebase: laundered (head was 2306c75cf843d0ffac699f610942f2a4632dad14) 1029s git-debrebase >= update refs/ffq-prev/heads/master 2306c75cf843d0ffac699f610942f2a4632dad14 0000000000000000000000000000000000000000 1029s git-debrebase >= delete refs/debrebase-last/heads/master 1029s git-debrebase >= update HEAD c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 1029s git-debrebase >$ 1029s Recorded previous head for preservation 1029s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated refs/heads/master. 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s + clog-check-1 before-new-upstream 1029s + before=before-new-upstream 1029s ++ git log --format=%aD -n1 debian/changelog 1029s + date='Tue, 26 Jun 2018 09:00:03 +0100' 1029s ++ date -R -d 'Tue, 26 Jun 2018 09:00:03 +0100' 1029s + date='Tue, 26 Jun 2018 08:00:03 +0000' 1029s + git show before-new-upstream:debian/changelog 1029s + m=' * Update to new upstream version 2.1.' 1029s + e='dgit test git user Tue, 26 Jun 2018 08:00:03 +0000' 1029s + cat - ../clog.before 1029s + clog-check-2 1029s + diff -u ../clog.expected debian/changelog 1029s + t-gdr-good laundered 1029s + local state=laundered 1029s + local beforetag= 1029s + case $state in 1029s + git diff --quiet -- :. ':!debian/patches' 1029s + LC_MESSAGES=C 1029s + t-git-debrebase status 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D status 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"}],"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"}],"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Type" => "Upstream"} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0,"Differs" => 16}]} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48,"Ix" => 1}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 2,"Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1029s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s + case $state in 1029s + egrep '^ *branch is laundered' ../status.check 1029s branch is laundered 1029s + t-gdr-good-analyse HEAD laundered 1029s + local head=HEAD 1029s + local state=laundered 1029s + local wsfx= 1029s + local etypes bwtip 1029s + case $state in 1029s + etypes=Upstream 1029s ++ t-git-debrebase breakwater 1029s ++ local gdr=git-debrebase 1029s ++ : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s ++ git-debrebase --dgit=dgit -D breakwater 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"}],"Type" => "Upstream","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Type" => "Upstream","Parents" => [{"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Differs" => 2,"Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Differs" => 16,"Ix" => 0}],"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"},$VAR1->{"OrigParents"}[0]],"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e"} 1029s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s + bwtip=Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + anal=../anal 1029s + t-git-debrebase analyse HEAD 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D analyse HEAD 1029s git-debrebase *** WALK 63dba55c8caa27845a7a4d80870e14502bccaac5 1 *main::STDOUT 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"}],"Type" => "Upstream","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Type" => "Upstream"} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292"} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"},{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48,"Ix" => 1}],"Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9"} 1029s git-debrebase *** WALK prep done cur=b4b98b70ea12b896129408b67aedf3eae0eacda9 brw 0 upp 2 proc 4 pm -1 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s ++ git rev-parse HEAD 1029s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1029s + exec 1029s + local cid ctype info nparents 1029s + read cid ctype info 1029s + : ===== 63dba55c8caa27845a7a4d80870e14502bccaac5 Upstream ===== 1029s + test 63dba55c8caa27845a7a4d80870e14502bccaac5 = 63dba55c8caa27845a7a4d80870e14502bccaac5 1029s + local cetype=Upstream 1029s + '[' xUpstream = xUpstream ']' 1029s + cetype=SAME 1029s ++ git log -n1 --pretty=format:%P 63dba55c8caa27845a7a4d80870e14502bccaac5 1029s + local parents=0b082886262badc204503b01bc36e2ca34b2cb40 1029s + expect=0b082886262badc204503b01bc36e2ca34b2cb40 1029s + enparents=1 1029s + : Upstream/SAME 0b082886262badc204503b01bc36e2ca34b2cb40 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s ++ printf %s 0b082886262badc204503b01bc36e2ca34b2cb40 1029s ++ wc -w 1029s + local cnparents=1 1029s + test 1 = 1 1029s ++ for f in $parents 1029s ++ echo 0b082886262badc204503b01bc36e2ca34b2cb40 1029s ++ t-sort -u 1029s ++ LC_COLLATE=C 1029s ++ sort -u 1029s ++ wc -w 1029s + local cndparents=1 1029s + test 1 = 1 1029s + case "$parents" in 1029s + case "$ctype" in 1029s + read cid ctype info 1029s + : ===== 0b082886262badc204503b01bc36e2ca34b2cb40 Upstream ===== 1029s + test 0b082886262badc204503b01bc36e2ca34b2cb40 = 0b082886262badc204503b01bc36e2ca34b2cb40 1029s + local cetype=Upstream 1029s + '[' xUpstream = xUpstream ']' 1029s + cetype=SAME 1029s ++ git log -n1 --pretty=format:%P 0b082886262badc204503b01bc36e2ca34b2cb40 1029s + local parents=be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s + expect=be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s + enparents=1 1029s + : Upstream/SAME be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s ++ printf %s be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s ++ wc -w 1029s + local cnparents=1 1029s + test 1 = 1 1029s ++ for f in $parents 1029s ++ echo be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s ++ wc -w 1029s ++ t-sort -u 1029s ++ LC_COLLATE=C 1029s ++ sort -u 1029s + local cndparents=1 1029s + test 1 = 1 1029s + case "$parents" in 1029s + case "$ctype" in 1029s + read cid ctype info 1029s + : ===== be836997804d5eb1f863c35479b4f4bcb1e20b07 Upstream ===== 1029s + test be836997804d5eb1f863c35479b4f4bcb1e20b07 = be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s + local cetype=Upstream 1029s + '[' xUpstream = xUpstream ']' 1029s + cetype=SAME 1029s ++ git log -n1 --pretty=format:%P be836997804d5eb1f863c35479b4f4bcb1e20b07 1029s + local parents=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + expect=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + enparents=1 1029s + : Upstream/SAME cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s ++ printf %s cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s ++ wc -w 1029s + local cnparents=1 1029s + test 1 = 1 1029s ++ for f in $parents 1029s ++ echo cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s ++ wc -w 1029s ++ t-sort -u 1029s ++ LC_COLLATE=C 1029s ++ sort -u 1029s + local cndparents=1 1029s + test 1 = 1 1029s + case "$parents" in 1029s + case "$ctype" in 1029s + read cid ctype info 1029s + : ===== cc1ba496149b7d3818e07a2e132e8a7fa6b08129 Changelog ===== 1029s + test cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + local cetype=Upstream 1029s + '[' xChangelog = xUpstream ']' 1029s ++ git log -n1 --pretty=format:%P cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + local parents=b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s + expect=b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s + enparents=1 1029s + : Changelog/Upstream b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + '[' xY:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 '!=' x ']' 1029s + test Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + bwtip= 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s + git diff --quiet b4b98b70ea12b896129408b67aedf3eae0eacda9..cc1ba496149b7d3818e07a2e132e8a7fa6b08129 -- :. ':!debian/changelog' 1029s + etypes=Packaging 1029s ++ printf %s b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s ++ wc -w 1029s + local cnparents=1 1029s + test 1 = 1 1029s ++ for f in $parents 1029s ++ echo b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s ++ wc -w 1029s ++ t-sort -u 1029s ++ LC_COLLATE=C 1029s ++ sort -u 1029s + local cndparents=1 1029s + test 1 = 1 1029s + case "$parents" in 1029s + case "$ctype" in 1029s + read cid ctype info 1029s + : ===== b4b98b70ea12b896129408b67aedf3eae0eacda9 Anchor ===== 1029s + test b4b98b70ea12b896129408b67aedf3eae0eacda9 = b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s + local cetype=Packaging 1029s + '[' xAnchor = xPackaging ']' 1029s ++ git log -n1 --pretty=format:%P b4b98b70ea12b896129408b67aedf3eae0eacda9 1029s + local 'parents=514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1029s + expect='514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1029s + enparents=1 1029s + : Anchor/Packaging '514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s + break 1029s + git reflog 1029s + egrep 'debrebase new-upstream.*checkout' 1029s cc1ba49 HEAD@{4}: debrebase new-upstream 2.1-1: rebase (start): checkout cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1029s + t-git-debrebase stitch 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D stitch 1029s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Differs" => 2}],"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"Parents" => [{"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"}]} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9"}]} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48}],"Parents" => [{"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 2},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Type" => "Anchor"} 1029s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1029s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1029s git-debrebase >= delete refs/ffq-prev/heads/master 2306c75cf843d0ffac699f610942f2a4632dad14 1029s git-debrebase >= update refs/debrebase-last/heads/master cec7cb0ddec86e20bd6120c410ab3664b168913f 0000000000000000000000000000000000000000 1029s git-debrebase >= update HEAD cec7cb0ddec86e20bd6120c410ab3664b168913f 63dba55c8caa27845a7a4d80870e14502bccaac5 1029s git-debrebase >$ 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s + t-gdr-good stitched 1029s + local state=stitched 1029s + local beforetag= 1029s + case $state in 1029s + git diff --quiet -- :. ':!debian/patches' 1029s + LC_MESSAGES=C 1029s + t-git-debrebase status 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D status 1029s git-debrebase get_differs 63dba55c8caa27845a7a4d80870e14502bccaac5 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0 1029s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x12 1029s git-debrebase classify cec7cb0ddec86e20bd6120c410ab3664b168913f $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 63dba55c8caa27845a7a4d80870e14502bccaac5/0 2306c75cf843d0ffac699f610942f2a4632dad14/0x12 1029s git-debrebase = Pseudomerge {"Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 63dba55c8caa27845a7a4d80870e14502bccaac5\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cec7cb0ddec86e20bd6120c410ab3664b168913f","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5"},{"Differs" => 18,"Ix" => 1,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"}],"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Type" => "Pseudomerge","Contributor" => $VAR1->{"Parents"}[0]} 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Ix" => 0}],"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"}],"Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Parents" => [{"Differs" => 2,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Parents" => [{"Differs" => 16,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0}],"Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n"} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"},{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9"} 1029s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s + case $state in 1029s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1029s branch contains furniture (not laundered) 1029s + egrep '^ stitched$' ../status.check 1029s stitched 1029s + t-gdr-good-analyse HEAD stitched 1029s + local head=HEAD 1029s + local state=stitched 1029s + local wsfx= 1029s + local etypes bwtip 1029s + case $state in 1029s + etypes=Pseudomerge-Upstream 1029s + anal=../anal 1029s + t-git-debrebase analyse HEAD 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D analyse HEAD 1029s git-debrebase *** WALK cec7cb0ddec86e20bd6120c410ab3664b168913f 1 *main::STDOUT 1029s git-debrebase get_differs 63dba55c8caa27845a7a4d80870e14502bccaac5 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0 1029s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x12 1029s git-debrebase classify cec7cb0ddec86e20bd6120c410ab3664b168913f $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 63dba55c8caa27845a7a4d80870e14502bccaac5/0 2306c75cf843d0ffac699f610942f2a4632dad14/0x12 1029s git-debrebase = Pseudomerge {"Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 63dba55c8caa27845a7a4d80870e14502bccaac5\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Overwritten" => [{"Differs" => 18,"Ix" => 1,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"}],"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5"},$VAR1->{"Overwritten"}[0]],"Contributor" => $VAR1->{"Parents"}[0],"Type" => "Pseudomerge","CommitId" => "cec7cb0ddec86e20bd6120c410ab3664b168913f"} 1029s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1029s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1029s git-debrebase = Upstream {"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Parents" => [{"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Differs" => 2,"Ix" => 0}],"Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1029s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1029s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1029s git-debrebase = Upstream {"Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Differs" => 2,"Ix" => 0}]} 1029s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1029s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1029s git-debrebase = Upstream {"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Differs" => 2,"Ix" => 0}],"Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"} 1029s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1029s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1029s git-debrebase = Changelog {"Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0,"Differs" => 16}],"Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"} 1029s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1029s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1029s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1029s git-debrebase = Anchor {"Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Ix" => 0,"Differs" => 2},$VAR1->{"OrigParents"}[0]],"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Type" => "Anchor"} 1029s git-debrebase *** WALK prep done cur=b4b98b70ea12b896129408b67aedf3eae0eacda9 brw 0 upp 3 proc 6 pm 0 1029s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1029s ' 1029s ++ git rev-parse HEAD 1029s + expect=cec7cb0ddec86e20bd6120c410ab3664b168913f 1029s + exec 1029s + local cid ctype info nparents 1029s + read cid ctype info 1029s + : ===== cec7cb0ddec86e20bd6120c410ab3664b168913f Pseudomerge Contributor=63dba55c8caa27845a7a4d80870e14502bccaac5 ===== 1029s + test cec7cb0ddec86e20bd6120c410ab3664b168913f = cec7cb0ddec86e20bd6120c410ab3664b168913f 1029s + local cetype=Pseudomerge 1029s + '[' xPseudomerge = xPseudomerge ']' 1029s + cetype=SAME 1029s ++ git log -n1 --pretty=format:%P cec7cb0ddec86e20bd6120c410ab3664b168913f 1029s + local 'parents=63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1029s + expect='63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1029s + enparents=1 1029s + : Pseudomerge/SAME '63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1029s + case "$ctype/$cetype" in 1029s + case "$ctype/$etypes" in 1029s + case "$cetype" in 1029s + case "$ctype" in 1029s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1029s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1029s + enparents=2 1029s + git diff --quiet 63dba55c8caa27845a7a4d80870e14502bccaac5..cec7cb0ddec86e20bd6120c410ab3664b168913f 1029s + etypes=Upstream 1029s + : 'reject pointless pseudomerges' 1029s + local 'overwritten= 2306c75cf843d0ffac699f610942f2a4632dad14' 1029s + overwritten=2306c75cf843d0ffac699f610942f2a4632dad14 1029s + t-git-debrebase analyse 2306c75cf843d0ffac699f610942f2a4632dad14 1029s + local gdr=git-debrebase 1029s + : ' 1029s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1029s + git-debrebase --dgit=dgit -D analyse 2306c75cf843d0ffac699f610942f2a4632dad14 1030s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 1 *main::STDOUT 1030s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1030s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1030s git-debrebase = Changelog {"Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -r -D unstable\n"} 1030s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1030s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1030s git-debrebase = Changelog {"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Ix" => 0,"Differs" => 16}],"Type" => "Changelog"} 1030s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1030s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1030s git-debrebase = Upstream {"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Differs" => 2}]} 1030s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1030s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1030s git-debrebase = Upstream {"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1030s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1030s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1030s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4"} 1030s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1030s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1030s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1030s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},$VAR1->{"OrigParents"}[0]]} 1030s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1030s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s + local ocid otype oinfo 1030s + read ocid otype oinfo 1030s + case "$otype" in 1030s ++ printf %s '63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1030s ++ wc -w 1030s + local cnparents=2 1030s + test 2 = 2 1030s ++ for f in $parents 1030s ++ echo 63dba55c8caa27845a7a4d80870e14502bccaac5 1030s ++ for f in $parents 1030s ++ echo 2306c75cf843d0ffac699f610942f2a4632dad14 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=2 1030s + test 2 = 2 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== 63dba55c8caa27845a7a4d80870e14502bccaac5 Upstream ===== 1030s + test 63dba55c8caa27845a7a4d80870e14502bccaac5 = 63dba55c8caa27845a7a4d80870e14502bccaac5 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P 63dba55c8caa27845a7a4d80870e14502bccaac5 1030s + local parents=0b082886262badc204503b01bc36e2ca34b2cb40 1030s + expect=0b082886262badc204503b01bc36e2ca34b2cb40 1030s + enparents=1 1030s + : Upstream/SAME 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s 0b082886262badc204503b01bc36e2ca34b2cb40 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo 0b082886262badc204503b01bc36e2ca34b2cb40 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== 0b082886262badc204503b01bc36e2ca34b2cb40 Upstream ===== 1030s + test 0b082886262badc204503b01bc36e2ca34b2cb40 = 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + local parents=be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + expect=be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + enparents=1 1030s + : Upstream/SAME be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== be836997804d5eb1f863c35479b4f4bcb1e20b07 Upstream ===== 1030s + test be836997804d5eb1f863c35479b4f4bcb1e20b07 = be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + local parents=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + expect=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + enparents=1 1030s + : Upstream/SAME cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== cc1ba496149b7d3818e07a2e132e8a7fa6b08129 Changelog ===== 1030s + test cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + local cetype=Upstream 1030s + '[' xChangelog = xUpstream ']' 1030s ++ git log -n1 --pretty=format:%P cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + local parents=b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + expect=b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + enparents=1 1030s + : Changelog/Upstream b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + '[' x '!=' x ']' 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s + git diff --quiet b4b98b70ea12b896129408b67aedf3eae0eacda9..cc1ba496149b7d3818e07a2e132e8a7fa6b08129 -- :. ':!debian/changelog' 1030s + etypes=Packaging 1030s ++ wc -w 1030s ++ printf %s b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== b4b98b70ea12b896129408b67aedf3eae0eacda9 Anchor ===== 1030s + test b4b98b70ea12b896129408b67aedf3eae0eacda9 = b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + local cetype=Packaging 1030s + '[' xAnchor = xPackaging ']' 1030s ++ git log -n1 --pretty=format:%P b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + local 'parents=514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + expect='514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + enparents=1 1030s + : Anchor/Packaging '514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s + break 1030s + git branch ordinary 1030s + : ----- 'with --anchor' ----- 1030s + git checkout -b with-anchor startpoint 1030s Switched to a new branch 'with-anchor' 1030s + t-git-debrebase analyse 1030s + local gdr=git-debrebase 1030s + : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s + git-debrebase --dgit=dgit -D analyse 1030s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 1 *main::STDOUT 1030s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1030s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1030s git-debrebase = Changelog {"Parents" => [{"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Ix" => 0,"Differs" => 16}],"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1030s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1030s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1030s git-debrebase = Changelog {"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Differs" => 16,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Ix" => 0}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog"} 1030s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1030s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1030s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Differs" => 2}]} 1030s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1030s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1030s git-debrebase = Upstream {"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Ix" => 0,"Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream"} 1030s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1030s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1030s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 2}],"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1030s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1030s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1030s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1030s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1030s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1030s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s ++ perl -ne ' 1030s next unless m/^(\w+) Anchor\s/; 1030s print $1,"\n"; 1030s exit; 1030s ' 1030s + anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1030s + GIT_REFLOG_ACTION=STUNT-RLA 1030s + t-git-debrebase --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 -fanchor-treated new-upstream 2.1-1 upstream 1030s + local gdr=git-debrebase 1030s + : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s + git-debrebase --dgit=dgit -D --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 -fanchor-treated new-upstream 2.1-1 upstream 1030s git-debrebase ffq_prev_branchinfo branch current refs/heads/with-anchor 1030s git-debrebase ffq check_specs * 1030s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 0 - 1030s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1030s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1030s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Type" => "Changelog","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"} 1030s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1030s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1030s git-debrebase = Changelog {"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Parents" => [{"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16,"Ix" => 0}],"Type" => "Changelog","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1030s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1030s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1030s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Differs" => 2,"Ix" => 0}],"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7"} 1030s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1030s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1030s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4"}],"Type" => "Upstream","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1030s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1030s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1030s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 1030s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1030s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1030s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1030s git-debrebase = TreatAsAnchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "TreatAsAnchor","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1030s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1030s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 6 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1030s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1030s git-debrebase WALK REWRITING NOW cl=HASH(0x564bae379470) procd=HASH(0x564bae4364f0) 1030s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1030s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1030s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1030s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1030s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1030s git-debrebase get_differs c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 = 0 1030s git-debrebase *** WALK RETURN c4dedfc862799c2b23916ff3522d513ee1051f1a 514fe3f551f3706f5408598630daac3e7bbc512d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1030s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1030s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1030s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Type" => "Changelog","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"} 1030s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1030s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1030s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1030s git-debrebase = TreatAsAnchor {"Type" => "TreatAsAnchor","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1030s git-debrebase: snag ignored (-fanchor-treated): old anchor is recognised due to --anchor, cannot check upstream 1030s git-debrebase %pieces = {"" => {"New" => "9638c2110033b719cc742997b9527505ffdc1a65","Desc" => "upstream (main piece","OldIx" => 0,"Name" => "","NewIx" => 0}} 1030s git-debrebase @newpieces = [{"New" => "9638c2110033b719cc742997b9527505ffdc1a65","Desc" => "upstream (main piece","OldIx" => 0,"Name" => "","NewIx" => 0}] 1030s git-debrebase: snags: 1 overriden by individual -f options 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1030s + exec env TZ=UTC faketime -f 2018-06-26 08:00:03 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 1030s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1030s git-debrebase: laundered (head was 2306c75cf843d0ffac699f610942f2a4632dad14) 1030s git-debrebase >= update refs/ffq-prev/heads/with-anchor 2306c75cf843d0ffac699f610942f2a4632dad14 0000000000000000000000000000000000000000 1030s git-debrebase >= delete refs/debrebase-last/heads/with-anchor 1030s git-debrebase >= update HEAD c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 1030s git-debrebase >$ 1030s Recorded previous head for preservation 1030s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated refs/heads/with-anchor. 1030s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s + t-gdr-good laundered 1030s + local state=laundered 1030s + local beforetag= 1030s + case $state in 1030s + git diff --quiet -- :. ':!debian/patches' 1030s + LC_MESSAGES=C 1030s + t-git-debrebase status 1030s + local gdr=git-debrebase 1030s + : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s + git-debrebase --dgit=dgit -D status 1030s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1030s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1030s git-debrebase = Upstream {"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5"} 1030s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1030s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1030s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Ix" => 0,"Differs" => 2}],"Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "814a142751f22c0fb666d828fae5aed06916739a"} 1030s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1030s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1030s git-debrebase = Upstream {"Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Differs" => 2}],"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"} 1030s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1030s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1030s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0}],"Type" => "Changelog"} 1030s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1030s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1030s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1030s git-debrebase = Anchor {"Parents" => [{"Differs" => 2,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"Type" => "Anchor","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","OrigParents" => [$VAR1->{"Parents"}[1]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 1030s git-debrebase ffq_prev_branchinfo branch current refs/heads/with-anchor 1030s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s + case $state in 1030s + egrep '^ *branch is laundered' ../status.check 1030s branch is laundered 1030s + t-gdr-good-analyse HEAD laundered 1030s + local head=HEAD 1030s + local state=laundered 1030s + local wsfx= 1030s + local etypes bwtip 1030s + case $state in 1030s + etypes=Upstream 1030s ++ t-git-debrebase breakwater 1030s ++ local gdr=git-debrebase 1030s ++ : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s ++ git-debrebase --dgit=dgit -D breakwater 1030s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1030s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1030s git-debrebase = Upstream {"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Parents" => [{"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Ix" => 0}],"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1030s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1030s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1030s git-debrebase = Upstream {"Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Parents" => [{"Ix" => 0,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Differs" => 2}],"Tree" => "814a142751f22c0fb666d828fae5aed06916739a"} 1030s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1030s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1030s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Ix" => 0}],"Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1030s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1030s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1030s git-debrebase = Changelog {"Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Type" => "Changelog","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0,"Differs" => 16}],"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"} 1030s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1030s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1030s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1030s git-debrebase = Anchor {"Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Parents" => [{"Differs" => 2,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Ix" => 0},{"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Type" => "Anchor","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1030s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s + bwtip=Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + anal=../anal 1030s + t-git-debrebase analyse HEAD 1030s + local gdr=git-debrebase 1030s + : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s + git-debrebase --dgit=dgit -D analyse HEAD 1030s git-debrebase *** WALK 63dba55c8caa27845a7a4d80870e14502bccaac5 1 *main::STDOUT 1030s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1030s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1030s git-debrebase = Upstream {"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Type" => "Upstream","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Differs" => 2}],"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1030s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1030s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1030s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Parents" => [{"Ix" => 0,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Differs" => 2}],"Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "814a142751f22c0fb666d828fae5aed06916739a"} 1030s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1030s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1030s git-debrebase = Upstream {"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"}]} 1030s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1030s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1030s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Differs" => 16}],"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Type" => "Changelog","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1030s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1030s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1030s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1030s git-debrebase = Anchor {"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Parents" => [{"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 2},{"Differs" => 48,"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e"} 1030s git-debrebase *** WALK prep done cur=b4b98b70ea12b896129408b67aedf3eae0eacda9 brw 0 upp 2 proc 4 pm -1 1030s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1030s ' 1030s ++ git rev-parse HEAD 1030s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1030s + exec 1030s + local cid ctype info nparents 1030s + read cid ctype info 1030s + : ===== 63dba55c8caa27845a7a4d80870e14502bccaac5 Upstream ===== 1030s + test 63dba55c8caa27845a7a4d80870e14502bccaac5 = 63dba55c8caa27845a7a4d80870e14502bccaac5 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P 63dba55c8caa27845a7a4d80870e14502bccaac5 1030s + local parents=0b082886262badc204503b01bc36e2ca34b2cb40 1030s + expect=0b082886262badc204503b01bc36e2ca34b2cb40 1030s + enparents=1 1030s + : Upstream/SAME 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s 0b082886262badc204503b01bc36e2ca34b2cb40 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo 0b082886262badc204503b01bc36e2ca34b2cb40 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== 0b082886262badc204503b01bc36e2ca34b2cb40 Upstream ===== 1030s + test 0b082886262badc204503b01bc36e2ca34b2cb40 = 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P 0b082886262badc204503b01bc36e2ca34b2cb40 1030s + local parents=be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + expect=be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + enparents=1 1030s + : Upstream/SAME be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== be836997804d5eb1f863c35479b4f4bcb1e20b07 Upstream ===== 1030s + test be836997804d5eb1f863c35479b4f4bcb1e20b07 = be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + local cetype=Upstream 1030s + '[' xUpstream = xUpstream ']' 1030s + cetype=SAME 1030s ++ git log -n1 --pretty=format:%P be836997804d5eb1f863c35479b4f4bcb1e20b07 1030s + local parents=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + expect=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + enparents=1 1030s + : Upstream/SAME cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s ++ printf %s cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== cc1ba496149b7d3818e07a2e132e8a7fa6b08129 Changelog ===== 1030s + test cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + local cetype=Upstream 1030s + '[' xChangelog = xUpstream ']' 1030s ++ git log -n1 --pretty=format:%P cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + local parents=b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + expect=b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + enparents=1 1030s + : Changelog/Upstream b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + '[' xY:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 '!=' x ']' 1030s + test Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = Y:cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + bwtip= 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s + git diff --quiet b4b98b70ea12b896129408b67aedf3eae0eacda9..cc1ba496149b7d3818e07a2e132e8a7fa6b08129 -- :. ':!debian/changelog' 1030s + etypes=Packaging 1030s ++ printf %s b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s ++ wc -w 1030s + local cnparents=1 1030s + test 1 = 1 1030s ++ for f in $parents 1030s ++ echo b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s ++ wc -w 1030s ++ t-sort -u 1030s ++ LC_COLLATE=C 1030s ++ sort -u 1030s + local cndparents=1 1030s + test 1 = 1 1030s + case "$parents" in 1030s + case "$ctype" in 1030s + read cid ctype info 1030s + : ===== b4b98b70ea12b896129408b67aedf3eae0eacda9 Anchor ===== 1030s + test b4b98b70ea12b896129408b67aedf3eae0eacda9 = b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + local cetype=Packaging 1030s + '[' xAnchor = xPackaging ']' 1030s ++ git log -n1 --pretty=format:%P b4b98b70ea12b896129408b67aedf3eae0eacda9 1030s + local 'parents=514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + expect='514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + enparents=1 1030s + : Anchor/Packaging '514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1030s + case "$ctype/$cetype" in 1030s + case "$ctype/$etypes" in 1030s + case "$cetype" in 1030s + case "$ctype" in 1030s + break 1030s + git reflog 1030s + egrep 'STUNT-RLA: debrebase new-upstream' 1030s 63dba55 HEAD@{0}: STUNT-RLA: debrebase new-upstream 2.1-1: rebase (finish): returning to refs/heads/with-anchor 1030s 63dba55 HEAD@{1}: STUNT-RLA: debrebase new-upstream 2.1-1: rebase (pick): Add another new upstream file 1030s 0b08288 HEAD@{2}: STUNT-RLA: debrebase new-upstream 2.1-1: rebase (pick): Edit the .c file 1030s be83699 HEAD@{3}: STUNT-RLA: debrebase new-upstream 2.1-1: rebase (pick): Add a new upstream file 1030s cc1ba49 HEAD@{4}: STUNT-RLA: debrebase new-upstream 2.1-1: rebase (start): checkout cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1030s + git reflog 1030s + egrep 'STUNT-RLA: debrebase: launder for new upstream' 1030s c4dedfc HEAD@{5}: STUNT-RLA: debrebase: launder for new upstream 1030s + t-git-debrebase stitch 1030s + local gdr=git-debrebase 1030s + : ' 1030s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1030s + git-debrebase --dgit=dgit -D stitch 1031s git-debrebase ffq_prev_branchinfo branch current refs/heads/with-anchor 1031s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1031s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1031s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Parents" => [{"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Differs" => 2,"Ix" => 0}]} 1031s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1031s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1031s git-debrebase = Upstream {"Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Differs" => 2,"Ix" => 0}],"Tree" => "814a142751f22c0fb666d828fae5aed06916739a","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40"} 1031s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1031s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1031s git-debrebase = Upstream {"Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"}],"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1031s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1031s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1031s git-debrebase = Changelog {"Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9"}],"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"} 1031s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1031s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1031s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1031s git-debrebase = Anchor {"Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"},{"Ix" => 1,"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65"}],"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Anchor","Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n"} 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s git-debrebase >= delete refs/ffq-prev/heads/with-anchor 2306c75cf843d0ffac699f610942f2a4632dad14 1031s git-debrebase >= update refs/debrebase-last/heads/with-anchor cec7cb0ddec86e20bd6120c410ab3664b168913f 0000000000000000000000000000000000000000 1031s git-debrebase >= update HEAD cec7cb0ddec86e20bd6120c410ab3664b168913f 63dba55c8caa27845a7a4d80870e14502bccaac5 1031s git-debrebase >$ 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s + t-gdr-good stitched 1031s + local state=stitched 1031s + local beforetag= 1031s + case $state in 1031s + git diff --quiet -- :. ':!debian/patches' 1031s + LC_MESSAGES=C 1031s + t-git-debrebase status 1031s + local gdr=git-debrebase 1031s + : ' 1031s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1031s + git-debrebase --dgit=dgit -D status 1031s git-debrebase get_differs 63dba55c8caa27845a7a4d80870e14502bccaac5 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0 1031s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x12 1031s git-debrebase classify cec7cb0ddec86e20bd6120c410ab3664b168913f $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 63dba55c8caa27845a7a4d80870e14502bccaac5/0 2306c75cf843d0ffac699f610942f2a4632dad14/0x12 1031s git-debrebase = Pseudomerge {"CommitId" => "cec7cb0ddec86e20bd6120c410ab3664b168913f","Overwritten" => [{"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Differs" => 18,"Ix" => 1}],"Parents" => [{"Ix" => 0,"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Differs" => 0},$VAR1->{"Overwritten"}[0]],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 63dba55c8caa27845a7a4d80870e14502bccaac5\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Pseudomerge","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Contributor" => $VAR1->{"Parents"}[0]} 1031s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1031s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1031s git-debrebase = Upstream {"Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Type" => "Upstream","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Parents" => [{"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups"} 1031s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1031s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1031s git-debrebase = Upstream {"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Parents" => [{"Ix" => 0,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Differs" => 2}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "814a142751f22c0fb666d828fae5aed06916739a"} 1031s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1031s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1031s git-debrebase = Upstream {"Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07"} 1031s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1031s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1031s git-debrebase = Changelog {"Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"Differs" => 16,"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Ix" => 0}],"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129"} 1031s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1031s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1031s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1031s git-debrebase = Anchor {"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","OrigParents" => [{"Differs" => 48,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Ix" => 1}],"Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"},$VAR1->{"OrigParents"}[0]],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e","Type" => "Anchor","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1031s git-debrebase ffq_prev_branchinfo branch current refs/heads/with-anchor 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s + case $state in 1031s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1031s branch contains furniture (not laundered) 1031s + egrep '^ stitched$' ../status.check 1031s stitched 1031s + t-gdr-good-analyse HEAD stitched 1031s + local head=HEAD 1031s + local state=stitched 1031s + local wsfx= 1031s + local etypes bwtip 1031s + case $state in 1031s + etypes=Pseudomerge-Upstream 1031s + anal=../anal 1031s + t-git-debrebase analyse HEAD 1031s + local gdr=git-debrebase 1031s + : ' 1031s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1031s + git-debrebase --dgit=dgit -D analyse HEAD 1031s git-debrebase *** WALK cec7cb0ddec86e20bd6120c410ab3664b168913f 1 *main::STDOUT 1031s git-debrebase get_differs 63dba55c8caa27845a7a4d80870e14502bccaac5 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0 1031s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x12 1031s git-debrebase classify cec7cb0ddec86e20bd6120c410ab3664b168913f $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 63dba55c8caa27845a7a4d80870e14502bccaac5/0 2306c75cf843d0ffac699f610942f2a4632dad14/0x12 1031s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: stitch]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5"},{"Differs" => 18,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Ix" => 1}],"Type" => "Pseudomerge","Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 63dba55c8caa27845a7a4d80870e14502bccaac5\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "cec7cb0ddec86e20bd6120c410ab3664b168913f","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Overwritten" => [$VAR1->{"Parents"}[1]],"Contributor" => $VAR1->{"Parents"}[0]} 1031s git-debrebase get_differs 0b082886262badc204503b01bc36e2ca34b2cb40 e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 = 0x2 1031s git-debrebase classify 63dba55c8caa27845a7a4d80870e14502bccaac5 $t=e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8 @p 0b082886262badc204503b01bc36e2ca34b2cb40/0x2 1031s git-debrebase = Upstream {"Hdr" => "tree e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8\nparent 0b082886262badc204503b01bc36e2ca34b2cb40\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "63dba55c8caa27845a7a4d80870e14502bccaac5","Tree" => "e34151662b1c87dd3cb51a5ea57d013a8e1a1ff8","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Ix" => 0}],"Type" => "Upstream"} 1031s git-debrebase get_differs be836997804d5eb1f863c35479b4f4bcb1e20b07 814a142751f22c0fb666d828fae5aed06916739a = 0x2 1031s git-debrebase classify 0b082886262badc204503b01bc36e2ca34b2cb40 $t=814a142751f22c0fb666d828fae5aed06916739a @p be836997804d5eb1f863c35479b4f4bcb1e20b07/0x2 1031s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "814a142751f22c0fb666d828fae5aed06916739a","Parents" => [{"Differs" => 2,"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "0b082886262badc204503b01bc36e2ca34b2cb40","Hdr" => "tree 814a142751f22c0fb666d828fae5aed06916739a\nparent be836997804d5eb1f863c35479b4f4bcb1e20b07\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1031s git-debrebase get_differs cc1ba496149b7d3818e07a2e132e8a7fa6b08129 973030819d865c01700db7aa1f21e3af03fe426a = 0x2 1031s git-debrebase classify be836997804d5eb1f863c35479b4f4bcb1e20b07 $t=973030819d865c01700db7aa1f21e3af03fe426a @p cc1ba496149b7d3818e07a2e132e8a7fa6b08129/0x2 1031s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "973030819d865c01700db7aa1f21e3af03fe426a","Parents" => [{"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Differs" => 2,"Ix" => 0}],"CommitId" => "be836997804d5eb1f863c35479b4f4bcb1e20b07","Hdr" => "tree 973030819d865c01700db7aa1f21e3af03fe426a\nparent cc1ba496149b7d3818e07a2e132e8a7fa6b08129\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1031s git-debrebase get_differs b4b98b70ea12b896129408b67aedf3eae0eacda9 3feaa25d6dbd93cc36694c31c9d07e72be8f7292 = 0x10 1031s git-debrebase classify cc1ba496149b7d3818e07a2e132e8a7fa6b08129 $t=3feaa25d6dbd93cc36694c31c9d07e72be8f7292 @p b4b98b70ea12b896129408b67aedf3eae0eacda9/0x10 1031s git-debrebase = Changelog {"CommitId" => "cc1ba496149b7d3818e07a2e132e8a7fa6b08129","Hdr" => "tree 3feaa25d6dbd93cc36694c31c9d07e72be8f7292\nparent b4b98b70ea12b896129408b67aedf3eae0eacda9\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "3feaa25d6dbd93cc36694c31c9d07e72be8f7292","Msg" => "Update changelog for new upstream 2.1\n\n[git-debrebase changelog: new upstream 2.1]\n","Parents" => [{"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Differs" => 16,"Ix" => 0}]} 1031s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x2 1031s git-debrebase get_differs 9638c2110033b719cc742997b9527505ffdc1a65 2c7955d092ae39c0901171505c7cc9e0f668ed5e = 0x30 1031s git-debrebase classify b4b98b70ea12b896129408b67aedf3eae0eacda9 $t=2c7955d092ae39c0901171505c7cc9e0f668ed5e @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x2 9638c2110033b719cc742997b9527505ffdc1a65/0x30 1031s git-debrebase = Anchor {"CommitId" => "b4b98b70ea12b896129408b67aedf3eae0eacda9","Hdr" => "tree 2c7955d092ae39c0901171505c7cc9e0f668ed5e\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nparent 9638c2110033b719cc742997b9527505ffdc1a65\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Anchor","Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 2,"Ix" => 0},{"Ix" => 1,"CommitId" => "9638c2110033b719cc742997b9527505ffdc1a65","Differs" => 48}],"Msg" => "Update to upstream 2.1\n\n[git-debrebase anchor: new upstream 2.1, merge]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "2c7955d092ae39c0901171505c7cc9e0f668ed5e"} 1031s git-debrebase *** WALK prep done cur=b4b98b70ea12b896129408b67aedf3eae0eacda9 brw 0 upp 3 proc 6 pm 0 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s ++ git rev-parse HEAD 1031s + expect=cec7cb0ddec86e20bd6120c410ab3664b168913f 1031s + exec 1031s + local cid ctype info nparents 1031s + read cid ctype info 1031s + : ===== cec7cb0ddec86e20bd6120c410ab3664b168913f Pseudomerge Contributor=63dba55c8caa27845a7a4d80870e14502bccaac5 ===== 1031s + test cec7cb0ddec86e20bd6120c410ab3664b168913f = cec7cb0ddec86e20bd6120c410ab3664b168913f 1031s + local cetype=Pseudomerge 1031s + '[' xPseudomerge = xPseudomerge ']' 1031s + cetype=SAME 1031s ++ git log -n1 --pretty=format:%P cec7cb0ddec86e20bd6120c410ab3664b168913f 1031s + local 'parents=63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1031s + expect='63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1031s + enparents=1 1031s + : Pseudomerge/SAME '63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1031s + expect=63dba55c8caa27845a7a4d80870e14502bccaac5 1031s + enparents=2 1031s + git diff --quiet 63dba55c8caa27845a7a4d80870e14502bccaac5..cec7cb0ddec86e20bd6120c410ab3664b168913f 1031s + etypes=Upstream 1031s + : 'reject pointless pseudomerges' 1031s + local 'overwritten= 2306c75cf843d0ffac699f610942f2a4632dad14' 1031s + overwritten=2306c75cf843d0ffac699f610942f2a4632dad14 1031s + t-git-debrebase analyse 2306c75cf843d0ffac699f610942f2a4632dad14 1031s + local gdr=git-debrebase 1031s + : ' 1031s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1031s + git-debrebase --dgit=dgit -D analyse 2306c75cf843d0ffac699f610942f2a4632dad14 1031s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 1 *main::STDOUT 1031s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1031s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1031s git-debrebase = Changelog {"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog"} 1031s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1031s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1031s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16}]} 1031s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1031s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1031s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Parents" => [{"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"} 1031s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1031s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1031s git-debrebase = Upstream {"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Ix" => 0}]} 1031s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1031s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1031s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 2}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945"} 1031s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1031s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1031s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1031s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1031s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s + local ocid otype oinfo 1031s + read ocid otype oinfo 1031s + case "$otype" in 1031s ++ printf %s '63dba55c8caa27845a7a4d80870e14502bccaac5 2306c75cf843d0ffac699f610942f2a4632dad14' 1031s ++ wc -w 1031s + local cnparents=2 1031s + test 2 = 2 1031s ++ for f in $parents 1031s ++ echo 63dba55c8caa27845a7a4d80870e14502bccaac5 1031s ++ for f in $parents 1031s ++ echo 2306c75cf843d0ffac699f610942f2a4632dad14 1031s ++ wc -w 1031s ++ t-sort -u 1031s ++ LC_COLLATE=C 1031s ++ sort -u 1031s + local cndparents=2 1031s + test 2 = 2 1031s + case "$parents" in 1031s + case "$ctype" in 1031s + read cid ctype info 1031s + : ===== 63dba55c8caa27845a7a4d80870e14502bccaac5 Upstream ===== 1031s + test 63dba55c8caa27845a7a4d80870e14502bccaac5 = 63dba55c8caa27845a7a4d80870e14502bccaac5 1031s + local cetype=Upstream 1031s + '[' xUpstream = xUpstream ']' 1031s + cetype=SAME 1031s ++ git log -n1 --pretty=format:%P 63dba55c8caa27845a7a4d80870e14502bccaac5 1031s + local parents=0b082886262badc204503b01bc36e2ca34b2cb40 1031s + expect=0b082886262badc204503b01bc36e2ca34b2cb40 1031s + enparents=1 1031s + : Upstream/SAME 0b082886262badc204503b01bc36e2ca34b2cb40 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s ++ printf %s 0b082886262badc204503b01bc36e2ca34b2cb40 1031s ++ wc -w 1031s + local cnparents=1 1031s + test 1 = 1 1031s ++ for f in $parents 1031s ++ echo 0b082886262badc204503b01bc36e2ca34b2cb40 1031s ++ wc -w 1031s ++ t-sort -u 1031s ++ LC_COLLATE=C 1031s ++ sort -u 1031s + local cndparents=1 1031s + test 1 = 1 1031s + case "$parents" in 1031s + case "$ctype" in 1031s + read cid ctype info 1031s + : ===== 0b082886262badc204503b01bc36e2ca34b2cb40 Upstream ===== 1031s + test 0b082886262badc204503b01bc36e2ca34b2cb40 = 0b082886262badc204503b01bc36e2ca34b2cb40 1031s + local cetype=Upstream 1031s + '[' xUpstream = xUpstream ']' 1031s + cetype=SAME 1031s ++ git log -n1 --pretty=format:%P 0b082886262badc204503b01bc36e2ca34b2cb40 1031s + local parents=be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s + expect=be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s + enparents=1 1031s + : Upstream/SAME be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s ++ printf %s be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s ++ wc -w 1031s + local cnparents=1 1031s + test 1 = 1 1031s ++ for f in $parents 1031s ++ echo be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s ++ wc -w 1031s ++ t-sort -u 1031s ++ LC_COLLATE=C 1031s ++ sort -u 1031s + local cndparents=1 1031s + test 1 = 1 1031s + case "$parents" in 1031s + case "$ctype" in 1031s + read cid ctype info 1031s + : ===== be836997804d5eb1f863c35479b4f4bcb1e20b07 Upstream ===== 1031s + test be836997804d5eb1f863c35479b4f4bcb1e20b07 = be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s + local cetype=Upstream 1031s + '[' xUpstream = xUpstream ']' 1031s + cetype=SAME 1031s ++ git log -n1 --pretty=format:%P be836997804d5eb1f863c35479b4f4bcb1e20b07 1031s + local parents=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s + expect=cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s + enparents=1 1031s + : Upstream/SAME cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s ++ printf %s cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s ++ wc -w 1031s + local cnparents=1 1031s + test 1 = 1 1031s ++ for f in $parents 1031s ++ echo cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s ++ wc -w 1031s ++ t-sort -u 1031s ++ LC_COLLATE=C 1031s ++ sort -u 1031s + local cndparents=1 1031s + test 1 = 1 1031s + case "$parents" in 1031s + case "$ctype" in 1031s + read cid ctype info 1031s + : ===== cc1ba496149b7d3818e07a2e132e8a7fa6b08129 Changelog ===== 1031s + test cc1ba496149b7d3818e07a2e132e8a7fa6b08129 = cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s + local cetype=Upstream 1031s + '[' xChangelog = xUpstream ']' 1031s ++ git log -n1 --pretty=format:%P cc1ba496149b7d3818e07a2e132e8a7fa6b08129 1031s + local parents=b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s + expect=b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s + enparents=1 1031s + : Changelog/Upstream b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + '[' x '!=' x ']' 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s + git diff --quiet b4b98b70ea12b896129408b67aedf3eae0eacda9..cc1ba496149b7d3818e07a2e132e8a7fa6b08129 -- :. ':!debian/changelog' 1031s + etypes=Packaging 1031s ++ printf %s b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s ++ wc -w 1031s + local cnparents=1 1031s + test 1 = 1 1031s ++ for f in $parents 1031s ++ echo b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s ++ wc -w 1031s ++ t-sort -u 1031s ++ LC_COLLATE=C 1031s ++ sort -u 1031s + local cndparents=1 1031s + test 1 = 1 1031s + case "$parents" in 1031s + case "$ctype" in 1031s + read cid ctype info 1031s + : ===== b4b98b70ea12b896129408b67aedf3eae0eacda9 Anchor ===== 1031s + test b4b98b70ea12b896129408b67aedf3eae0eacda9 = b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s + local cetype=Packaging 1031s + '[' xAnchor = xPackaging ']' 1031s ++ git log -n1 --pretty=format:%P b4b98b70ea12b896129408b67aedf3eae0eacda9 1031s + local 'parents=514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1031s + expect='514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1031s + enparents=1 1031s + : Anchor/Packaging '514fe3f551f3706f5408598630daac3e7bbc512d 9638c2110033b719cc742997b9527505ffdc1a65' 1031s + case "$ctype/$cetype" in 1031s + case "$ctype/$etypes" in 1031s + case "$cetype" in 1031s + case "$ctype" in 1031s + break 1031s + git diff --quiet ordinary 1031s + : ----- with pre-existing changes ----- 1031s + git checkout -b with-preexisting before-new-upstream 1031s Switched to a new branch 'with-preexisting' 1031s + t-dch-commit drivel-in-changelog 1031s + t-debchange drivel-in-changelog 1031s + DEBEMAIL=dgit-tests@example.org 1031s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange drivel-in-changelog 1031s + exec env TZ=UTC faketime -f 2018-06-26 08:00:03 env -u TZ /usr/bin/debchange drivel-in-changelog 1031s + git commit -m 'dch drivel-in-changelog' debian/changelog 1031s [with-preexisting 5f324c5] dch drivel-in-changelog 1031s 1 file changed, 6 insertions(+) 1031s + git branch before-new-upstream-with-changes 1031s + t-git-next-date 1031s + GIT_COMMITTER_DATE='1530000004 +0100' 1031s + GIT_AUTHOR_DATE='1530000004 +0100' 1031s + t-git-debrebase new-upstream 2.1 1031s + local gdr=git-debrebase 1031s + : ' 1031s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1031s + git-debrebase --dgit=dgit -D new-upstream 2.1 1031s git-debrebase ffq_prev_branchinfo branch current refs/heads/with-preexisting 1031s git-debrebase ffq check_specs * 1031s git-debrebase *** WALK 5f324c513f5554d318ac25d8f09f86cb53884614 0 - 1031s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 8aab2999f8b4049ec78006813604d9e1be560611 = 0x10 1031s git-debrebase classify 5f324c513f5554d318ac25d8f09f86cb53884614 $t=8aab2999f8b4049ec78006813604d9e1be560611 @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x10 1031s git-debrebase = Changelog {"Tree" => "8aab2999f8b4049ec78006813604d9e1be560611","Hdr" => "tree 8aab2999f8b4049ec78006813604d9e1be560611\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch drivel-in-changelog\n","Type" => "Changelog","CommitId" => "5f324c513f5554d318ac25d8f09f86cb53884614","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"}]} 1031s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1031s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1031s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Msg" => "dch -r -D unstable\n","Type" => "Changelog"} 1031s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1031s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1031s git-debrebase = Changelog {"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db"} 1031s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1031s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1031s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"}],"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"} 1031s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1031s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1031s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2,"Ix" => 0}],"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1031s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1031s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1031s git-debrebase = Upstream {"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 2,"Ix" => 0}],"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Type" => "Upstream"} 1031s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1031s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1031s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1031s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor"} 1031s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 2 upp 2 proc 6 pm -1 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 7 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1031s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1031s git-debrebase WALK REWRITING NOW cl=HASH(0x55bc38734930) procd=HASH(0x55bc38784a88) 1031s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1031s git-debrebase WALK BUILD 5f324c513f5554d318ac25d8f09f86cb53884614 Debian (rewriting=1) 1031s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1031s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1031s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1031s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s git-debrebase get_differs 39534db3d67bac6e704e86cbc1a98a49df255abc 5f324c513f5554d318ac25d8f09f86cb53884614 = 0 1031s git-debrebase *** WALK RETURN 39534db3d67bac6e704e86cbc1a98a49df255abc 05eb3ce158301cebf417a23c59e954589261a7c2 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1031s git-debrebase get_differs 832b0288360c76e3df570b8a09534dac1e692374 608be91cd95e5c32bda0bf7ae67466c14067af63 = 0x10 1031s git-debrebase classify 05eb3ce158301cebf417a23c59e954589261a7c2 $t=608be91cd95e5c32bda0bf7ae67466c14067af63 @p 832b0288360c76e3df570b8a09534dac1e692374/0x10 1031s git-debrebase = Changelog {"Msg" => "dch drivel-in-changelog\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "832b0288360c76e3df570b8a09534dac1e692374"}],"CommitId" => "05eb3ce158301cebf417a23c59e954589261a7c2","Tree" => "608be91cd95e5c32bda0bf7ae67466c14067af63","Hdr" => "tree 608be91cd95e5c32bda0bf7ae67466c14067af63\nparent 832b0288360c76e3df570b8a09534dac1e692374\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000004 +0100\n"} 1031s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1031s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1031s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1031s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},$VAR1->{"OrigParents"}[0]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1031s git-debrebase %pieces = {"" => {"Name" => "","NewIx" => 0,"Desc" => "upstream (main piece","OldIx" => 0,"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","New" => "9638c2110033b719cc742997b9527505ffdc1a65"}} 1031s git-debrebase @newpieces = [{"Name" => "","NewIx" => 0,"Desc" => "upstream (main piece","OldIx" => 0,"Old" => "dcacb606b0a29bcbc1331971222caf97f79a139c","New" => "9638c2110033b719cc742997b9527505ffdc1a65"}] 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1031s + exec env TZ=UTC faketime -f 2018-06-26 08:00:04 env -u TZ /usr/bin/debchange --allow-lower-version .* --no-auto-nmu --preserve --vendor=Unknown-Vendor --changelog debian/changelog --check-dirname-level 0 --release-heuristic=changelog -v 2.1-1 Update to new upstream version 2.1. 1031s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s git-debrebase: laundered (head was 5f324c513f5554d318ac25d8f09f86cb53884614) 1031s git-debrebase >= update refs/ffq-prev/heads/with-preexisting 5f324c513f5554d318ac25d8f09f86cb53884614 0000000000000000000000000000000000000000 1031s git-debrebase >= delete refs/debrebase-last/heads/with-preexisting 1031s git-debrebase >= update HEAD 39534db3d67bac6e704e86cbc1a98a49df255abc 5f324c513f5554d318ac25d8f09f86cb53884614 1031s git-debrebase >$ 1031s Recorded previous head for preservation 1031s Rebasing (1/3) Rebasing (2/3) Rebasing (3/3) Successfully rebased and updated refs/heads/with-preexisting. 1031s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1031s ' 1031s + clog-check-1 before-new-upstream-with-changes 1031s + before=before-new-upstream-with-changes 1031s ++ git log --format=%aD -n1 debian/changelog 1031s + date='Tue, 26 Jun 2018 09:00:04 +0100' 1031s ++ date -R -d 'Tue, 26 Jun 2018 09:00:04 +0100' 1031s + date='Tue, 26 Jun 2018 08:00:04 +0000' 1031s + git show before-new-upstream-with-changes:debian/changelog 1031s + m=' * Update to new upstream version 2.1.' 1031s + e='dgit test git user Tue, 26 Jun 2018 08:00:04 +0000' 1031s + perl -pe ' 1031s BEGIN { ($m,$e,@ARGV) = @ARGV; } 1031s next unless 1..m/^ --/; 1031s s/\([^()]+\)/(2.1-1)/ if m/^example /; 1031s $_ .= "$m\n" if m/^ \* drivel-in-changelog/; 1031s $_ = " -- $e\n" if m/^ -- /; 1031s ' ' * Update to new upstream version 2.1.' 'dgit test git user Tue, 26 Jun 2018 08:00:04 +0000' 1031s + clog-check-2 1031s + diff -u ../clog.expected debian/changelog 1031s + t-ok 1031s + : ======================================== 1031s + t-check-only-bpd 1031s + '[' .. = .. ']' 1031s + return 1031s + t-fscks 1031s + shopt -s nullglob 1031s + for d in $tmp/*/.git $tmp/git/*.git 1031s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s + t-git-fsck 1031s ++ git rev-parse --git-dir 1031s + local fsckerrs=.git/dgit-test-fsck.errs 1031s + set +e 1031s + LC_MESSAGES=C 1031s + git fsck --no-dangling --strict 1031s + tee .git/dgit-test-fsck.errs 1031s + ps='0 0' 1031s + set -e 1031s + local pats 1031s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 1031s + test '0 0' = '0 0' 1031s + pats+=(-e 'notice: HEAD points to an unborn branch') 1031s + pats+=(-e 'notice: No default references') 1031s + set +e 1031s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1031s + rc=1 1031s + set -e 1031s + case $rc in 1031s + t-save-artifacts 1031s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts 1031s + '[' x/tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts = x ']' 1031s + '[' xtmp = x ']' 1031s + GZIP=-1v 1031s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-newupstream-artifacts/gdr-newupstream.tar.gz '--exclude=*.tar' . 1031s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1031s 82.2% 1031s + echo ok. 1031s ok. 1031s + rc=0 1031s + set +x 1031s + set +e 1031s + pwd 1031s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1031s + '[' x '!=' x ']' 1031s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1031s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1031s + set -e 1031s + test 0 = 0 1032s autopkgtest [12:35:26]: test gdr-newupstream: -----------------------] 1032s gdr-newupstream PASS 1032s autopkgtest [12:35:26]: test gdr-newupstream: - - - - - - - - - - results - - - - - - - - - - 1032s autopkgtest [12:35:26]: test gdr-viagit: preparing testbed 1032s Reading package lists... 1032s Building dependency tree... 1032s Reading state information... 1033s Starting pkgProblemResolver with broken count: 0 1033s Starting 2 pkgProblemResolver with broken count: 0 1033s Done 1033s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1033s autopkgtest [12:35:27]: test gdr-viagit: [----------------------- 1033s ++ set -o pipefail 1033s ++ . tests/lib-core 1033s ++ . tests/lib-restricts 1033s ++ trap ' 1033s rc=$? 1033s set +x 1033s test $rc = 0 || echo " 1033s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1033s 1033s Most relevant logs are just before assignment rc=$rc 1033s Will now do cleanup etc. 1033s " 1033s set -x 1033s set +e 1033s pwd 1033s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1033s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1033s set -e 1033s test $rc = 0 || t-report-failure 1033s ' EXIT 1033s ++ t-filter-out-git-hyphen-dir 1033s ++ local pathent 1033s +++ type -p git-rev-parse 1033s +++ : 1033s ++ pathent= 1033s ++ case "$pathent" in 1033s ++ return 1033s ++ t-set-intree 1033s ++ '[' x = x ']' 1033s ++ return 1033s ++ : -D 1033s ++ export DGIT_TEST_DEBUG 1033s ++ : x 1033s ++ export DGIT_TEST_DEBPUSH_DEBUG 1033s ++ : 1033s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1033s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1033s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1033s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1033s ++ export LC_CTYPE=C.UTF-8 1033s ++ LC_CTYPE=C.UTF-8 1033s ++ unset CDPATH 1033s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1033s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1033s +++ pwd 1033s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1033s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ testname=gdr-viagit 1033s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ bpd=.. 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1033s ++ '[' x '!=' x ']' 1033s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s +++ pwd 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ t-set-using-tmp 1033s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ export 'DEBFULLNAME=dgit test git user' 1033s ++ DEBFULLNAME='dgit test git user' 1033s ++ git config --global user.email dgit-test@debian.example.net 1033s ++ git config --global user.name 'dgit test git user' 1033s ++ git config --global protocol.ext.allow always 1033s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1033s ++ env -0 1033s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1033s ++ export DEBCHANGE_VENDOR=dpkg 1033s ++ DEBCHANGE_VENDOR=dpkg 1033s ++ unset VISUAL 1033s ++ unset GIT_EDITOR 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1033s ++ cat 1033s ++ schroot=build 1033s ++ : aq 1033s ++ : archive/test-dummy 1033s ++ : sid:unstable 1033s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1033s ++ git config --global dgit.default.old-dsc-distro test-dummy 1033s + t-dependencies NO-DGIT GDR 1033s + : 'Hopefully installed: NO-DGIT GDR' 1033s + t-tstunt-parsechangelog 1033s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + local var=PATH 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + eval ' 1033s case "$PATH" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PATH="$tstunt" ;; 1033s *) PATH="$tstunt:$PATH" ;; 1033s esac 1033s export PATH 1033s ' 1033s ++ case "$PATH" in 1033s ++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ export PATH 1033s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + local var=PERLLIB 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + eval ' 1033s case "$PERLLIB" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PERLLIB="$tstunt" ;; 1033s *) PERLLIB="$tstunt:$PERLLIB" ;; 1033s esac 1033s export PERLLIB 1033s ' 1033s ++ case "$PERLLIB" in 1033s ++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ export PERLLIB 1033s + local f 1033s + for f in "$@" 1033s + t-tstunt--save-real dpkg-parsechangelog 1033s + local f=dpkg-parsechangelog 1033s + case "$f" in 1033s + local rc 1033s + local real 1033s + set +e 1033s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ type -p dpkg-parsechangelog 1033s + real=/usr/bin/dpkg-parsechangelog 1033s + rc=0 1033s + set -e 1033s + case $rc in 1033s + local varname=dpkg_parsechangelog 1033s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s + eval ' 1033s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1033s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s ' 1033s ++ : /usr/bin/dpkg-parsechangelog 1033s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s + f=./dpkg-parsechangelog 1033s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1033s + for f in "$@" 1033s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1033s + local f=Dpkg/Changelog/Parse.pm 1033s + case "$f" in 1033s + return 1033s + f=./Dpkg/Changelog/Parse.pm 1033s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1033s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1033s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1033s + t-setup-import gdr-convert-gbp-noarchive 1033s + local setupname=gdr-convert-gbp-noarchive 1033s + local setupsrc 1033s + local lock 1033s + '[' x = x ']' 1033s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 1033s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1033s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1033s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 1033s cd "$1"; shift 1033s setupname="$1"; shift 1033s simport="$1"; shift 1033s if [ -e "$simport" ]; then exit 0; fi 1033s env - "$@" \ 1033s "tests/setup/$setupname" 1033s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gdr-convert-gbp-noarchive /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1033s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1033s + shift 1033s + setupname=gdr-convert-gbp-noarchive 1033s + shift 1033s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1033s + shift 1033s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1033s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/gdr-viagit-stderr --stdout=/tmp/autopkgtest.ztMUxl/gdr-viagit-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-viagit -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/gdr-viagit' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 1033s ++ set -o pipefail 1033s ++ . tests/lib-core 1033s ++ . tests/lib-restricts 1033s ++ trap ' 1033s rc=$? 1033s set +x 1033s test $rc = 0 || echo " 1033s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1033s 1033s Most relevant logs are just before assignment rc=$rc 1033s Will now do cleanup etc. 1033s " 1033s set -x 1033s set +e 1033s pwd 1033s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1033s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1033s set -e 1033s test $rc = 0 || t-report-failure 1033s ' EXIT 1033s ++ t-filter-out-git-hyphen-dir 1033s ++ local pathent 1033s +++ type -p git-rev-parse 1033s +++ : 1033s ++ pathent= 1033s ++ case "$pathent" in 1033s ++ return 1033s ++ t-set-intree 1033s ++ '[' x = x ']' 1033s ++ return 1033s ++ : -D 1033s ++ export DGIT_TEST_DEBUG 1033s ++ : x 1033s ++ export DGIT_TEST_DEBPUSH_DEBUG 1033s ++ : 1033s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1033s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1033s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1033s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1033s ++ export LC_CTYPE=C.UTF-8 1033s ++ LC_CTYPE=C.UTF-8 1033s ++ unset CDPATH 1033s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1033s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1033s +++ pwd 1033s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1033s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ testname=gdr-convert-gbp-noarchive 1033s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ bpd=.. 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1033s ++ '[' x '!=' x ']' 1033s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s +++ pwd 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ t-set-using-tmp 1033s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ export 'DEBFULLNAME=dgit test git user' 1033s ++ DEBFULLNAME='dgit test git user' 1033s ++ git config --global user.email dgit-test@debian.example.net 1033s ++ git config --global user.name 'dgit test git user' 1033s ++ git config --global protocol.ext.allow always 1033s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1033s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1033s ++ export DEBCHANGE_VENDOR=dpkg 1033s ++ DEBCHANGE_VENDOR=dpkg 1033s ++ unset VISUAL 1033s ++ unset GIT_EDITOR 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1033s ++ cat 1033s ++ schroot=build 1033s ++ : aq 1033s ++ : archive/test-dummy 1033s ++ : sid:unstable 1033s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1033s ++ git config --global dgit.default.old-dsc-distro test-dummy 1033s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1033s ++ : -D 1033s ++ export GDR_TEST_DEBUG 1033s ++ t-tstunt debchange 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ local var=PATH 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ eval ' 1033s case "$PATH" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PATH="$tstunt" ;; 1033s *) PATH="$tstunt:$PATH" ;; 1033s esac 1033s export PATH 1033s ' 1033s +++ case "$PATH" in 1033s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ export PATH 1033s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ local var=PERLLIB 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ eval ' 1033s case "$PERLLIB" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PERLLIB="$tstunt" ;; 1033s *) PERLLIB="$tstunt:$PERLLIB" ;; 1033s esac 1033s export PERLLIB 1033s ' 1033s +++ case "$PERLLIB" in 1033s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s +++ export PERLLIB 1033s ++ local f 1033s ++ for f in "$@" 1033s ++ t-tstunt--save-real debchange 1033s ++ local f=debchange 1033s ++ case "$f" in 1033s ++ local rc 1033s ++ local real 1033s ++ set +e 1033s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ type -p debchange 1033s ++ real=/usr/bin/debchange 1033s ++ rc=0 1033s ++ set -e 1033s ++ case $rc in 1033s ++ local varname=debchange 1033s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1033s ++ eval ' 1033s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1033s export DGIT_TEST_REAL_DEBCHANGE 1033s ' 1033s +++ : /usr/bin/debchange 1033s +++ export DGIT_TEST_REAL_DEBCHANGE 1033s ++ f=./debchange 1033s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1033s + t-dependencies GDR 1033s + : 'Hopefully installed: GDR' 1033s + export ifarchive=: 1033s + ifarchive=: 1033s + t-chain-test gdr-convert-gbp 1033s + t-chain-test-somehow 1033s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1033s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1033s + export DGIT_TEST_TMPBASE= 1033s + DGIT_TEST_TMPBASE= 1033s + export ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s + ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s + local ct=gdr-convert-gbp 1033s + local d=tests/setup 1033s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1033s + exec tests/setup/gdr-convert-gbp 1033s ++ set -o pipefail 1033s ++ . tests/lib-core 1033s ++ . tests/lib-restricts 1033s ++ trap ' 1033s rc=$? 1033s set +x 1033s test $rc = 0 || echo " 1033s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1033s 1033s Most relevant logs are just before assignment rc=$rc 1033s Will now do cleanup etc. 1033s " 1033s set -x 1033s set +e 1033s pwd 1033s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1033s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1033s set -e 1033s test $rc = 0 || t-report-failure 1033s ' EXIT 1033s ++ t-filter-out-git-hyphen-dir 1033s ++ local pathent 1033s +++ type -p git-rev-parse 1033s +++ : 1033s ++ pathent= 1033s ++ case "$pathent" in 1033s ++ return 1033s ++ t-set-intree 1033s ++ '[' x = x ']' 1033s ++ return 1033s ++ : -D 1033s ++ export DGIT_TEST_DEBUG 1033s ++ : x 1033s ++ export DGIT_TEST_DEBPUSH_DEBUG 1033s ++ : 1033s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1033s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1033s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1033s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1033s ++ export LC_CTYPE=C.UTF-8 1033s ++ LC_CTYPE=C.UTF-8 1033s ++ unset CDPATH 1033s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1033s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1033s +++ pwd 1033s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1033s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ testname=gdr-convert-gbp-noarchive 1033s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1033s ++ bpd=.. 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1033s ++ '[' x '!=' x ']' 1033s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s +++ pwd 1033s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ t-set-using-tmp 1033s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1033s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1033s ++ export 'DEBFULLNAME=dgit test git user' 1033s ++ DEBFULLNAME='dgit test git user' 1033s ++ git config --global user.email dgit-test@debian.example.net 1033s ++ git config --global user.name 'dgit test git user' 1033s ++ git config --global protocol.ext.allow always 1033s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1033s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1033s ++ export DEBCHANGE_VENDOR=dpkg 1033s ++ DEBCHANGE_VENDOR=dpkg 1033s ++ unset VISUAL 1033s ++ unset GIT_EDITOR 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1033s ++ cat 1033s ++ schroot=build 1033s ++ : aq 1033s ++ : archive/test-dummy 1033s ++ : sid:unstable 1033s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1033s ++ git config --global dgit.default.old-dsc-distro test-dummy 1033s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1033s ++ : -D 1033s ++ export GDR_TEST_DEBUG 1033s ++ t-tstunt debchange 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ local var=PATH 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ eval ' 1033s case "$PATH" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PATH="$tstunt" ;; 1033s *) PATH="$tstunt:$PATH" ;; 1033s esac 1033s export PATH 1033s ' 1033s +++ case "$PATH" in 1033s +++ export PATH 1033s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ local var=PERLLIB 1033s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s ++ eval ' 1033s case "$PERLLIB" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PERLLIB="$tstunt" ;; 1033s *) PERLLIB="$tstunt:$PERLLIB" ;; 1033s esac 1033s export PERLLIB 1033s ' 1033s +++ case "$PERLLIB" in 1033s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s +++ export PERLLIB 1033s ++ local f 1033s ++ for f in "$@" 1033s ++ t-tstunt--save-real debchange 1033s ++ local f=debchange 1033s ++ case "$f" in 1033s ++ local rc 1033s ++ local real 1033s ++ set +e 1033s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s +++ type -p debchange 1033s ++ real=/usr/bin/debchange 1033s ++ rc=0 1033s ++ set -e 1033s ++ case $rc in 1033s ++ local varname=debchange 1033s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1033s ++ eval ' 1033s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1033s export DGIT_TEST_REAL_DEBCHANGE 1033s ' 1033s +++ : /usr/bin/debchange 1033s +++ export DGIT_TEST_REAL_DEBCHANGE 1033s ++ f=./debchange 1033s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1033s + : t-setup-import gnupg 1033s + t-dependencies GDR 1033s + : 'Hopefully installed: GDR' 1033s + t-tstunt-parsechangelog 1033s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + local var=PATH 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + eval ' 1033s case "$PATH" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PATH="$tstunt" ;; 1033s *) PATH="$tstunt:$PATH" ;; 1033s esac 1033s export PATH 1033s ' 1033s ++ case "$PATH" in 1033s ++ export PATH 1033s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + local var=PERLLIB 1033s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1033s + eval ' 1033s case "$PERLLIB" in 1033s "$tstunt:"*) ;; 1033s *":$tstunt:"*) ;; 1033s "") PERLLIB="$tstunt" ;; 1033s *) PERLLIB="$tstunt:$PERLLIB" ;; 1033s esac 1033s export PERLLIB 1033s ' 1033s ++ case "$PERLLIB" in 1033s ++ export PERLLIB 1033s + local f 1033s + for f in "$@" 1033s + t-tstunt--save-real dpkg-parsechangelog 1033s + local f=dpkg-parsechangelog 1033s + case "$f" in 1033s + local rc 1033s + local real 1033s + set +e 1033s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1033s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1033s ++ type -p dpkg-parsechangelog 1033s + real=/usr/bin/dpkg-parsechangelog 1033s + rc=0 1033s + set -e 1033s + case $rc in 1033s + local varname=dpkg_parsechangelog 1033s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s + eval ' 1033s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1033s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s ' 1033s ++ : /usr/bin/dpkg-parsechangelog 1033s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1033s + f=./dpkg-parsechangelog 1033s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1033s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1033s + for f in "$@" 1033s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1033s + local f=Dpkg/Changelog/Parse.pm 1033s + case "$f" in 1033s + return 1033s + f=./Dpkg/Changelog/Parse.pm 1033s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1033s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1033s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1033s + t-gdr-gbp-import-core-with-queue 1033s + t-gdr-gbp-import-core 1033s + p=example 1033s + t-worktree 1.1 1033s + rm -rf example 1033s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 1033s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1033s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1033s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1033s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1033s + cd example 1033s + : 'fake up some kind of upstream' 1033s + git checkout -b upstream quilt-tip 1033s Switched to a new branch 'upstream' 1033s + rm -rf debian 1033s + mkdir debian 1033s + echo junk 1033s + git add debian 1033s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1033s [upstream 98d1ef3] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1033s 6 files changed, 1 insertion(+), 36 deletions(-) 1033s delete mode 100644 debian/changelog 1033s delete mode 100644 debian/compat 1033s delete mode 100644 debian/control 1033s delete mode 100644 debian/example.install 1033s mode change 100755 => 100644 debian/rules 1033s delete mode 100644 debian/source/format 1033s + git tag v1.0 1033s + : 'fake up that our quilt-tip was descended from upstream' 1033s + git checkout quilt-tip 1033s Switched to branch 'quilt-tip' 1033s + git merge --no-edit -s ours upstream 1033s Merge made by the 'ours' strategy. 1033s + : 'fake up that our quilt-tip had the patch queue in it' 1033s + git checkout patch-queue/quilt-tip 1033s Switched to branch 'patch-queue/quilt-tip' 1033s + gbp pq export 1033s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1033s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1033s + git add debian/patches 1033s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1033s [quilt-tip 2d660f7] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1033s 4 files changed, 50 insertions(+) 1033s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1033s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1033s create mode 100644 debian/patches/series 1033s create mode 100644 debian/patches/subdir/addnewups 1033s + : 'make branch names more conventional' 1033s + git branch -D master 1033s Deleted branch master (was 17d67db). 1033s + git branch -m quilt-tip master 1033s + not-gdr-processable origin 1033s + git branch gdr-unprocessable/origin 1033s + t-git-debrebase analyse 1033s + local gdr=git-debrebase 1033s + : ' 1033s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1033s + git-debrebase --dgit=dgit -D analyse 1033s + grep 'Unknown Unprocessable' 1034s git-debrebase *** WALK 2d660f75d860eebc7c1d206b7b36383e1ee4add4 1 *main::STDOUT 1034s git-debrebase get_differs 1bc46c9d4678351c17d3f6376286edb58ddee61b bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1034s git-debrebase classify 2d660f75d860eebc7c1d206b7b36383e1ee4add4 $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 1bc46c9d4678351c17d3f6376286edb58ddee61b/0x4 1034s git-debrebase = AddPatches {"CommitId" => "2d660f75d860eebc7c1d206b7b36383e1ee4add4","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Type" => "AddPatches","Parents" => [{"Ix" => 0,"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Differs" => 4}],"Msg" => "patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)\n","Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 1bc46c9d4678351c17d3f6376286edb58ddee61b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1034s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1034s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1034s git-debrebase classify 1bc46c9d4678351c17d3f6376286edb58ddee61b $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 98d1ef33f97b1baf0e88f735213286f40a2d2980/0x30 1034s git-debrebase = Pseudomerge {"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Overwritten" => [{"CommitId" => "98d1ef33f97b1baf0e88f735213286f40a2d2980","Differs" => 48,"Ix" => 1}],"Type" => "Pseudomerge","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Differs" => 0,"Ix" => 0},$VAR1->{"Overwritten"}[0]],"Msg" => "Merge branch 'upstream' into quilt-tip\n","Contributor" => $VAR1->{"Parents"}[0],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 98d1ef33f97b1baf0e88f735213286f40a2d2980\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1034s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1034s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1034s git-debrebase = Upstream {"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","Parents" => [{"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Differs" => 2,"Ix" => 0}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 1034s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1034s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1034s git-debrebase = Mixed {"Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Type" => "Mixed","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Ix" => 0,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9","Differs" => 50}],"Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"} 1034s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1034s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1034s git-debrebase = Packaging {"Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Type" => "Packaging","Msg" => "echo EXAMPLE RULES TARGET\n","Parents" => [{"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Differs" => 32}],"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1034s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1034s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1034s git-debrebase = Packaging {"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Msg" => "WIP\n","Parents" => [{"Ix" => 0,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Differs" => 32}],"Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Type" => "Packaging","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n"} 1034s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1034s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1034s git-debrebase = Packaging {"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Parents" => [{"Differs" => 32,"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Ix" => 0}],"Msg" => "WIP\n","Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Type" => "Packaging","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n"} 1034s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1034s git-debrebase ** Unknown 1034s git-debrebase *** WALK BOMB unrecognised 1034s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1034s ' 1034s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1034s + : 'fake up an upstream 2.0' 1034s + git branch make-upstream upstream 1034s + t-make-new-upstream-tarball 2.0 1034s + local uv=2.0 1034s + git checkout make-upstream 1034s Switched to branch 'make-upstream' 1034s + echo 'upstream 2.0' 1034s + git commit -a -m 'upstream 2.0 tarball' 1034s [make-upstream 19f63cb] upstream 2.0 tarball 1034s 1 file changed, 1 insertion(+) 1034s + t-make-orig example 2.0 make-upstream 1034s + local p=example 1034s + local v=2.0 1034s + local tag=make-upstream 1034s + ust=example_2.0.orig.tar.gz 1034s + GZIP=-1 1034s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1034s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1034s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1034s + git branch -D quilt-tip-2 1034s Deleted branch quilt-tip-2 (was 99fcab4). 1034s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1034s + git branch -D gitish-only 1034s Deleted branch gitish-only (was 2b2ddc8). 1034s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1034s + git branch -D quilt-tip-1.1 1034s Deleted branch quilt-tip-1.1 (was 7fc34be). 1034s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1034s + git branch -D patch-queue/quilt-tip 1034s Deleted branch patch-queue/quilt-tip (was d843a68). 1034s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1034s + git branch -D indep-arch 1034s Deleted branch indep-arch (was e215729). 1034s + : 'see what gbp import-orig does' 1034s + git checkout master 1034s Switched to branch 'master' 1034s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1034s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1034s gbp:info: Source package is example 1034s gbp:info: Upstream version is 2.0 1034s gbp:info: Replacing upstream source on 'master' 1034s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1034s + not-gdr-processable merge 1034s + git branch gdr-unprocessable/merge 1034s + t-git-debrebase analyse 1034s + local gdr=git-debrebase 1034s + : ' 1034s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1034s + git-debrebase --dgit=dgit -D analyse 1034s + grep 'Unknown Unprocessable' 1034s git-debrebase *** WALK 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 1 *main::STDOUT 1034s git-debrebase get_differs 2d660f75d860eebc7c1d206b7b36383e1ee4add4 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1034s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1034s git-debrebase classify 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 2d660f75d860eebc7c1d206b7b36383e1ee4add4/0x2 dcacb606b0a29bcbc1331971222caf97f79a139c/0x34 1034s git-debrebase ** Unknown 1034s git-debrebase *** WALK BOMB unrecognised 1034s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1034s ' 1034s 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 Unknown Unprocessable (general two-parent merge) 1034s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1034s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1034s + DEBEMAIL=dgit-tests@example.org 1034s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1034s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 1034s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1034s [master 39a9ae4] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1034s 1 file changed, 6 insertions(+) 1034s + t-dch-commit-r 1034s + t-dch-r-rune t-dch-commit 1034s + local cmd=t-dch-commit 1034s + shift 1034s + local suite=unstable 1034s + t-dch-commit -r -D unstable '' 1034s + t-debchange -r -D unstable '' 1034s + DEBEMAIL=dgit-tests@example.org 1034s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1034s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1034s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1034s libdistro-info-perl is not installed, Debian release names are not known. 1034s libdistro-info-perl is not installed, Ubuntu release names are not known. 1034s + git commit -m 'dch -r -D unstable ' debian/changelog 1034s [master c8629cf] dch -r -D unstable 1034s 1 file changed, 3 insertions(+), 2 deletions(-) 1034s + echo garbage 1034s + git add debian/patches/garbage 1034s + git commit -m 'add garbage' debian/patches/garbage 1034s [master 07528ed] add garbage 1034s 1 file changed, 1 insertion(+) 1034s create mode 100644 debian/patches/garbage 1034s + : t-archive-none example 1034s + : t-git-none 1034s + : t-dgit -wgf --gbp push-source --new 1034s + t-salsa-add-remote 1034s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1034s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1034s + set -e 1034s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1034s + git init --bare 1034s hint: Using 'master' as the name for the initial branch. This default branch name 1034s hint: is subject to change. To configure the initial branch name to use in all 1034s hint: of your new repositories, which will suppress this warning, call: 1034s hint: 1034s hint: git config --global init.defaultBranch 1034s hint: 1034s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1034s hint: 'development'. The just-created branch can be renamed via this command: 1034s hint: 1034s hint: git branch -m 1034s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 1034s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1034s + git push --set-upstream origin master 1034s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1034s * [new branch] master -> master 1034s Branch 'master' set up to track remote branch 'master' from 'origin'. 1034s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1034s + local 'mpat=E:identical in upstream files' 1034s + shift 1034s + set +o pipefail 1034s + LC_MESSAGES=C 1034s + LANGUAGE=C 1034s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1034s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local gdr=git-debrebase 1034s + : ' 1034s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1034s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1034s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1034s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x36 1034s docs/README | 1 + 1034s 1 file changed, 1 insertion(+) 1034s 1034s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1034s git-debrebase: identical in upstream files. See diffstat above, or run 1034s git-debrebase: git diff 98d1ef33f97b1baf0e88f735213286f40a2d2980 HEAD -- :!/debian :/ 1034s + local 'ps=255 0' 1034s + set -o pipefail 1034s + case $ps in 1034s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local 'mpat=E:identical in upstream files' 1034s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local grepper=fgrep 1034s + case "$mpat" in 1034s + case "$mpat" in 1034s + grepper=egrep 1034s + mpat='identical in upstream files' 1034s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s git-debrebase: identical in upstream files. See diffstat above, or run 1034s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1034s + local 'mpat=E:Unused patch file garbage will be discarded' 1034s + shift 1034s + set +o pipefail 1034s + LC_MESSAGES=C 1034s + LANGUAGE=C 1034s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1034s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local gdr=git-debrebase 1034s + : ' 1034s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1034s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1034s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1034s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1034s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1034s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1034s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1034s $VAR2 = bless( do{\(my $o = { 1034s 'is_pgp_signed' => 0, 1034s 'fields' => { 1034s 'Source' => 'example', 1034s 'Version' => '2.0-1', 1034s 'Distribution' => 'unstable', 1034s 'Urgency' => 'medium', 1034s 'Maintainer' => 'dgit test git user ', 1034s 'Timestamp' => '1530000000', 1034s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1034s 'Changes' => ' 1034s example (2.0-1) unstable; urgency=medium 1034s 1034s [ Ian Jackson ] 1034s * new upstream (did gbp import-orig)' 1034s }, 1034s 'drop_empty' => 0, 1034s 'in_order' => [ 1034s 'Source', 1034s 'Version', 1034s 'Distribution', 1034s 'Urgency', 1034s 'Maintainer', 1034s 'Timestamp', 1034s 'Date', 1034s 'Changes' 1034s ], 1034s 'name' => 'debian/changelog, entry no.1', 1034s 'allow_pgp' => 1, 1034s 'keep_duplicate' => 0, 1034s 'out_order' => [], 1034s 'allow_duplicate' => 0 1034s })}, 'Dpkg::Control::Hash' ); 1034s last finished-looking changelog entry: (2.0-1) unstable 1034s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1034s Failed to stitch in dgit view (see messages above). 1034s dgit --overwrite will be needed on the first dgit push after conversion. 1034s git-debrebase: snags: 1 overriden by individual -f options 1034s 1034s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1034s + local 'ps=255 0' 1034s + set -o pipefail 1034s + case $ps in 1034s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local 'mpat=E:Unused patch file garbage will be discarded' 1034s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s + local grepper=fgrep 1034s + case "$mpat" in 1034s + case "$mpat" in 1034s + grepper=egrep 1034s + mpat='Unused patch file garbage will be discarded' 1034s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1034s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1034s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1034s + local gdr=git-debrebase 1034s + : ' 1034s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1034s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1034s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1034s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1034s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1034s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1034s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1034s $VAR2 = bless( do{\(my $o = { 1034s 'allow_pgp' => 1, 1034s 'in_order' => [ 1034s 'Source', 1034s 'Version', 1034s 'Distribution', 1034s 'Urgency', 1034s 'Maintainer', 1034s 'Timestamp', 1034s 'Date', 1034s 'Changes' 1034s ], 1034s 'is_pgp_signed' => 0, 1034s 'out_order' => [], 1034s 'name' => 'debian/changelog, entry no.1', 1034s 'fields' => { 1034s 'Source' => 'example', 1034s 'Version' => '2.0-1', 1034s 'Distribution' => 'unstable', 1034s 'Urgency' => 'medium', 1034s 'Maintainer' => 'dgit test git user ', 1034s 'Timestamp' => '1530000000', 1034s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1034s 'Changes' => ' 1034s example (2.0-1) unstable; urgency=medium 1034s 1034s [ Ian Jackson ] 1034s * new upstream (did gbp import-orig)' 1034s }, 1034s 'keep_duplicate' => 0, 1034s 'drop_empty' => 0, 1034s 'allow_duplicate' => 0 1034s })}, 'Dpkg::Control::Hash' ); 1034s last finished-looking changelog entry: (2.0-1) unstable 1034s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1034s Failed to stitch in dgit view (see messages above). 1034s dgit --overwrite will be needed on the first dgit push after conversion. 1034s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1034s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1034s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1034s gbp:info: Trying to apply patches at '07528ed443e7bf250b829b6c1d391c42507ce2b1' 1035s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1035s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1035s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1035s git-debrebase ffq check_specs * 1035s git-debrebase ffq merge master 1035s git-debrebase ffq check_remote origin remote fetch/merge branch 1035s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1035s OK, you are ahead of refs/remotes/origin/master 1035s git-debrebase ffq check_remote undef remote push branch 1035s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1035s git-debrebase: snags: 2 overriden by individual -f options 1035s git-debrebase >= update refs/debrebase-last/heads/master f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 0000000000000000000000000000000000000000 1035s git-debrebase >= update HEAD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 07528ed443e7bf250b829b6c1d391c42507ce2b1 1035s git-debrebase >$ 1035s HEAD is now at f5ce088 Add another new upstream file 1035s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1035s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1035s ' 1035s + git branch converted-from-gbp 1035s + v=2.0-2 1035s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1035s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1035s + DEBEMAIL=dgit-tests@example.org 1035s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1035s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 1035s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1035s [master f4c946a] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1035s 1 file changed, 6 insertions(+) 1035s + t-dch-commit-r 1035s + t-dch-r-rune t-dch-commit 1035s + local cmd=t-dch-commit 1035s + shift 1035s + local suite=unstable 1035s + t-dch-commit -r -D unstable '' 1035s + t-debchange -r -D unstable '' 1035s + DEBEMAIL=dgit-tests@example.org 1035s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1035s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1035s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1035s libdistro-info-perl is not installed, Debian release names are not known. 1035s libdistro-info-perl is not installed, Ubuntu release names are not known. 1035s + git commit -m 'dch -r -D unstable ' debian/changelog 1035s [master 2306c75] dch -r -D unstable 1035s 1 file changed, 1 insertion(+), 1 deletion(-) 1035s + : t-dgit -wgf push-source --new 1035s + git push 1035s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1035s 07528ed..2306c75 master -> master 1035s + cd .. 1035s + : t-archive-process-incoming sid 1035s ++ echo example example_2.0.orig.tar.gz 1035s ++ : echo git mirror aq 1035s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 1035s . $troot/lib-gdr 1035s t-tstunt-parsechangelog 1035s p=example 1035s t-git-next-date 1035s ' 1035s + local savevars= 1035s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 1035s + local 'importeval= 1035s . $troot/lib-gdr 1035s t-tstunt-parsechangelog 1035s p=example 1035s t-git-next-date 1035s ' 1035s + local import=IMPORT.gdr-convert-gbp-noarchive 1035s + exec 1035s + local vn 1035s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 1035s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1035s print STDERR "saving-exporting $vn\n"; 1035s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1035s or die $!; 1035s } 1035s ' 1035s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1035s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1035s + set -e 1035s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1035s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 1035s + printf '\n%s\n' ' 1035s . $troot/lib-gdr 1035s t-tstunt-parsechangelog 1035s p=example 1035s t-git-next-date 1035s ' 1035s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1035s + rc=0 1035s + set +x 1035s + set +e 1035s + pwd 1035s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1035s + '[' x '!=' x ']' 1035s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1035s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1035s + set -e 1035s + test 0 = 0 1035s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 1035s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1035s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1035s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1035s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1035s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1035s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1035s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1035s +++ : -D 1035s +++ export GDR_TEST_DEBUG 1035s +++ t-tstunt debchange 1035s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s +++ local var=PATH 1035s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s +++ eval ' 1035s case "$PATH" in 1035s "$tstunt:"*) ;; 1035s *":$tstunt:"*) ;; 1035s "") PATH="$tstunt" ;; 1035s *) PATH="$tstunt:$PATH" ;; 1035s esac 1035s export PATH 1035s ' 1035s ++++ case "$PATH" in 1035s ++++ export PATH 1035s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s +++ local var=PERLLIB 1035s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s +++ eval ' 1035s case "$PERLLIB" in 1035s "$tstunt:"*) ;; 1035s *":$tstunt:"*) ;; 1035s "") PERLLIB="$tstunt" ;; 1035s *) PERLLIB="$tstunt:$PERLLIB" ;; 1035s esac 1035s export PERLLIB 1035s ' 1035s ++++ case "$PERLLIB" in 1035s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++++ export PERLLIB 1035s +++ local f 1035s +++ for f in "$@" 1035s +++ t-tstunt--save-real debchange 1035s +++ local f=debchange 1035s +++ case "$f" in 1035s +++ local rc 1035s +++ local real 1035s +++ set +e 1035s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1035s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1035s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s ++++ type -p debchange 1035s +++ real=/usr/bin/debchange 1035s +++ rc=0 1035s +++ set -e 1035s +++ case $rc in 1035s +++ local varname=debchange 1035s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1035s +++ eval ' 1035s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1035s export DGIT_TEST_REAL_DEBCHANGE 1035s ' 1035s ++++ : /usr/bin/debchange 1035s ++++ export DGIT_TEST_REAL_DEBCHANGE 1035s +++ f=./debchange 1035s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1035s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1035s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1035s ++ t-tstunt-parsechangelog 1035s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1035s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++ local var=PATH 1035s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++ eval ' 1035s case "$PATH" in 1035s "$tstunt:"*) ;; 1035s *":$tstunt:"*) ;; 1035s "") PATH="$tstunt" ;; 1035s *) PATH="$tstunt:$PATH" ;; 1035s esac 1035s export PATH 1035s ' 1035s +++ case "$PATH" in 1035s +++ export PATH 1035s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++ local var=PERLLIB 1035s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1035s ++ eval ' 1035s case "$PERLLIB" in 1035s "$tstunt:"*) ;; 1035s *":$tstunt:"*) ;; 1035s "") PERLLIB="$tstunt" ;; 1035s *) PERLLIB="$tstunt:$PERLLIB" ;; 1035s esac 1035s export PERLLIB 1035s ' 1035s +++ case "$PERLLIB" in 1035s +++ export PERLLIB 1035s ++ local f 1035s ++ for f in "$@" 1035s ++ t-tstunt--save-real dpkg-parsechangelog 1035s ++ local f=dpkg-parsechangelog 1035s ++ case "$f" in 1035s ++ local rc 1035s ++ local real 1035s ++ set +e 1035s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1035s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1035s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1035s +++ type -p dpkg-parsechangelog 1035s ++ real=/usr/bin/dpkg-parsechangelog 1035s ++ rc=0 1035s ++ set -e 1035s ++ case $rc in 1035s ++ local varname=dpkg_parsechangelog 1035s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1035s ++ eval ' 1035s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1035s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1035s ' 1035s +++ : /usr/bin/dpkg-parsechangelog 1035s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1035s ++ f=./dpkg-parsechangelog 1035s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1035s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1035s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1035s ++ for f in "$@" 1035s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1035s ++ local f=Dpkg/Changelog/Parse.pm 1035s ++ case "$f" in 1035s ++ return 1035s ++ f=./Dpkg/Changelog/Parse.pm 1035s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1035s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1035s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1035s ++ p=example 1035s ++ t-git-next-date 1035s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1035s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1035s + : 'set up so t-git-debrebase runs gdr via git' 1035s + case "$DGIT_GITDEBREBASE_TEST" in 1035s + DGIT_GITDEBREBASE_TEST='git debrebase' 1035s + : 'do a simple test' 1035s + cd example 1035s + t-some-changes 1035s + local token= 1035s + local which=dum 1035s + local fsuffix= 1035s + t-git-next-date 1035s + GIT_COMMITTER_DATE='1530000002 +0100' 1035s + GIT_AUTHOR_DATE='1530000002 +0100' 1035s + case "$which" in 1035s + echo '// debian ' 1035s + git add debian/zorkmid 1035s + git commit -m 'DEBIAN add zorkmid ()' 1035s [master f35b39d] DEBIAN add zorkmid () 1035s 1 file changed, 1 insertion(+) 1035s create mode 100644 debian/zorkmid 1035s + case "$which" in 1035s + echo '// upstream ' 1035s + git add src.c 1035s + git commit -m 'UPSTREAM edit src.c ()' 1035s [master 83999e9] UPSTREAM edit src.c () 1035s 1 file changed, 1 insertion(+) 1035s + case "$which" in 1035s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1035s + echo '// both! ' 1035s + git add debian/zorkmid 1035s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1035s + echo '// both! ' 1035s + git add src.c 1035s + git commit -m 'MIXED add both() ()' 1035s [master e3e54e4] MIXED add both() () 1035s 2 files changed, 2 insertions(+) 1035s + t-git-next-date 1035s + GIT_COMMITTER_DATE='1530000003 +0100' 1035s + GIT_AUTHOR_DATE='1530000003 +0100' 1035s + t-git-debrebase 1035s + local 'gdr=git debrebase' 1035s + : ' 1035s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1035s + git debrebase --dgit=dgit -D 1035s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1035s git-debrebase ffq check_specs * 1035s git-debrebase ffq merge master 1035s git-debrebase ffq check_remote origin remote fetch/merge branch 1035s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1035s OK, you are ahead of refs/remotes/origin/master 1035s git-debrebase ffq check_remote undef remote push branch 1035s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1035s git-debrebase *** WALK e3e54e4a20e3acc1b539ee56d012aafbc64d2814 0 - 1035s git-debrebase get_differs 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x22 1035s git-debrebase classify e3e54e4a20e3acc1b539ee56d012aafbc64d2814 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e/0x22 1035s git-debrebase = Mixed {"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814","Parents" => [{"Differs" => 34,"CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e","Ix" => 0}],"Msg" => "MIXED add both() ()\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Type" => "Mixed"} 1035s git-debrebase get_differs f35b39dc0aeace0beefc19bde62c5ff9a35833b8 b85e19e65449ead2ae9a8a37a6ad52e00555defd = 0x2 1035s git-debrebase classify 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e $t=b85e19e65449ead2ae9a8a37a6ad52e00555defd @p f35b39dc0aeace0beefc19bde62c5ff9a35833b8/0x2 1035s git-debrebase = Upstream {"Tree" => "b85e19e65449ead2ae9a8a37a6ad52e00555defd","Type" => "Upstream","Hdr" => "tree b85e19e65449ead2ae9a8a37a6ad52e00555defd\nparent f35b39dc0aeace0beefc19bde62c5ff9a35833b8\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8"}],"Msg" => "UPSTREAM edit src.c ()\n"} 1035s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c = 0x20 1035s git-debrebase classify f35b39dc0aeace0beefc19bde62c5ff9a35833b8 $t=a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x20 1035s git-debrebase = Packaging {"Tree" => "a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c","Type" => "Packaging","CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"Ix" => 0,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Differs" => 32}],"Hdr" => "tree a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1035s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1035s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1035s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Msg" => "dch -r -D unstable\n"} 1035s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1035s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1035s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16,"Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog"} 1035s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1035s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1035s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Differs" => 2}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"} 1035s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1035s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1035s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2,"Ix" => 0}],"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c"} 1035s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1035s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1035s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 2}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1035s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1035s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1035s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1035s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1035s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 4 upp 4 proc 9 pm -1 1035s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1035s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1035s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 10 1035s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1035s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1035s git-debrebase WALK REWRITING NOW cl=HASH(0x5610d4a622e0) procd=HASH(0x5610d4ac2b38) 1035s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1035s git-debrebase WALK BUILD f35b39dc0aeace0beefc19bde62c5ff9a35833b8 Debian (rewriting=1) 1035s git-debrebase WALK BUILD undef StartRewrite (rewriting=1) 1035s git-debrebase WALK BUILD e3e54e4a20e3acc1b539ee56d012aafbc64d2814 Debian (rewriting=1) 1035s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1035s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1035s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1035s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1035s git-debrebase WALK BUILD 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e Upstream (rewriting=1) 1035s git-debrebase WALK BUILD e3e54e4a20e3acc1b539ee56d012aafbc64d2814 Upstream (rewriting=1) 1035s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1035s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814 = 0 1035s git-debrebase *** WALK RETURN b67ec587c772c63f285bc0e4d9f8ca2b3050966c c9602b74b39008e0495fe7585f20632dd9c45897 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1035s git-debrebase: laundered (head was e3e54e4a20e3acc1b539ee56d012aafbc64d2814) 1035s git-debrebase >= update refs/ffq-prev/heads/master e3e54e4a20e3acc1b539ee56d012aafbc64d2814 0000000000000000000000000000000000000000 1035s git-debrebase >= delete refs/debrebase-last/heads/master 1035s git-debrebase >= update HEAD b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1035s git-debrebase >$ 1035s Recorded previous head for preservation 1035s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1035s ' 1035s + t-gdr-good laundered 1035s + local state=laundered 1035s + local beforetag= 1035s + case $state in 1035s + git diff --quiet -- :. ':!debian/patches' 1035s + LC_MESSAGES=C 1035s + t-git-debrebase status 1035s + local 'gdr=git debrebase' 1035s + : ' 1035s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1035s + git debrebase --dgit=dgit -D status 1035s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1035s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1035s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Type" => "Upstream","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1035s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1035s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1035s git-debrebase = Upstream {"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Msg" => "UPSTREAM edit src.c ()\n","Parents" => [{"Ix" => 0,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Differs" => 2}],"Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Type" => "Upstream"} 1035s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1035s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1035s git-debrebase = Upstream {"Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Type" => "Upstream","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Ix" => 0}]} 1035s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1035s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1035s git-debrebase = Upstream {"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","Parents" => [{"Differs" => 2,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1035s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1035s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1035s git-debrebase = Upstream {"Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Type" => "Upstream","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0,"Differs" => 2}]} 1035s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1035s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1035s git-debrebase = Packaging {"Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050"}],"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1035s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1035s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1035s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 32}],"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c"} 1035s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1035s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1035s git-debrebase = Changelog {"Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Msg" => "dch -r -D unstable\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1035s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1035s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1035s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b"} 1035s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1035s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1035s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1035s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1035s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1035s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1035s ' 1035s + case $state in 1035s + egrep '^ *branch is laundered' ../status.check 1035s branch is laundered 1035s + t-gdr-good-analyse HEAD laundered 1035s + local head=HEAD 1035s + local state=laundered 1035s + local wsfx= 1035s + local etypes bwtip 1035s + case $state in 1035s + etypes=Upstream 1035s ++ t-git-debrebase breakwater 1035s ++ local 'gdr=git debrebase' 1035s ++ : ' 1035s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1035s ++ git debrebase --dgit=dgit -D breakwater 1035s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1035s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1035s git-debrebase = Upstream {"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Differs" => 2}],"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1035s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1035s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1035s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Parents" => [{"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Differs" => 2,"Ix" => 0}]} 1035s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1035s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1035s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Parents" => [{"Differs" => 2,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Ix" => 0}]} 1035s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1035s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1035s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Differs" => 2}],"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1035s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1035s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1035s git-debrebase = Upstream {"Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Differs" => 2,"Ix" => 0}],"Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1035s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1035s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1035s git-debrebase = Packaging {"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Parents" => [{"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32}],"Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Type" => "Packaging","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1035s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1035s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1035s git-debrebase = Packaging {"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"}],"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Msg" => "DEBIAN add zorkmid ()\n","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1035s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1035s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1035s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -r -D unstable\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Parents" => [{"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1035s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1035s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1035s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}]} 1035s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1035s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1035s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1035s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [$VAR1->{"Parents"}[1]]} 1035s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1035s ' 1035s + bwtip=Y:c9602b74b39008e0495fe7585f20632dd9c45897 1035s + anal=../anal 1035s + t-git-debrebase analyse HEAD 1035s + local 'gdr=git debrebase' 1035s + : ' 1035s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1035s + git debrebase --dgit=dgit -D analyse HEAD 1035s git-debrebase *** WALK b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1 *main::STDOUT 1035s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1035s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1035s git-debrebase = Upstream {"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c"} 1035s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1035s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1035s git-debrebase = Upstream {"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Type" => "Upstream","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09"}],"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"} 1035s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1035s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1035s git-debrebase = Upstream {"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c"} 1035s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1035s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1035s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Type" => "Upstream","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"}]} 1035s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1035s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1035s git-debrebase = Upstream {"Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Type" => "Upstream","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Differs" => 2,"Ix" => 0}],"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"} 1035s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1035s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1035s git-debrebase = Packaging {"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050"}]} 1035s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1035s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1035s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid ()\n","Type" => "Packaging","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"}]} 1035s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1035s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1035s git-debrebase = Changelog {"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Parents" => [{"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Ix" => 0,"Differs" => 16}],"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1035s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1035s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1035s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}]} 1035s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","OrigParents" => [$VAR1->{"Parents"}[1]],"Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1036s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 4 proc 9 pm -1 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s ++ git rev-parse HEAD 1036s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + exec 1036s + local cid ctype info nparents 1036s + read cid ctype info 1036s + : ===== b67ec587c772c63f285bc0e4d9f8ca2b3050966c Upstream ===== 1036s + test b67ec587c772c63f285bc0e4d9f8ca2b3050966c = b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + local parents=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + expect=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + enparents=1 1036s + : Upstream/SAME e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 Upstream ===== 1036s + test e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 = e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + local parents=af8740843563dba5a36bacf39ce36ef6402dae09 1036s + expect=af8740843563dba5a36bacf39ce36ef6402dae09 1036s + enparents=1 1036s + : Upstream/SAME af8740843563dba5a36bacf39ce36ef6402dae09 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s af8740843563dba5a36bacf39ce36ef6402dae09 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo af8740843563dba5a36bacf39ce36ef6402dae09 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== af8740843563dba5a36bacf39ce36ef6402dae09 Upstream ===== 1036s + test af8740843563dba5a36bacf39ce36ef6402dae09 = af8740843563dba5a36bacf39ce36ef6402dae09 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P af8740843563dba5a36bacf39ce36ef6402dae09 1036s + local parents=f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + expect=f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + enparents=1 1036s + : Upstream/SAME f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s f36f58fc6066922b491b693a37bab95267f1c2a9 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo f36f58fc6066922b491b693a37bab95267f1c2a9 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== f36f58fc6066922b491b693a37bab95267f1c2a9 Upstream ===== 1036s + test f36f58fc6066922b491b693a37bab95267f1c2a9 = f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + local parents=c7452042cab61b744e90e83e0d467d79616da1bd 1036s + expect=c7452042cab61b744e90e83e0d467d79616da1bd 1036s + enparents=1 1036s + : Upstream/SAME c7452042cab61b744e90e83e0d467d79616da1bd 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s c7452042cab61b744e90e83e0d467d79616da1bd 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo c7452042cab61b744e90e83e0d467d79616da1bd 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== c7452042cab61b744e90e83e0d467d79616da1bd Upstream ===== 1036s + test c7452042cab61b744e90e83e0d467d79616da1bd = c7452042cab61b744e90e83e0d467d79616da1bd 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P c7452042cab61b744e90e83e0d467d79616da1bd 1036s + local parents=c9602b74b39008e0495fe7585f20632dd9c45897 1036s + expect=c9602b74b39008e0495fe7585f20632dd9c45897 1036s + enparents=1 1036s + : Upstream/SAME c9602b74b39008e0495fe7585f20632dd9c45897 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s c9602b74b39008e0495fe7585f20632dd9c45897 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo c9602b74b39008e0495fe7585f20632dd9c45897 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== c9602b74b39008e0495fe7585f20632dd9c45897 Packaging ===== 1036s + test c9602b74b39008e0495fe7585f20632dd9c45897 = c9602b74b39008e0495fe7585f20632dd9c45897 1036s + local cetype=Upstream 1036s + '[' xPackaging = xUpstream ']' 1036s ++ git log -n1 --pretty=format:%P c9602b74b39008e0495fe7585f20632dd9c45897 1036s + local parents=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + expect=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + enparents=1 1036s + : Packaging/Upstream 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + '[' xY:c9602b74b39008e0495fe7585f20632dd9c45897 '!=' x ']' 1036s + test Y:c9602b74b39008e0495fe7585f20632dd9c45897 = Y:c9602b74b39008e0495fe7585f20632dd9c45897 1036s + bwtip= 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :. ':!debian' 1036s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :debian/patches 1036s + etypes=Packaging 1036s ++ printf %s 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 Packaging ===== 1036s + test 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 = 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + local cetype=Packaging 1036s + '[' xPackaging = xPackaging ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + local parents=514fe3f551f3706f5408598630daac3e7bbc512d 1036s + expect=514fe3f551f3706f5408598630daac3e7bbc512d 1036s + enparents=1 1036s + : Packaging/SAME 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :. ':!debian' 1036s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :debian/patches 1036s + etypes=Packaging 1036s ++ printf %s 514fe3f551f3706f5408598630daac3e7bbc512d 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 514fe3f551f3706f5408598630daac3e7bbc512d 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 514fe3f551f3706f5408598630daac3e7bbc512d Changelog ===== 1036s + test 514fe3f551f3706f5408598630daac3e7bbc512d = 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + local cetype=Packaging 1036s + '[' xChangelog = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + local parents=6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + expect=6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + enparents=1 1036s + : Changelog/Packaging 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 6c5ccc74d24af3d27b1d6012d1810502d4005572..514fe3f551f3706f5408598630daac3e7bbc512d -- :. ':!debian/changelog' 1036s + etypes=Packaging 1036s ++ printf %s 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 6c5ccc74d24af3d27b1d6012d1810502d4005572 Changelog ===== 1036s + test 6c5ccc74d24af3d27b1d6012d1810502d4005572 = 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + local cetype=Packaging 1036s + '[' xChangelog = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + enparents=1 1036s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..6c5ccc74d24af3d27b1d6012d1810502d4005572 -- :. ':!debian/changelog' 1036s + etypes=Packaging 1036s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 1036s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + local cetype=Packaging 1036s + '[' xAnchor = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + enparents=1 1036s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + break 1036s + t-git-debrebase stitch --prose=wombat 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D stitch --prose=wombat 1036s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1036s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1036s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Parents" => [{"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Ix" => 0,"Differs" => 2}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe"} 1036s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1036s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1036s git-debrebase = Upstream {"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09"}]} 1036s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1036s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1036s git-debrebase = Upstream {"Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"}],"Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c"} 1036s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1036s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1036s git-debrebase = Upstream {"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Ix" => 0,"Differs" => 2}],"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Type" => "Upstream"} 1036s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1036s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1036s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0,"Differs" => 2}],"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Type" => "Upstream","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe"} 1036s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1036s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1036s git-debrebase = Packaging {"Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Type" => "Packaging","Parents" => [{"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Ix" => 0,"Differs" => 32}],"Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1"} 1036s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1036s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1036s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid ()\n","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"}],"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Type" => "Packaging","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c"} 1036s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1036s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1036s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1036s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1036s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1036s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}]} 1036s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Type" => "Anchor","OrigParents" => [{"Ix" => 1,"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1036s git-debrebase >= delete refs/ffq-prev/heads/master e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1036s git-debrebase >= update refs/debrebase-last/heads/master da329673e49708100554404dd7335b45e1c4c096 0000000000000000000000000000000000000000 1036s git-debrebase >= update HEAD da329673e49708100554404dd7335b45e1c4c096 b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s git-debrebase >$ 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s + t-gdr-good stitched 1036s + local state=stitched 1036s + local beforetag= 1036s + case $state in 1036s + git diff --quiet -- :. ':!debian/patches' 1036s + LC_MESSAGES=C 1036s + t-git-debrebase status 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D status 1036s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase get_differs e3e54e4a20e3acc1b539ee56d012aafbc64d2814 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase classify da329673e49708100554404dd7335b45e1c4c096 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p b67ec587c772c63f285bc0e4d9f8ca2b3050966c/0 e3e54e4a20e3acc1b539ee56d012aafbc64d2814/0 1036s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","CommitId" => "da329673e49708100554404dd7335b45e1c4c096","Overwritten" => [{"Differs" => 0,"Ix" => 1,"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814"}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent b67ec587c772c63f285bc0e4d9f8ca2b3050966c\nparent e3e54e4a20e3acc1b539ee56d012aafbc64d2814\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Contributor" => {"Differs" => 0,"Ix" => 0,"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c"},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","SubType" => "Ambiguous","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: wombat]\n"} 1036s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1036s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1036s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1036s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1036s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n","Parents" => [{"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Differs" => 2,"Ix" => 0}],"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"} 1036s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1036s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1036s git-debrebase = Upstream {"Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1036s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1036s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1036s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"}],"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"} 1036s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1036s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0,"Differs" => 2}],"Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch"} 1036s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1036s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1036s git-debrebase = Packaging {"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Parents" => [{"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Ix" => 0,"Differs" => 32}],"Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Type" => "Packaging"} 1036s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1036s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1036s git-debrebase = Packaging {"Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 32,"Ix" => 0}],"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c"} 1036s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1036s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1036s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Msg" => "dch -r -D unstable\n","Parents" => [{"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Ix" => 0,"Differs" => 16}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1036s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1036s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1036s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Type" => "Changelog"} 1036s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0,"Differs" => 0},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1036s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s + case $state in 1036s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1036s branch contains furniture (not laundered) 1036s + egrep '^ stitched$' ../status.check 1036s stitched 1036s + t-gdr-good-analyse HEAD stitched 1036s + local head=HEAD 1036s + local state=stitched 1036s + local wsfx= 1036s + local etypes bwtip 1036s + case $state in 1036s + etypes=Pseudomerge-Upstream 1036s + anal=../anal 1036s + t-git-debrebase analyse HEAD 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D analyse HEAD 1036s git-debrebase *** WALK da329673e49708100554404dd7335b45e1c4c096 1 *main::STDOUT 1036s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase get_differs e3e54e4a20e3acc1b539ee56d012aafbc64d2814 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase classify da329673e49708100554404dd7335b45e1c4c096 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p b67ec587c772c63f285bc0e4d9f8ca2b3050966c/0 e3e54e4a20e3acc1b539ee56d012aafbc64d2814/0 1036s git-debrebase = Pseudomerge {"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: wombat]\n","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent b67ec587c772c63f285bc0e4d9f8ca2b3050966c\nparent e3e54e4a20e3acc1b539ee56d012aafbc64d2814\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c"},{"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814","Ix" => 1,"Differs" => 0}],"Overwritten" => [$VAR1->{"Parents"}[1]],"SubType" => "Ambiguous","Type" => "Pseudomerge","CommitId" => "da329673e49708100554404dd7335b45e1c4c096","Contributor" => $VAR1->{"Parents"}[0]} 1036s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1036s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1036s git-debrebase = Upstream {"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Type" => "Upstream","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1036s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1036s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1036s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Type" => "Upstream","Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Parents" => [{"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Ix" => 0,"Differs" => 2}]} 1036s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1036s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1036s git-debrebase = Upstream {"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Parents" => [{"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Differs" => 2,"Ix" => 0}],"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Type" => "Upstream"} 1036s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1036s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1036s git-debrebase = Upstream {"Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"}],"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Type" => "Upstream"} 1036s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1036s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1036s git-debrebase = Upstream {"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Type" => "Upstream","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897"}],"Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1036s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1036s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1036s git-debrebase = Packaging {"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050"}],"Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Type" => "Packaging"} 1036s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1036s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1036s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid ()\n","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"}]} 1036s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1036s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1036s git-debrebase = Changelog {"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1036s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1036s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1036s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16,"Ix" => 0}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Type" => "Changelog","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"} 1036s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"Parents" => [{"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0,"Ix" => 0},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1036s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s ++ git rev-parse HEAD 1036s + expect=da329673e49708100554404dd7335b45e1c4c096 1036s + exec 1036s + local cid ctype info nparents 1036s + read cid ctype info 1036s + : ===== da329673e49708100554404dd7335b45e1c4c096 Pseudomerge Contributor=b67ec587c772c63f285bc0e4d9f8ca2b3050966c ===== 1036s + test da329673e49708100554404dd7335b45e1c4c096 = da329673e49708100554404dd7335b45e1c4c096 1036s + local cetype=Pseudomerge 1036s + '[' xPseudomerge = xPseudomerge ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P da329673e49708100554404dd7335b45e1c4c096 1036s + local 'parents=b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1036s + expect='b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1036s + enparents=1 1036s + : Pseudomerge/SAME 'b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + enparents=2 1036s + git diff --quiet b67ec587c772c63f285bc0e4d9f8ca2b3050966c..da329673e49708100554404dd7335b45e1c4c096 1036s + etypes=Upstream 1036s + : 'reject pointless pseudomerges' 1036s + local 'overwritten= e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1036s + overwritten=e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1036s + t-git-debrebase analyse e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D analyse e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1036s git-debrebase *** WALK e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1 *main::STDOUT 1036s git-debrebase get_differs 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x22 1036s git-debrebase classify e3e54e4a20e3acc1b539ee56d012aafbc64d2814 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e/0x22 1036s git-debrebase = Mixed {"Type" => "Mixed","Msg" => "MIXED add both() ()\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e","Ix" => 0,"Differs" => 34}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814"} 1036s git-debrebase get_differs f35b39dc0aeace0beefc19bde62c5ff9a35833b8 b85e19e65449ead2ae9a8a37a6ad52e00555defd = 0x2 1036s git-debrebase classify 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e $t=b85e19e65449ead2ae9a8a37a6ad52e00555defd @p f35b39dc0aeace0beefc19bde62c5ff9a35833b8/0x2 1036s git-debrebase = Upstream {"Msg" => "UPSTREAM edit src.c ()\n","Tree" => "b85e19e65449ead2ae9a8a37a6ad52e00555defd","Type" => "Upstream","CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e","Parents" => [{"Differs" => 2,"CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8","Ix" => 0}],"Hdr" => "tree b85e19e65449ead2ae9a8a37a6ad52e00555defd\nparent f35b39dc0aeace0beefc19bde62c5ff9a35833b8\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1036s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c = 0x20 1036s git-debrebase classify f35b39dc0aeace0beefc19bde62c5ff9a35833b8 $t=a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x20 1036s git-debrebase = Packaging {"CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14"}],"Hdr" => "tree a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "DEBIAN add zorkmid ()\n","Tree" => "a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c","Type" => "Packaging"} 1036s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1036s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1036s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Msg" => "dch -r -D unstable\n","Type" => "Changelog","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}]} 1036s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1036s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1036s git-debrebase = Changelog {"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog"} 1036s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1036s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"}],"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"} 1036s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1036s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1036s git-debrebase = Upstream {"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4"}],"Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream"} 1036s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1036s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1036s git-debrebase = Upstream {"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream"} 1036s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Parents" => [{"Differs" => 0,"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},$VAR1->{"OrigParents"}[0]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Type" => "Anchor"} 1036s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 4 upp 4 proc 9 pm -1 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s + local ocid otype oinfo 1036s + read ocid otype oinfo 1036s + case "$otype" in 1036s ++ printf %s 'b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1036s ++ wc -w 1036s + local cnparents=2 1036s + test 2 = 2 1036s ++ for f in $parents 1036s ++ echo b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s ++ for f in $parents 1036s ++ echo e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=2 1036s + test 2 = 2 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== b67ec587c772c63f285bc0e4d9f8ca2b3050966c Upstream ===== 1036s + test b67ec587c772c63f285bc0e4d9f8ca2b3050966c = b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1036s + local parents=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + expect=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + enparents=1 1036s + : Upstream/SAME e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 Upstream ===== 1036s + test e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 = e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1036s + local parents=af8740843563dba5a36bacf39ce36ef6402dae09 1036s + expect=af8740843563dba5a36bacf39ce36ef6402dae09 1036s + enparents=1 1036s + : Upstream/SAME af8740843563dba5a36bacf39ce36ef6402dae09 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s af8740843563dba5a36bacf39ce36ef6402dae09 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo af8740843563dba5a36bacf39ce36ef6402dae09 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== af8740843563dba5a36bacf39ce36ef6402dae09 Upstream ===== 1036s + test af8740843563dba5a36bacf39ce36ef6402dae09 = af8740843563dba5a36bacf39ce36ef6402dae09 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P af8740843563dba5a36bacf39ce36ef6402dae09 1036s + local parents=f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + expect=f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + enparents=1 1036s + : Upstream/SAME f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s f36f58fc6066922b491b693a37bab95267f1c2a9 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo f36f58fc6066922b491b693a37bab95267f1c2a9 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== f36f58fc6066922b491b693a37bab95267f1c2a9 Upstream ===== 1036s + test f36f58fc6066922b491b693a37bab95267f1c2a9 = f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P f36f58fc6066922b491b693a37bab95267f1c2a9 1036s + local parents=c7452042cab61b744e90e83e0d467d79616da1bd 1036s + expect=c7452042cab61b744e90e83e0d467d79616da1bd 1036s + enparents=1 1036s + : Upstream/SAME c7452042cab61b744e90e83e0d467d79616da1bd 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s c7452042cab61b744e90e83e0d467d79616da1bd 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo c7452042cab61b744e90e83e0d467d79616da1bd 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== c7452042cab61b744e90e83e0d467d79616da1bd Upstream ===== 1036s + test c7452042cab61b744e90e83e0d467d79616da1bd = c7452042cab61b744e90e83e0d467d79616da1bd 1036s + local cetype=Upstream 1036s + '[' xUpstream = xUpstream ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P c7452042cab61b744e90e83e0d467d79616da1bd 1036s + local parents=c9602b74b39008e0495fe7585f20632dd9c45897 1036s + expect=c9602b74b39008e0495fe7585f20632dd9c45897 1036s + enparents=1 1036s + : Upstream/SAME c9602b74b39008e0495fe7585f20632dd9c45897 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s ++ printf %s c9602b74b39008e0495fe7585f20632dd9c45897 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo c9602b74b39008e0495fe7585f20632dd9c45897 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== c9602b74b39008e0495fe7585f20632dd9c45897 Packaging ===== 1036s + test c9602b74b39008e0495fe7585f20632dd9c45897 = c9602b74b39008e0495fe7585f20632dd9c45897 1036s + local cetype=Upstream 1036s + '[' xPackaging = xUpstream ']' 1036s ++ git log -n1 --pretty=format:%P c9602b74b39008e0495fe7585f20632dd9c45897 1036s + local parents=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + expect=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + enparents=1 1036s + : Packaging/Upstream 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + '[' x '!=' x ']' 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :. ':!debian' 1036s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :debian/patches 1036s + etypes=Packaging 1036s ++ printf %s 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 Packaging ===== 1036s + test 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 = 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + local cetype=Packaging 1036s + '[' xPackaging = xPackaging ']' 1036s + cetype=SAME 1036s ++ git log -n1 --pretty=format:%P 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1036s + local parents=514fe3f551f3706f5408598630daac3e7bbc512d 1036s + expect=514fe3f551f3706f5408598630daac3e7bbc512d 1036s + enparents=1 1036s + : Packaging/SAME 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :. ':!debian' 1036s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :debian/patches 1036s + etypes=Packaging 1036s ++ printf %s 514fe3f551f3706f5408598630daac3e7bbc512d 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 514fe3f551f3706f5408598630daac3e7bbc512d 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 514fe3f551f3706f5408598630daac3e7bbc512d Changelog ===== 1036s + test 514fe3f551f3706f5408598630daac3e7bbc512d = 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + local cetype=Packaging 1036s + '[' xChangelog = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 514fe3f551f3706f5408598630daac3e7bbc512d 1036s + local parents=6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + expect=6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + enparents=1 1036s + : Changelog/Packaging 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 6c5ccc74d24af3d27b1d6012d1810502d4005572..514fe3f551f3706f5408598630daac3e7bbc512d -- :. ':!debian/changelog' 1036s + etypes=Packaging 1036s ++ printf %s 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 6c5ccc74d24af3d27b1d6012d1810502d4005572 Changelog ===== 1036s + test 6c5ccc74d24af3d27b1d6012d1810502d4005572 = 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + local cetype=Packaging 1036s + '[' xChangelog = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 6c5ccc74d24af3d27b1d6012d1810502d4005572 1036s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + enparents=1 1036s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..6c5ccc74d24af3d27b1d6012d1810502d4005572 -- :. ':!debian/changelog' 1036s + etypes=Packaging 1036s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s ++ wc -w 1036s + local cnparents=1 1036s + test 1 = 1 1036s ++ for f in $parents 1036s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s ++ wc -w 1036s ++ t-sort -u 1036s ++ LC_COLLATE=C 1036s ++ sort -u 1036s + local cndparents=1 1036s + test 1 = 1 1036s + case "$parents" in 1036s + case "$ctype" in 1036s + read cid ctype info 1036s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 1036s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + local cetype=Packaging 1036s + '[' xAnchor = xPackaging ']' 1036s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + enparents=1 1036s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1036s + case "$ctype/$cetype" in 1036s + case "$ctype/$etypes" in 1036s + case "$cetype" in 1036s + case "$ctype" in 1036s + break 1036s + : ----- test scrap ----- 1036s + t-refs-same-start 1036s + unset t_ref_val 1036s + t_ref_names=() 1036s + t-ref-head 1036s + local val 1036s ++ git rev-parse HEAD 1036s + val=da329673e49708100554404dd7335b45e1c4c096 1036s + t-ref-same-val HEAD da329673e49708100554404dd7335b45e1c4c096 1036s + local name=HEAD 1036s + local val=da329673e49708100554404dd7335b45e1c4c096 1036s + case "${t_ref_val-unset}" in 1036s + t_ref_val=da329673e49708100554404dd7335b45e1c4c096 1036s + t_ref_names+=("$name") 1036s + t-git-debrebase 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D 1036s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1036s git-debrebase ffq check_specs * 1036s git-debrebase ffq merge master 1036s git-debrebase ffq check_remote origin remote fetch/merge branch 1036s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1036s OK, you are ahead of refs/remotes/origin/master 1036s git-debrebase ffq check_remote undef remote push branch 1036s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1036s git-debrebase *** WALK da329673e49708100554404dd7335b45e1c4c096 0 - 1036s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase get_differs e3e54e4a20e3acc1b539ee56d012aafbc64d2814 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1036s git-debrebase classify da329673e49708100554404dd7335b45e1c4c096 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p b67ec587c772c63f285bc0e4d9f8ca2b3050966c/0 e3e54e4a20e3acc1b539ee56d012aafbc64d2814/0 1036s git-debrebase = Pseudomerge {"Overwritten" => [{"Differs" => 0,"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814","Ix" => 1}],"Contributor" => {"Ix" => 0,"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Differs" => 0},"Type" => "Pseudomerge","SubType" => "Ambiguous","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent b67ec587c772c63f285bc0e4d9f8ca2b3050966c\nparent e3e54e4a20e3acc1b539ee56d012aafbc64d2814\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: wombat]\n","CommitId" => "da329673e49708100554404dd7335b45e1c4c096","Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]]} 1036s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1036s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Ix" => 0}]} 1036s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1036s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1036s git-debrebase = Upstream {"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Msg" => "UPSTREAM edit src.c ()\n","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Parents" => [{"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1036s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1036s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1036s git-debrebase = Upstream {"Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Parents" => [{"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Differs" => 2}],"Type" => "Upstream"} 1036s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1036s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1036s git-debrebase = Upstream {"Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1036s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1036s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1036s git-debrebase = Upstream {"Parents" => [{"Ix" => 0,"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Differs" => 2}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1036s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1036s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1036s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32}]} 1036s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1036s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1036s git-debrebase = Packaging {"Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","Msg" => "DEBIAN add zorkmid ()\n","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Parents" => [{"Differs" => 32,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Ix" => 0}],"Type" => "Packaging"} 1036s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1036s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1036s git-debrebase = Changelog {"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Parents" => [{"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Ix" => 0,"Differs" => 16}],"Type" => "Changelog"} 1036s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1036s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1036s git-debrebase = Changelog {"Type" => "Changelog","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}]} 1036s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1036s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1036s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1036s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]]} 1036s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1036s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 12 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1036s git-debrebase WALK BUILD 6c5ccc74d24af3d27b1d6012d1810502d4005572 Debian (rewriting=0) 1036s git-debrebase WALK BUILD 514fe3f551f3706f5408598630daac3e7bbc512d Debian (rewriting=0) 1036s git-debrebase WALK BUILD 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 Debian (rewriting=0) 1036s git-debrebase WALK BUILD c9602b74b39008e0495fe7585f20632dd9c45897 Debian (rewriting=0) 1036s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=0) 1036s git-debrebase WALK BUILD c7452042cab61b744e90e83e0d467d79616da1bd Upstream (rewriting=0) 1036s git-debrebase WALK BUILD f36f58fc6066922b491b693a37bab95267f1c2a9 Upstream (rewriting=0) 1036s git-debrebase WALK BUILD af8740843563dba5a36bacf39ce36ef6402dae09 Upstream (rewriting=0) 1036s git-debrebase WALK BUILD e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 Upstream (rewriting=0) 1036s git-debrebase WALK BUILD b67ec587c772c63f285bc0e4d9f8ca2b3050966c Upstream (rewriting=0) 1036s git-debrebase WALK BUILD undef StartRewrite (rewriting=0) 1036s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1036s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c da329673e49708100554404dd7335b45e1c4c096 = 0 1036s git-debrebase *** WALK RETURN b67ec587c772c63f285bc0e4d9f8ca2b3050966c c9602b74b39008e0495fe7585f20632dd9c45897 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1036s git-debrebase: laundered (head was da329673e49708100554404dd7335b45e1c4c096) 1036s git-debrebase >= update refs/ffq-prev/heads/master da329673e49708100554404dd7335b45e1c4c096 0000000000000000000000000000000000000000 1036s git-debrebase >= delete refs/debrebase-last/heads/master 1036s git-debrebase >= update HEAD b67ec587c772c63f285bc0e4d9f8ca2b3050966c da329673e49708100554404dd7335b45e1c4c096 1036s git-debrebase >$ 1036s Recorded previous head for preservation 1036s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1036s ' 1036s + t-gdr-good laundered 1036s + local state=laundered 1036s + local beforetag= 1036s + case $state in 1036s + git diff --quiet -- :. ':!debian/patches' 1036s + LC_MESSAGES=C 1036s + t-git-debrebase status 1036s + local 'gdr=git debrebase' 1036s + : ' 1036s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1036s + git debrebase --dgit=dgit -D status 1036s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1036s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1036s git-debrebase = Upstream {"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1036s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1036s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1036s git-debrebase = Upstream {"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","Parents" => [{"Ix" => 0,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Differs" => 2}],"Type" => "Upstream"} 1036s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1036s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1036s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"}],"Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09"} 1037s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1037s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Differs" => 2}],"Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec"} 1037s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1037s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 2,"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0}],"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"} 1037s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1037s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1037s git-debrebase = Packaging {"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Parents" => [{"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32}],"Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1037s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1037s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1037s git-debrebase = Packaging {"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Type" => "Packaging","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 32}]} 1037s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1037s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1037s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1037s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1037s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 16}],"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Type" => "Anchor","OrigParents" => [$VAR1->{"Parents"}[1]],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1037s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s + case $state in 1037s + egrep '^ *branch is laundered' ../status.check 1037s branch is laundered 1037s + t-gdr-good-analyse HEAD laundered 1037s + local head=HEAD 1037s + local state=laundered 1037s + local wsfx= 1037s + local etypes bwtip 1037s + case $state in 1037s + etypes=Upstream 1037s ++ t-git-debrebase breakwater 1037s ++ local 'gdr=git debrebase' 1037s ++ : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s ++ git debrebase --dgit=dgit -D breakwater 1037s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1037s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1037s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Ix" => 0}],"Type" => "Upstream","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1037s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1037s git-debrebase = Upstream {"Parents" => [{"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "fdfb8c533072456c5397f65174176b408f46094b","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Msg" => "UPSTREAM edit src.c ()\n","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1037s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1037s git-debrebase = Upstream {"Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Parents" => [{"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Differs" => 2}],"Type" => "Upstream"} 1037s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1037s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Ix" => 0}],"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec"} 1037s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1037s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0}],"Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe"} 1037s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1037s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1037s git-debrebase = Packaging {"Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Type" => "Packaging","Parents" => [{"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Ix" => 0,"Differs" => 32}]} 1037s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1037s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1037s git-debrebase = Packaging {"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid ()\n","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Ix" => 0,"Differs" => 32}],"Type" => "Packaging"} 1037s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1037s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1037s git-debrebase = Changelog {"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}]} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1037s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1037s git-debrebase = Changelog {"Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Type" => "Changelog"} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1,"Differs" => 48}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1037s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s + bwtip=Y:c9602b74b39008e0495fe7585f20632dd9c45897 1037s + anal=../anal 1037s + t-git-debrebase analyse HEAD 1037s + local 'gdr=git debrebase' 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + git debrebase --dgit=dgit -D analyse HEAD 1037s git-debrebase *** WALK b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1 *main::STDOUT 1037s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1037s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1037s git-debrebase = Upstream {"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"}],"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c"} 1037s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1037s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Parents" => [{"Differs" => 2,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Ix" => 0}],"Tree" => "fdfb8c533072456c5397f65174176b408f46094b"} 1037s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1037s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1037s git-debrebase = Upstream {"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Parents" => [{"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Differs" => 2}],"Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1037s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1037s git-debrebase = Upstream {"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","Parents" => [{"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Differs" => 2}],"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1037s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1037s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0,"Differs" => 2}],"Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe"} 1037s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1037s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1037s git-debrebase = Packaging {"Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Parents" => [{"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32}],"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1037s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1037s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1037s git-debrebase = Packaging {"Type" => "Packaging","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Msg" => "DEBIAN add zorkmid ()\n","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d"}],"Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c"} 1037s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1037s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1037s git-debrebase = Changelog {"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1037s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1037s git-debrebase = Changelog {"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"Type" => "Changelog","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","OrigParents" => [$VAR1->{"Parents"}[1]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Anchor"} 1037s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 4 proc 9 pm -1 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s ++ git rev-parse HEAD 1037s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + exec 1037s + local cid ctype info nparents 1037s + read cid ctype info 1037s + : ===== b67ec587c772c63f285bc0e4d9f8ca2b3050966c Upstream ===== 1037s + test b67ec587c772c63f285bc0e4d9f8ca2b3050966c = b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + local parents=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + expect=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + enparents=1 1037s + : Upstream/SAME e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 Upstream ===== 1037s + test e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 = e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + local parents=af8740843563dba5a36bacf39ce36ef6402dae09 1037s + expect=af8740843563dba5a36bacf39ce36ef6402dae09 1037s + enparents=1 1037s + : Upstream/SAME af8740843563dba5a36bacf39ce36ef6402dae09 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s af8740843563dba5a36bacf39ce36ef6402dae09 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo af8740843563dba5a36bacf39ce36ef6402dae09 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== af8740843563dba5a36bacf39ce36ef6402dae09 Upstream ===== 1037s + test af8740843563dba5a36bacf39ce36ef6402dae09 = af8740843563dba5a36bacf39ce36ef6402dae09 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P af8740843563dba5a36bacf39ce36ef6402dae09 1037s + local parents=f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + expect=f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + enparents=1 1037s + : Upstream/SAME f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s f36f58fc6066922b491b693a37bab95267f1c2a9 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo f36f58fc6066922b491b693a37bab95267f1c2a9 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== f36f58fc6066922b491b693a37bab95267f1c2a9 Upstream ===== 1037s + test f36f58fc6066922b491b693a37bab95267f1c2a9 = f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + local parents=c7452042cab61b744e90e83e0d467d79616da1bd 1037s + expect=c7452042cab61b744e90e83e0d467d79616da1bd 1037s + enparents=1 1037s + : Upstream/SAME c7452042cab61b744e90e83e0d467d79616da1bd 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s c7452042cab61b744e90e83e0d467d79616da1bd 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo c7452042cab61b744e90e83e0d467d79616da1bd 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== c7452042cab61b744e90e83e0d467d79616da1bd Upstream ===== 1037s + test c7452042cab61b744e90e83e0d467d79616da1bd = c7452042cab61b744e90e83e0d467d79616da1bd 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P c7452042cab61b744e90e83e0d467d79616da1bd 1037s + local parents=c9602b74b39008e0495fe7585f20632dd9c45897 1037s + expect=c9602b74b39008e0495fe7585f20632dd9c45897 1037s + enparents=1 1037s + : Upstream/SAME c9602b74b39008e0495fe7585f20632dd9c45897 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s c9602b74b39008e0495fe7585f20632dd9c45897 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo c9602b74b39008e0495fe7585f20632dd9c45897 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== c9602b74b39008e0495fe7585f20632dd9c45897 Packaging ===== 1037s + test c9602b74b39008e0495fe7585f20632dd9c45897 = c9602b74b39008e0495fe7585f20632dd9c45897 1037s + local cetype=Upstream 1037s + '[' xPackaging = xUpstream ']' 1037s ++ git log -n1 --pretty=format:%P c9602b74b39008e0495fe7585f20632dd9c45897 1037s + local parents=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + expect=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + enparents=1 1037s + : Packaging/Upstream 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + '[' xY:c9602b74b39008e0495fe7585f20632dd9c45897 '!=' x ']' 1037s + test Y:c9602b74b39008e0495fe7585f20632dd9c45897 = Y:c9602b74b39008e0495fe7585f20632dd9c45897 1037s + bwtip= 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :. ':!debian' 1037s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :debian/patches 1037s + etypes=Packaging 1037s ++ printf %s 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 Packaging ===== 1037s + test 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 = 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + local cetype=Packaging 1037s + '[' xPackaging = xPackaging ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + local parents=514fe3f551f3706f5408598630daac3e7bbc512d 1037s + expect=514fe3f551f3706f5408598630daac3e7bbc512d 1037s + enparents=1 1037s + : Packaging/SAME 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :. ':!debian' 1037s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :debian/patches 1037s + etypes=Packaging 1037s ++ printf %s 514fe3f551f3706f5408598630daac3e7bbc512d 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 514fe3f551f3706f5408598630daac3e7bbc512d 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 514fe3f551f3706f5408598630daac3e7bbc512d Changelog ===== 1037s + test 514fe3f551f3706f5408598630daac3e7bbc512d = 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + local cetype=Packaging 1037s + '[' xChangelog = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + local parents=6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + expect=6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + enparents=1 1037s + : Changelog/Packaging 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 6c5ccc74d24af3d27b1d6012d1810502d4005572..514fe3f551f3706f5408598630daac3e7bbc512d -- :. ':!debian/changelog' 1037s + etypes=Packaging 1037s ++ printf %s 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 6c5ccc74d24af3d27b1d6012d1810502d4005572 Changelog ===== 1037s + test 6c5ccc74d24af3d27b1d6012d1810502d4005572 = 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + local cetype=Packaging 1037s + '[' xChangelog = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + enparents=1 1037s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..6c5ccc74d24af3d27b1d6012d1810502d4005572 -- :. ':!debian/changelog' 1037s + etypes=Packaging 1037s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 1037s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + local cetype=Packaging 1037s + '[' xAnchor = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + enparents=1 1037s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + break 1037s + t-some-changes 1037s + local token= 1037s + local which=dum 1037s + local fsuffix= 1037s + t-git-next-date 1037s + GIT_COMMITTER_DATE='1530000004 +0100' 1037s + GIT_AUTHOR_DATE='1530000004 +0100' 1037s + case "$which" in 1037s + echo '// debian ' 1037s + git add debian/zorkmid 1037s + git commit -m 'DEBIAN add zorkmid ()' 1037s [master 25782f9] DEBIAN add zorkmid () 1037s 1 file changed, 1 insertion(+) 1037s + case "$which" in 1037s + echo '// upstream ' 1037s + git add src.c 1037s + git commit -m 'UPSTREAM edit src.c ()' 1037s [master ac1717a] UPSTREAM edit src.c () 1037s 1 file changed, 1 insertion(+) 1037s + case "$which" in 1037s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1037s + echo '// both! ' 1037s + git add debian/zorkmid 1037s + for f in debian/zorkmid$fsuffix src$fsuffix.c 1037s + echo '// both! ' 1037s + git add src.c 1037s + git commit -m 'MIXED add both() ()' 1037s [master 119fa23] MIXED add both() () 1037s 2 files changed, 2 insertions(+) 1037s + t-git-next-date 1037s + GIT_COMMITTER_DATE='1530000005 +0100' 1037s + GIT_AUTHOR_DATE='1530000005 +0100' 1037s + t-git-debrebase scrap 1037s + local 'gdr=git debrebase' 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + git debrebase --dgit=dgit -D scrap 1037s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1037s git-debrebase >= update refs/debrebase-last/heads/master da329673e49708100554404dd7335b45e1c4c096 0000000000000000000000000000000000000000 1037s git-debrebase >= update refs/ffq-prev/heads/master 0000000000000000000000000000000000000000 da329673e49708100554404dd7335b45e1c4c096 1037s git-debrebase >= update HEAD da329673e49708100554404dd7335b45e1c4c096 119fa23bc1349554ddb096980878c0251357187b 1037s git-debrebase >$ 1037s HEAD is now at da32967 Declare fast forward / record previous work 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s + t-gdr-good stitched 1037s + local state=stitched 1037s + local beforetag= 1037s + case $state in 1037s + git diff --quiet -- :. ':!debian/patches' 1037s + LC_MESSAGES=C 1037s + t-git-debrebase status 1037s + local 'gdr=git debrebase' 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + git debrebase --dgit=dgit -D status 1037s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1037s git-debrebase get_differs e3e54e4a20e3acc1b539ee56d012aafbc64d2814 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1037s git-debrebase classify da329673e49708100554404dd7335b45e1c4c096 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p b67ec587c772c63f285bc0e4d9f8ca2b3050966c/0 e3e54e4a20e3acc1b539ee56d012aafbc64d2814/0 1037s git-debrebase = Pseudomerge {"Contributor" => {"Ix" => 0,"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Differs" => 0},"CommitId" => "da329673e49708100554404dd7335b45e1c4c096","SubType" => "Ambiguous","Parents" => [$VAR1->{"Contributor"},{"Differs" => 0,"Ix" => 1,"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814"}],"Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: wombat]\n","Overwritten" => [$VAR1->{"Parents"}[1]],"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent b67ec587c772c63f285bc0e4d9f8ca2b3050966c\nparent e3e54e4a20e3acc1b539ee56d012aafbc64d2814\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Pseudomerge"} 1037s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1037s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n","Parents" => [{"Differs" => 2,"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Ix" => 0}]} 1037s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1037s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1037s git-debrebase = Upstream {"Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09"}],"Msg" => "UPSTREAM edit src.c ()\n","Tree" => "fdfb8c533072456c5397f65174176b408f46094b","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16"} 1037s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1037s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1037s git-debrebase = Upstream {"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","Parents" => [{"Differs" => 2,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream","Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1037s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1037s git-debrebase = Upstream {"Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd"}],"Type" => "Upstream","Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1037s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1037s git-debrebase = Upstream {"Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897"}],"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Upstream"} 1037s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1037s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1037s git-debrebase = Packaging {"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","Parents" => [{"Ix" => 0,"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32}],"Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Type" => "Packaging","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n"} 1037s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1037s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1037s git-debrebase = Packaging {"Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"Ix" => 0,"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 32}],"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Packaging"} 1037s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1037s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1037s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Parents" => [{"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Ix" => 0}],"Msg" => "dch -r -D unstable\n"} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1037s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1037s git-debrebase = Changelog {"Parents" => [{"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Type" => "Changelog"} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Type" => "Anchor","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","OrigParents" => [{"Differs" => 48,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Ix" => 1}],"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n"} 1037s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s + case $state in 1037s + egrep '^ *branch contains furniture|^ *branch is unlaundered|^ *branch needs laundering' ../status.check 1037s branch contains furniture (not laundered) 1037s + egrep '^ stitched$' ../status.check 1037s stitched 1037s + t-gdr-good-analyse HEAD stitched 1037s + local head=HEAD 1037s + local state=stitched 1037s + local wsfx= 1037s + local etypes bwtip 1037s + case $state in 1037s + etypes=Pseudomerge-Upstream 1037s + anal=../anal 1037s + t-git-debrebase analyse HEAD 1037s + local 'gdr=git debrebase' 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + git debrebase --dgit=dgit -D analyse HEAD 1037s git-debrebase *** WALK da329673e49708100554404dd7335b45e1c4c096 1 *main::STDOUT 1037s git-debrebase get_differs b67ec587c772c63f285bc0e4d9f8ca2b3050966c bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1037s git-debrebase get_differs e3e54e4a20e3acc1b539ee56d012aafbc64d2814 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0 1037s git-debrebase classify da329673e49708100554404dd7335b45e1c4c096 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p b67ec587c772c63f285bc0e4d9f8ca2b3050966c/0 e3e54e4a20e3acc1b539ee56d012aafbc64d2814/0 1037s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Msg" => "Declare fast forward / record previous work\n\n[git-debrebase pseudomerge: wombat]\n","Overwritten" => [{"Ix" => 1,"Differs" => 0,"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814"}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent b67ec587c772c63f285bc0e4d9f8ca2b3050966c\nparent e3e54e4a20e3acc1b539ee56d012aafbc64d2814\nauthor dgit test git user 1530000003 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","CommitId" => "da329673e49708100554404dd7335b45e1c4c096","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c"},$VAR1->{"Overwritten"}[0]],"SubType" => "Ambiguous","Contributor" => $VAR1->{"Parents"}[0]} 1037s git-debrebase get_differs e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x2 1037s git-debrebase classify b67ec587c772c63f285bc0e4d9f8ca2b3050966c $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p e9e58ddd4b3d85f755b9fcf529e148e755b0ed16/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Ix" => 0,"Differs" => 2}],"Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent e9e58ddd4b3d85f755b9fcf529e148e755b0ed16\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","CommitId" => "b67ec587c772c63f285bc0e4d9f8ca2b3050966c","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: upstream part]\n"} 1037s git-debrebase get_differs af8740843563dba5a36bacf39ce36ef6402dae09 fdfb8c533072456c5397f65174176b408f46094b = 0x2 1037s git-debrebase classify e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 $t=fdfb8c533072456c5397f65174176b408f46094b @p af8740843563dba5a36bacf39ce36ef6402dae09/0x2 1037s git-debrebase = Upstream {"Tree" => "fdfb8c533072456c5397f65174176b408f46094b","Hdr" => "tree fdfb8c533072456c5397f65174176b408f46094b\nparent af8740843563dba5a36bacf39ce36ef6402dae09\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "e9e58ddd4b3d85f755b9fcf529e148e755b0ed16","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09"}],"Msg" => "UPSTREAM edit src.c ()\n","Type" => "Upstream"} 1037s git-debrebase get_differs f36f58fc6066922b491b693a37bab95267f1c2a9 d7bc80ac393b7a00ac3473e460fef0a70156b32c = 0x2 1037s git-debrebase classify af8740843563dba5a36bacf39ce36ef6402dae09 $t=d7bc80ac393b7a00ac3473e460fef0a70156b32c @p f36f58fc6066922b491b693a37bab95267f1c2a9/0x2 1037s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"}],"Hdr" => "tree d7bc80ac393b7a00ac3473e460fef0a70156b32c\nparent f36f58fc6066922b491b693a37bab95267f1c2a9\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d7bc80ac393b7a00ac3473e460fef0a70156b32c","CommitId" => "af8740843563dba5a36bacf39ce36ef6402dae09","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Type" => "Upstream"} 1037s git-debrebase get_differs c7452042cab61b744e90e83e0d467d79616da1bd d4ba01b9a3cd435ca8e2b43cead98b59614006ec = 0x2 1037s git-debrebase classify f36f58fc6066922b491b693a37bab95267f1c2a9 $t=d4ba01b9a3cd435ca8e2b43cead98b59614006ec @p c7452042cab61b744e90e83e0d467d79616da1bd/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Differs" => 2,"Ix" => 0}],"Hdr" => "tree d4ba01b9a3cd435ca8e2b43cead98b59614006ec\nparent c7452042cab61b744e90e83e0d467d79616da1bd\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "d4ba01b9a3cd435ca8e2b43cead98b59614006ec","CommitId" => "f36f58fc6066922b491b693a37bab95267f1c2a9"} 1037s git-debrebase get_differs c9602b74b39008e0495fe7585f20632dd9c45897 27c592cbae9f6a650ea73ce9b6fb58208c03cffe = 0x2 1037s git-debrebase classify c7452042cab61b744e90e83e0d467d79616da1bd $t=27c592cbae9f6a650ea73ce9b6fb58208c03cffe @p c9602b74b39008e0495fe7585f20632dd9c45897/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","CommitId" => "c7452042cab61b744e90e83e0d467d79616da1bd","Hdr" => "tree 27c592cbae9f6a650ea73ce9b6fb58208c03cffe\nparent c9602b74b39008e0495fe7585f20632dd9c45897\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "27c592cbae9f6a650ea73ce9b6fb58208c03cffe","Parents" => [{"CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Ix" => 0,"Differs" => 2}]} 1037s git-debrebase get_differs 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1c10925690a29bd5c5cf936d96a01c9db7be92a1 = 0x20 1037s git-debrebase classify c9602b74b39008e0495fe7585f20632dd9c45897 $t=1c10925690a29bd5c5cf936d96a01c9db7be92a1 @p 0c79446614e2126eb3d3afb1fd805a5f6a6b5050/0x20 1037s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "MIXED add both() ()\n\n[git-debrebase split: mixed commit: debian part]\n","Hdr" => "tree 1c10925690a29bd5c5cf936d96a01c9db7be92a1\nparent 0c79446614e2126eb3d3afb1fd805a5f6a6b5050\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "1c10925690a29bd5c5cf936d96a01c9db7be92a1","CommitId" => "c9602b74b39008e0495fe7585f20632dd9c45897","Parents" => [{"CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050","Differs" => 32,"Ix" => 0}]} 1037s git-debrebase get_differs 514fe3f551f3706f5408598630daac3e7bbc512d 41924042c9e0ebdf87b433d6d2db229fe3ef123c = 0x20 1037s git-debrebase classify 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 $t=41924042c9e0ebdf87b433d6d2db229fe3ef123c @p 514fe3f551f3706f5408598630daac3e7bbc512d/0x20 1037s git-debrebase = Packaging {"Type" => "Packaging","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Differs" => 32,"Ix" => 0}],"Hdr" => "tree 41924042c9e0ebdf87b433d6d2db229fe3ef123c\nparent 514fe3f551f3706f5408598630daac3e7bbc512d\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "41924042c9e0ebdf87b433d6d2db229fe3ef123c","CommitId" => "0c79446614e2126eb3d3afb1fd805a5f6a6b5050"} 1037s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1037s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1037s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Msg" => "dch -r -D unstable\n"} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 5e26401e579fd6bc004b29dc0bc9c9721162882b = 0x10 1037s git-debrebase classify 6c5ccc74d24af3d27b1d6012d1810502d4005572 $t=5e26401e579fd6bc004b29dc0bc9c9721162882b @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x10 1037s git-debrebase = Changelog {"Type" => "Changelog","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Hdr" => "tree 5e26401e579fd6bc004b29dc0bc9c9721162882b\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Tree" => "5e26401e579fd6bc004b29dc0bc9c9721162882b","Parents" => [{"Ix" => 0,"Differs" => 16,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}]} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"Type" => "Anchor","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","OrigParents" => [$VAR1->{"Parents"}[1]]} 1037s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 3 upp 5 proc 11 pm 0 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s ++ git rev-parse HEAD 1037s + expect=da329673e49708100554404dd7335b45e1c4c096 1037s + exec 1037s + local cid ctype info nparents 1037s + read cid ctype info 1037s + : ===== da329673e49708100554404dd7335b45e1c4c096 Pseudomerge Contributor=b67ec587c772c63f285bc0e4d9f8ca2b3050966c ===== 1037s + test da329673e49708100554404dd7335b45e1c4c096 = da329673e49708100554404dd7335b45e1c4c096 1037s + local cetype=Pseudomerge 1037s + '[' xPseudomerge = xPseudomerge ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P da329673e49708100554404dd7335b45e1c4c096 1037s + local 'parents=b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1037s + expect='b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1037s + enparents=1 1037s + : Pseudomerge/SAME 'b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + expect=b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + enparents=2 1037s + git diff --quiet b67ec587c772c63f285bc0e4d9f8ca2b3050966c..da329673e49708100554404dd7335b45e1c4c096 1037s + etypes=Upstream 1037s + : 'reject pointless pseudomerges' 1037s + local 'overwritten= e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1037s + overwritten=e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1037s + t-git-debrebase analyse e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1037s + local 'gdr=git debrebase' 1037s + : ' 1037s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1037s + git debrebase --dgit=dgit -D analyse e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1037s git-debrebase *** WALK e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1 *main::STDOUT 1037s git-debrebase get_differs 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e bb02192be62ae4b5929cd0232d0ed7a88979c9fe = 0x22 1037s git-debrebase classify e3e54e4a20e3acc1b539ee56d012aafbc64d2814 $t=bb02192be62ae4b5929cd0232d0ed7a88979c9fe @p 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e/0x22 1037s git-debrebase = Mixed {"Tree" => "bb02192be62ae4b5929cd0232d0ed7a88979c9fe","Type" => "Mixed","Parents" => [{"Differs" => 34,"Ix" => 0,"CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e"}],"CommitId" => "e3e54e4a20e3acc1b539ee56d012aafbc64d2814","Msg" => "MIXED add both() ()\n","Hdr" => "tree bb02192be62ae4b5929cd0232d0ed7a88979c9fe\nparent 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n"} 1037s git-debrebase get_differs f35b39dc0aeace0beefc19bde62c5ff9a35833b8 b85e19e65449ead2ae9a8a37a6ad52e00555defd = 0x2 1037s git-debrebase classify 83999e94bd8eab27ffb0945e8fb66b7e1bf3822e $t=b85e19e65449ead2ae9a8a37a6ad52e00555defd @p f35b39dc0aeace0beefc19bde62c5ff9a35833b8/0x2 1037s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8"}],"Type" => "Upstream","Tree" => "b85e19e65449ead2ae9a8a37a6ad52e00555defd","Hdr" => "tree b85e19e65449ead2ae9a8a37a6ad52e00555defd\nparent f35b39dc0aeace0beefc19bde62c5ff9a35833b8\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","Msg" => "UPSTREAM edit src.c ()\n","CommitId" => "83999e94bd8eab27ffb0945e8fb66b7e1bf3822e"} 1037s git-debrebase get_differs 2306c75cf843d0ffac699f610942f2a4632dad14 a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c = 0x20 1037s git-debrebase classify f35b39dc0aeace0beefc19bde62c5ff9a35833b8 $t=a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c @p 2306c75cf843d0ffac699f610942f2a4632dad14/0x20 1037s git-debrebase = Packaging {"Hdr" => "tree a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c\nparent 2306c75cf843d0ffac699f610942f2a4632dad14\nauthor dgit test git user 1530000002 +0100\ncommitter dgit test git user 1530000002 +0100\n","CommitId" => "f35b39dc0aeace0beefc19bde62c5ff9a35833b8","Msg" => "DEBIAN add zorkmid ()\n","Parents" => [{"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Ix" => 0,"Differs" => 32}],"Type" => "Packaging","Tree" => "a8f6ba67b4f6b7f8138e3f26c641f5a8970c8f6c"} 1037s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1037s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1037s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Msg" => "dch -r -D unstable\n","Type" => "Changelog","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1037s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1037s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1037s git-debrebase = Changelog {"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16}],"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1037s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1037s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1037s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1037s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1037s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1037s git-debrebase = Upstream {"Type" => "Upstream","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Ix" => 0,"Differs" => 2}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch"} 1037s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1037s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1037s git-debrebase = Upstream {"Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Parents" => [{"Differs" => 2,"Ix" => 0,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}],"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1037s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1037s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1037s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1037s git-debrebase = Anchor {"OrigParents" => [{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},$VAR1->{"OrigParents"}[0]],"Type" => "Anchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1037s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 4 upp 4 proc 9 pm -1 1037s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1037s ' 1037s + local ocid otype oinfo 1037s + read ocid otype oinfo 1037s + case "$otype" in 1037s ++ printf %s 'b67ec587c772c63f285bc0e4d9f8ca2b3050966c e3e54e4a20e3acc1b539ee56d012aafbc64d2814' 1037s ++ wc -w 1037s + local cnparents=2 1037s + test 2 = 2 1037s ++ for f in $parents 1037s ++ echo b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s ++ for f in $parents 1037s ++ echo e3e54e4a20e3acc1b539ee56d012aafbc64d2814 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=2 1037s + test 2 = 2 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== b67ec587c772c63f285bc0e4d9f8ca2b3050966c Upstream ===== 1037s + test b67ec587c772c63f285bc0e4d9f8ca2b3050966c = b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P b67ec587c772c63f285bc0e4d9f8ca2b3050966c 1037s + local parents=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + expect=e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + enparents=1 1037s + : Upstream/SAME e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 Upstream ===== 1037s + test e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 = e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P e9e58ddd4b3d85f755b9fcf529e148e755b0ed16 1037s + local parents=af8740843563dba5a36bacf39ce36ef6402dae09 1037s + expect=af8740843563dba5a36bacf39ce36ef6402dae09 1037s + enparents=1 1037s + : Upstream/SAME af8740843563dba5a36bacf39ce36ef6402dae09 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s af8740843563dba5a36bacf39ce36ef6402dae09 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo af8740843563dba5a36bacf39ce36ef6402dae09 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== af8740843563dba5a36bacf39ce36ef6402dae09 Upstream ===== 1037s + test af8740843563dba5a36bacf39ce36ef6402dae09 = af8740843563dba5a36bacf39ce36ef6402dae09 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P af8740843563dba5a36bacf39ce36ef6402dae09 1037s + local parents=f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + expect=f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + enparents=1 1037s + : Upstream/SAME f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s f36f58fc6066922b491b693a37bab95267f1c2a9 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo f36f58fc6066922b491b693a37bab95267f1c2a9 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== f36f58fc6066922b491b693a37bab95267f1c2a9 Upstream ===== 1037s + test f36f58fc6066922b491b693a37bab95267f1c2a9 = f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P f36f58fc6066922b491b693a37bab95267f1c2a9 1037s + local parents=c7452042cab61b744e90e83e0d467d79616da1bd 1037s + expect=c7452042cab61b744e90e83e0d467d79616da1bd 1037s + enparents=1 1037s + : Upstream/SAME c7452042cab61b744e90e83e0d467d79616da1bd 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s c7452042cab61b744e90e83e0d467d79616da1bd 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo c7452042cab61b744e90e83e0d467d79616da1bd 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== c7452042cab61b744e90e83e0d467d79616da1bd Upstream ===== 1037s + test c7452042cab61b744e90e83e0d467d79616da1bd = c7452042cab61b744e90e83e0d467d79616da1bd 1037s + local cetype=Upstream 1037s + '[' xUpstream = xUpstream ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P c7452042cab61b744e90e83e0d467d79616da1bd 1037s + local parents=c9602b74b39008e0495fe7585f20632dd9c45897 1037s + expect=c9602b74b39008e0495fe7585f20632dd9c45897 1037s + enparents=1 1037s + : Upstream/SAME c9602b74b39008e0495fe7585f20632dd9c45897 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s ++ printf %s c9602b74b39008e0495fe7585f20632dd9c45897 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo c9602b74b39008e0495fe7585f20632dd9c45897 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== c9602b74b39008e0495fe7585f20632dd9c45897 Packaging ===== 1037s + test c9602b74b39008e0495fe7585f20632dd9c45897 = c9602b74b39008e0495fe7585f20632dd9c45897 1037s + local cetype=Upstream 1037s + '[' xPackaging = xUpstream ']' 1037s ++ git log -n1 --pretty=format:%P c9602b74b39008e0495fe7585f20632dd9c45897 1037s + local parents=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + expect=0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + enparents=1 1037s + : Packaging/Upstream 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + '[' x '!=' x ']' 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :. ':!debian' 1037s + git diff --quiet 0c79446614e2126eb3d3afb1fd805a5f6a6b5050..c9602b74b39008e0495fe7585f20632dd9c45897 -- :debian/patches 1037s + etypes=Packaging 1037s ++ printf %s 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 Packaging ===== 1037s + test 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 = 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + local cetype=Packaging 1037s + '[' xPackaging = xPackaging ']' 1037s + cetype=SAME 1037s ++ git log -n1 --pretty=format:%P 0c79446614e2126eb3d3afb1fd805a5f6a6b5050 1037s + local parents=514fe3f551f3706f5408598630daac3e7bbc512d 1037s + expect=514fe3f551f3706f5408598630daac3e7bbc512d 1037s + enparents=1 1037s + : Packaging/SAME 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :. ':!debian' 1037s + git diff --quiet 514fe3f551f3706f5408598630daac3e7bbc512d..0c79446614e2126eb3d3afb1fd805a5f6a6b5050 -- :debian/patches 1037s + etypes=Packaging 1037s ++ printf %s 514fe3f551f3706f5408598630daac3e7bbc512d 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 514fe3f551f3706f5408598630daac3e7bbc512d 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 514fe3f551f3706f5408598630daac3e7bbc512d Changelog ===== 1037s + test 514fe3f551f3706f5408598630daac3e7bbc512d = 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + local cetype=Packaging 1037s + '[' xChangelog = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 514fe3f551f3706f5408598630daac3e7bbc512d 1037s + local parents=6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + expect=6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + enparents=1 1037s + : Changelog/Packaging 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 6c5ccc74d24af3d27b1d6012d1810502d4005572..514fe3f551f3706f5408598630daac3e7bbc512d -- :. ':!debian/changelog' 1037s + etypes=Packaging 1037s ++ printf %s 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 6c5ccc74d24af3d27b1d6012d1810502d4005572 Changelog ===== 1037s + test 6c5ccc74d24af3d27b1d6012d1810502d4005572 = 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + local cetype=Packaging 1037s + '[' xChangelog = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 6c5ccc74d24af3d27b1d6012d1810502d4005572 1037s + local parents=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + expect=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + enparents=1 1037s + : Changelog/Packaging 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + git diff --quiet 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1..6c5ccc74d24af3d27b1d6012d1810502d4005572 -- :. ':!debian/changelog' 1037s + etypes=Packaging 1037s ++ printf %s 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s ++ wc -w 1037s + local cnparents=1 1037s + test 1 = 1 1037s ++ for f in $parents 1037s ++ echo 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s ++ wc -w 1037s ++ t-sort -u 1037s ++ LC_COLLATE=C 1037s ++ sort -u 1037s + local cndparents=1 1037s + test 1 = 1 1037s + case "$parents" in 1037s + case "$ctype" in 1037s + read cid ctype info 1037s + : ===== 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 Anchor ===== 1037s + test 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 = 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + local cetype=Packaging 1037s + '[' xAnchor = xPackaging ']' 1037s ++ git log -n1 --pretty=format:%P 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1037s + local 'parents=1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + expect='1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + enparents=1 1037s + : Anchor/Packaging '1c51d54eed3579c743d8579332cddc0201ed10e7 dcacb606b0a29bcbc1331971222caf97f79a139c' 1037s + case "$ctype/$cetype" in 1037s + case "$ctype/$etypes" in 1037s + case "$cetype" in 1037s + case "$ctype" in 1037s + break 1037s + t-ref-head 1037s + local val 1037s ++ git rev-parse HEAD 1037s + val=da329673e49708100554404dd7335b45e1c4c096 1037s + t-ref-same-val HEAD da329673e49708100554404dd7335b45e1c4c096 1037s + local name=HEAD 1037s + local val=da329673e49708100554404dd7335b45e1c4c096 1037s + case "${t_ref_val-unset}" in 1037s + t_ref_val=da329673e49708100554404dd7335b45e1c4c096 1037s + t_ref_names+=("$name") 1037s + t-ok 1037s + : ======================================== 1037s + t-check-only-bpd 1037s + '[' .. = .. ']' 1037s + return 1037s + t-fscks 1037s + shopt -s nullglob 1037s + for d in $tmp/*/.git $tmp/git/*.git 1037s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1037s + t-git-fsck 1037s ++ git rev-parse --git-dir 1037s + local fsckerrs=.git/dgit-test-fsck.errs 1037s + set +e 1037s + LC_MESSAGES=C 1037s + git fsck --no-dangling --strict 1037s + tee .git/dgit-test-fsck.errs 1037s + ps='0 0' 1037s + set -e 1037s + local pats 1037s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 1037s + test '0 0' = '0 0' 1037s + pats+=(-e 'notice: HEAD points to an unborn branch') 1037s + pats+=(-e 'notice: No default references') 1037s + set +e 1037s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1037s + rc=1 1037s + set -e 1037s + case $rc in 1037s + t-save-artifacts 1037s + artifacts=/tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts 1037s + '[' x/tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts = x ']' 1037s + '[' xtmp = x ']' 1037s + GZIP=-1v 1037s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/gdr-viagit-artifacts/gdr-viagit.tar.gz '--exclude=*.tar' . 1037s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1037s 82.4% 1037s + echo ok. 1037s ok. 1037s + rc=0 1037s + set +x 1037s + set +e 1037s + pwd 1037s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1037s + '[' x '!=' x ']' 1037s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1037s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1037s + set -e 1037s + test 0 = 0 1038s autopkgtest [12:35:32]: test gdr-viagit: -----------------------] 1038s autopkgtest [12:35:32]: test gdr-viagit: - - - - - - - - - - results - - - - - - - - - - 1038s gdr-viagit PASS 1038s autopkgtest [12:35:32]: test i18n-messages: preparing testbed 1038s Reading package lists... 1038s Building dependency tree... 1038s Reading state information... 1039s Starting pkgProblemResolver with broken count: 0 1039s Starting 2 pkgProblemResolver with broken count: 0 1039s Done 1039s 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1039s autopkgtest [12:35:33]: test i18n-messages: [----------------------- 1039s ++ set -o pipefail 1039s ++ . tests/lib-core 1039s ++ . tests/lib-restricts 1039s ++ trap ' 1039s rc=$? 1039s set +x 1039s test $rc = 0 || echo " 1039s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1039s 1039s Most relevant logs are just before assignment rc=$rc 1039s Will now do cleanup etc. 1039s " 1039s set -x 1039s set +e 1039s pwd 1039s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1039s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1039s set -e 1039s test $rc = 0 || t-report-failure 1039s ' EXIT 1039s ++ t-filter-out-git-hyphen-dir 1039s ++ local pathent 1039s +++ type -p git-rev-parse 1039s +++ : 1039s ++ pathent= 1039s ++ case "$pathent" in 1039s ++ return 1039s ++ t-set-intree 1039s ++ '[' x = x ']' 1039s ++ return 1039s ++ : -D 1039s ++ export DGIT_TEST_DEBUG 1039s ++ : x 1039s ++ export DGIT_TEST_DEBPUSH_DEBUG 1039s ++ : 1039s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1039s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1039s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1039s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1039s ++ export LC_CTYPE=C.UTF-8 1039s ++ LC_CTYPE=C.UTF-8 1039s ++ unset CDPATH 1039s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1039s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1039s +++ pwd 1039s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ testname=i18n-messages 1039s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ bpd=.. 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1039s ++ '[' x '!=' x ']' 1039s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s +++ pwd 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ t-set-using-tmp 1039s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ export 'DEBFULLNAME=dgit test git user' 1039s ++ DEBFULLNAME='dgit test git user' 1039s ++ git config --global user.email dgit-test@debian.example.net 1039s ++ git config --global user.name 'dgit test git user' 1039s ++ git config --global protocol.ext.allow always 1039s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1039s ++ env -0 1039s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1039s ++ export DEBCHANGE_VENDOR=dpkg 1039s ++ DEBCHANGE_VENDOR=dpkg 1039s ++ unset VISUAL 1039s ++ unset GIT_EDITOR 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1039s ++ cat 1039s ++ schroot=build 1039s ++ : aq 1039s ++ : archive/test-dummy 1039s ++ : sid:unstable 1039s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1039s ++ git config --global dgit.default.old-dsc-distro test-dummy 1039s + t-dependencies NO-DGIT GDR 1039s + : 'Hopefully installed: NO-DGIT GDR' 1039s + t-restrict x-dgit-out-of-tree-only 1039s + local restriction=x-dgit-out-of-tree-only 1039s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s + t-restriction-x-dgit-out-of-tree-only 1039s + '[' x = x ']' 1039s + return 0 1039s + t-setup-import gdr-convert-gbp-noarchive 1039s + local setupname=gdr-convert-gbp-noarchive 1039s + local setupsrc 1039s + local lock 1039s + '[' x = x ']' 1039s + setupsrc=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s + lock=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock 1039s + local simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1039s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1039s + with-lock-ex -w /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.dummy.lock xargs -0 -a /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env bash -xec ' 1039s cd "$1"; shift 1039s setupname="$1"; shift 1039s simport="$1"; shift 1039s if [ -e "$simport" ]; then exit 0; fi 1039s env - "$@" \ 1039s "tests/setup/$setupname" 1039s ' x /tmp/autopkgtest.ztMUxl/build.mDJ/src gdr-convert-gbp-noarchive /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1039s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s + shift 1039s + setupname=gdr-convert-gbp-noarchive 1039s + shift 1039s + simport=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1039s + shift 1039s + '[' -e /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive ']' 1039s + env - SHELL=/bin/bash SUDO_GID=1000 AUTOPKGTEST_TESTBED_ARCH=amd64 no_proxy=127.0.0.1,127.0.1.1,login.ubuntu.com,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,keyserver.ubuntu.com,launchpadlibrarian.net,launchpadcontent.net,launchpad.net,10.24.0.0/24,keystone.ps5.canonical.com,objectstorage.prodstack5.canonical.com,radosgw.ps5.canonical.com DGIT_TEST_DEBPUSH_DEBUG=x 'GIT_COMMITTER_DATE=1530000000 +0100' AUTOPKGTEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'DEBFULLNAME=dgit test git user' 'SUDO_COMMAND=/var/tmp/autopkgtest-run-wrapper su -s /bin/bash ubuntu -c set -e; exec /tmp/autopkgtest.ztMUxl/wrapper.sh --artifacts=/tmp/autopkgtest.ztMUxl/i18n-messages-artifacts --chdir=/tmp/autopkgtest.ztMUxl/build.mDJ/src --env=AUTOPKGTEST_TESTBED_ARCH=amd64 --env=AUTOPKGTEST_TEST_ARCH=amd64 --env=DEB_BUILD_OPTIONS=parallel=2 --env=DEBIAN_FRONTEND=noninteractive --env=LANG=C.UTF-8 --unset-env=LANGUAGE --unset-env=LC_ADDRESS --unset-env=LC_ALL --unset-env=LC_COLLATE --unset-env=LC_CTYPE --unset-env=LC_IDENTIFICATION --unset-env=LC_MEASUREMENT --unset-env=LC_MESSAGES --unset-env=LC_MONETARY --unset-env=LC_NAME --unset-env=LC_NUMERIC --unset-env=LC_PAPER --unset-env=LC_TELEPHONE --unset-env=LC_TIME --script-pid-file=/tmp/autopkgtest_script_pid --source-profile --stderr=/tmp/autopkgtest.ztMUxl/i18n-messages-stderr --stdout=/tmp/autopkgtest.ztMUxl/i18n-messages-stdout --tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp --env=ADT_TEST_TRIGGERS=apt/2.4.14 --make-executable=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/i18n-messages -- /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tests/i18n-messages' GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent SUDO_USER=ubuntu FILTER_BRANCH_SQUELCH_WARNING=1 PWD=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ADT_TEST_TRIGGERS=apt/2.4.14 LOGNAME=ubuntu DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 'GIT_AUTHOR_DATE=1530000000 +0100' HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp LANG=C.UTF-8 ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp https_proxy=http://squid.internal:3128 AUTOPKGTEST_ARTIFACTS=/tmp/autopkgtest.ztMUxl/i18n-messages-artifacts DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests TERM=linux USER=ubuntu AUTOPKGTEST_TEST_ARCH=amd64 DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp DEB_BUILD_OPTIONS=parallel=2 SHLVL=2 http_proxy=http://squid.internal:3128 LC_CTYPE=C.UTF-8 ADT_ARTIFACTS=/tmp/autopkgtest.ztMUxl/i18n-messages-artifacts PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin SUDO_UID=1000 MAIL=/var/mail/ubuntu DGIT_TEST_DEBUG=-D DEBIAN_FRONTEND=noninteractive OLDPWD=/tmp/autopkgtest.ztMUxl/build.mDJ/src _=/usr/bin/env tests/setup/gdr-convert-gbp-noarchive 1039s ++ set -o pipefail 1039s ++ . tests/lib-core 1039s ++ . tests/lib-restricts 1039s ++ trap ' 1039s rc=$? 1039s set +x 1039s test $rc = 0 || echo " 1039s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1039s 1039s Most relevant logs are just before assignment rc=$rc 1039s Will now do cleanup etc. 1039s " 1039s set -x 1039s set +e 1039s pwd 1039s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1039s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1039s set -e 1039s test $rc = 0 || t-report-failure 1039s ' EXIT 1039s ++ t-filter-out-git-hyphen-dir 1039s ++ local pathent 1039s +++ type -p git-rev-parse 1039s +++ : 1039s ++ pathent= 1039s ++ case "$pathent" in 1039s ++ return 1039s ++ t-set-intree 1039s ++ '[' x = x ']' 1039s ++ return 1039s ++ : -D 1039s ++ export DGIT_TEST_DEBUG 1039s ++ : x 1039s ++ export DGIT_TEST_DEBPUSH_DEBUG 1039s ++ : 1039s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1039s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1039s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1039s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1039s ++ export LC_CTYPE=C.UTF-8 1039s ++ LC_CTYPE=C.UTF-8 1039s ++ unset CDPATH 1039s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1039s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1039s +++ pwd 1039s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ testname=gdr-convert-gbp-noarchive 1039s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ bpd=.. 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1039s ++ '[' x '!=' x ']' 1039s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s +++ pwd 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ t-set-using-tmp 1039s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ export 'DEBFULLNAME=dgit test git user' 1039s ++ DEBFULLNAME='dgit test git user' 1039s ++ git config --global user.email dgit-test@debian.example.net 1039s ++ git config --global user.name 'dgit test git user' 1039s ++ git config --global protocol.ext.allow always 1039s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1039s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1039s ++ export DEBCHANGE_VENDOR=dpkg 1039s ++ DEBCHANGE_VENDOR=dpkg 1039s ++ unset VISUAL 1039s ++ unset GIT_EDITOR 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1039s ++ cat 1039s ++ schroot=build 1039s ++ : aq 1039s ++ : archive/test-dummy 1039s ++ : sid:unstable 1039s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1039s ++ git config --global dgit.default.old-dsc-distro test-dummy 1039s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1039s ++ : -D 1039s ++ export GDR_TEST_DEBUG 1039s ++ t-tstunt debchange 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ local var=PATH 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ eval ' 1039s case "$PATH" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PATH="$tstunt" ;; 1039s *) PATH="$tstunt:$PATH" ;; 1039s esac 1039s export PATH 1039s ' 1039s +++ case "$PATH" in 1039s +++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ export PATH 1039s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ local var=PERLLIB 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ eval ' 1039s case "$PERLLIB" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PERLLIB="$tstunt" ;; 1039s *) PERLLIB="$tstunt:$PERLLIB" ;; 1039s esac 1039s export PERLLIB 1039s ' 1039s +++ case "$PERLLIB" in 1039s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s +++ export PERLLIB 1039s ++ local f 1039s ++ for f in "$@" 1039s ++ t-tstunt--save-real debchange 1039s ++ local f=debchange 1039s ++ case "$f" in 1039s ++ local rc 1039s ++ local real 1039s ++ set +e 1039s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ type -p debchange 1039s ++ real=/usr/bin/debchange 1039s ++ rc=0 1039s ++ set -e 1039s ++ case $rc in 1039s ++ local varname=debchange 1039s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1039s ++ eval ' 1039s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1039s export DGIT_TEST_REAL_DEBCHANGE 1039s ' 1039s +++ : /usr/bin/debchange 1039s +++ export DGIT_TEST_REAL_DEBCHANGE 1039s ++ f=./debchange 1039s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1039s + t-dependencies GDR 1039s + : 'Hopefully installed: GDR' 1039s + export ifarchive=: 1039s + ifarchive=: 1039s + t-chain-test gdr-convert-gbp 1039s + t-chain-test-somehow 1039s + export DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1039s + DGIT_TEST_TESTNAME=gdr-convert-gbp-noarchive 1039s + export DGIT_TEST_TMPBASE= 1039s + DGIT_TEST_TMPBASE= 1039s + export ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s + ADTTMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s + local ct=gdr-convert-gbp 1039s + local d=tests/setup 1039s + cd /tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s + exec tests/setup/gdr-convert-gbp 1039s ++ set -o pipefail 1039s ++ . tests/lib-core 1039s ++ . tests/lib-restricts 1039s ++ trap ' 1039s rc=$? 1039s set +x 1039s test $rc = 0 || echo " 1039s %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% 1039s 1039s Most relevant logs are just before assignment rc=$rc 1039s Will now do cleanup etc. 1039s " 1039s set -x 1039s set +e 1039s pwd 1039s [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ 1039s [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean 1039s set -e 1039s test $rc = 0 || t-report-failure 1039s ' EXIT 1039s ++ t-filter-out-git-hyphen-dir 1039s ++ local pathent 1039s +++ type -p git-rev-parse 1039s +++ : 1039s ++ pathent= 1039s ++ case "$pathent" in 1039s ++ return 1039s ++ t-set-intree 1039s ++ '[' x = x ']' 1039s ++ return 1039s ++ : -D 1039s ++ export DGIT_TEST_DEBUG 1039s ++ : x 1039s ++ export DGIT_TEST_DEBPUSH_DEBUG 1039s ++ : 1039s ++ export 'GIT_COMMITTER_DATE=1530000000 +0100' 1039s ++ GIT_COMMITTER_DATE='1530000000 +0100' 1039s ++ export 'GIT_AUTHOR_DATE=1530000000 +0100' 1039s ++ GIT_AUTHOR_DATE='1530000000 +0100' 1039s ++ export LC_CTYPE=C.UTF-8 1039s ++ LC_CTYPE=C.UTF-8 1039s ++ unset CDPATH 1039s ++ export FILTER_BRANCH_SQUELCH_WARNING=1 1039s ++ FILTER_BRANCH_SQUELCH_WARNING=1 1039s +++ pwd 1039s ++ root=/tmp/autopkgtest.ztMUxl/build.mDJ/src 1039s ++ troot=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ testname=gdr-convert-gbp-noarchive 1039s ++ export DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ DGIT_TEST_TROOT=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests 1039s ++ bpd=.. 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1039s ++ '[' x '!=' x ']' 1039s ++ cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s +++ pwd 1039s ++ tmp=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ t-set-using-tmp 1039s ++ export HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ HOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_DUMMY_DIR=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ DGIT_TEST_TMP=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1039s ++ export GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ GNUPGHOME=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/nonexistent 1039s ++ export 'DEBFULLNAME=dgit test git user' 1039s ++ DEBFULLNAME='dgit test git user' 1039s ++ git config --global user.email dgit-test@debian.example.net 1039s ++ git config --global user.name 'dgit test git user' 1039s ++ git config --global protocol.ext.allow always 1039s ++ test -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/.save-env 1039s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/ssh ssh 1039s ++ export DEBCHANGE_VENDOR=dpkg 1039s ++ DEBCHANGE_VENDOR=dpkg 1039s ++ unset VISUAL 1039s ++ unset GIT_EDITOR 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/incoming 1039s ++ cat 1039s ++ schroot=build 1039s ++ : aq 1039s ++ : archive/test-dummy 1039s ++ : sid:unstable 1039s ++ t-git-config dgit.default.old-dsc-distro test-dummy 1039s ++ git config --global dgit.default.old-dsc-distro test-dummy 1039s + . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1039s ++ : -D 1039s ++ export GDR_TEST_DEBUG 1039s ++ t-tstunt debchange 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ local var=PATH 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ eval ' 1039s case "$PATH" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PATH="$tstunt" ;; 1039s *) PATH="$tstunt:$PATH" ;; 1039s esac 1039s export PATH 1039s ' 1039s +++ case "$PATH" in 1039s +++ export PATH 1039s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ local var=PERLLIB 1039s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s ++ eval ' 1039s case "$PERLLIB" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PERLLIB="$tstunt" ;; 1039s *) PERLLIB="$tstunt:$PERLLIB" ;; 1039s esac 1039s export PERLLIB 1039s ' 1039s +++ case "$PERLLIB" in 1039s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s +++ export PERLLIB 1039s ++ local f 1039s ++ for f in "$@" 1039s ++ t-tstunt--save-real debchange 1039s ++ local f=debchange 1039s ++ case "$f" in 1039s ++ local rc 1039s ++ local real 1039s ++ set +e 1039s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s +++ type -p debchange 1039s ++ real=/usr/bin/debchange 1039s ++ rc=0 1039s ++ set -e 1039s ++ case $rc in 1039s ++ local varname=debchange 1039s ++ varname=DGIT_TEST_REAL_DEBCHANGE 1039s ++ eval ' 1039s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1039s export DGIT_TEST_REAL_DEBCHANGE 1039s ' 1039s +++ : /usr/bin/debchange 1039s +++ export DGIT_TEST_REAL_DEBCHANGE 1039s ++ f=./debchange 1039s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1039s + : t-setup-import gnupg 1039s + t-dependencies GDR 1039s + : 'Hopefully installed: GDR' 1039s + t-tstunt-parsechangelog 1039s + t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1039s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s + t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s + local var=PATH 1039s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s + eval ' 1039s case "$PATH" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PATH="$tstunt" ;; 1039s *) PATH="$tstunt:$PATH" ;; 1039s esac 1039s export PATH 1039s ' 1039s ++ case "$PATH" in 1039s ++ export PATH 1039s + t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s + local var=PERLLIB 1039s + local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1039s + eval ' 1039s case "$PERLLIB" in 1039s "$tstunt:"*) ;; 1039s *":$tstunt:"*) ;; 1039s "") PERLLIB="$tstunt" ;; 1039s *) PERLLIB="$tstunt:$PERLLIB" ;; 1039s esac 1039s export PERLLIB 1039s ' 1039s ++ case "$PERLLIB" in 1039s ++ export PERLLIB 1039s + local f 1039s + for f in "$@" 1039s + t-tstunt--save-real dpkg-parsechangelog 1039s + local f=dpkg-parsechangelog 1039s + case "$f" in 1039s + local rc 1039s + local real 1039s + set +e 1039s ++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1039s ++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s ++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s ++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1039s ++ type -p dpkg-parsechangelog 1039s + real=/usr/bin/dpkg-parsechangelog 1039s + rc=0 1039s + set -e 1039s + case $rc in 1039s + local varname=dpkg_parsechangelog 1039s + varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1039s + eval ' 1039s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1039s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1039s ' 1039s ++ : /usr/bin/dpkg-parsechangelog 1039s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1039s + f=./dpkg-parsechangelog 1039s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1039s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1039s + for f in "$@" 1040s + t-tstunt--save-real Dpkg/Changelog/Parse.pm 1040s + local f=Dpkg/Changelog/Parse.pm 1040s + case "$f" in 1040s + return 1040s + f=./Dpkg/Changelog/Parse.pm 1040s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1040s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1040s + ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1040s + t-gdr-gbp-import-core-with-queue 1040s + t-gdr-gbp-import-core 1040s + p=example 1040s + t-worktree 1.1 1040s + rm -rf example 1040s + t-untar /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1 1040s + local tarfile=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1040s + local edittree=/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1040s + test -d /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.edit 1040s + tar xf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/worktrees/example_1.1.tar 1040s + cd example 1040s + : 'fake up some kind of upstream' 1040s + git checkout -b upstream quilt-tip 1040s Switched to a new branch 'upstream' 1040s + rm -rf debian 1040s + mkdir debian 1040s + echo junk 1040s + git add debian 1040s + git commit -m 'an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1040s [upstream 98d1ef3] an upstream retcon (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1040s 6 files changed, 1 insertion(+), 36 deletions(-) 1040s delete mode 100644 debian/changelog 1040s delete mode 100644 debian/compat 1040s delete mode 100644 debian/control 1040s delete mode 100644 debian/example.install 1040s mode change 100755 => 100644 debian/rules 1040s delete mode 100644 debian/source/format 1040s + git tag v1.0 1040s + : 'fake up that our quilt-tip was descended from upstream' 1040s + git checkout quilt-tip 1040s Switched to branch 'quilt-tip' 1040s + git merge --no-edit -s ours upstream 1040s Merge made by the 'ours' strategy. 1040s + : 'fake up that our quilt-tip had the patch queue in it' 1040s + git checkout patch-queue/quilt-tip 1040s Switched to branch 'patch-queue/quilt-tip' 1040s + gbp pq export 1040s gbp:info: On 'patch-queue/quilt-tip', switching to 'quilt-tip' 1040s gbp:info: Generating patches from git (quilt-tip..patch-queue/quilt-tip) 1040s + git add debian/patches 1040s + git commit -m 'patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)' 1040s [quilt-tip 2d660f7] patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp) 1040s 4 files changed, 50 insertions(+) 1040s create mode 100644 debian/patches/0001-Add-a-new-upstream-file.patch 1040s create mode 100644 debian/patches/0002-Edit-the-.c-file.patch 1040s create mode 100644 debian/patches/series 1040s create mode 100644 debian/patches/subdir/addnewups 1040s + : 'make branch names more conventional' 1040s + git branch -D master 1040s Deleted branch master (was 17d67db). 1040s + git branch -m quilt-tip master 1040s + not-gdr-processable origin 1040s + git branch gdr-unprocessable/origin 1040s + t-git-debrebase analyse 1040s + local gdr=git-debrebase 1040s + : ' 1040s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1040s + git-debrebase --dgit=dgit -D analyse 1040s + grep 'Unknown Unprocessable' 1040s git-debrebase *** WALK 2d660f75d860eebc7c1d206b7b36383e1ee4add4 1 *main::STDOUT 1040s git-debrebase get_differs 1bc46c9d4678351c17d3f6376286edb58ddee61b bf7987f1ad573f033a09951c00ab7bdaa7c98445 = 0x4 1040s git-debrebase classify 2d660f75d860eebc7c1d206b7b36383e1ee4add4 $t=bf7987f1ad573f033a09951c00ab7bdaa7c98445 @p 1bc46c9d4678351c17d3f6376286edb58ddee61b/0x4 1040s git-debrebase = AddPatches {"Parents" => [{"CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Differs" => 4,"Ix" => 0}],"Hdr" => "tree bf7987f1ad573f033a09951c00ab7bdaa7c98445\nparent 1bc46c9d4678351c17d3f6376286edb58ddee61b\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Tree" => "bf7987f1ad573f033a09951c00ab7bdaa7c98445","Msg" => "patch queue update (/tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/setup/gdr-convert-gbp)\n","CommitId" => "2d660f75d860eebc7c1d206b7b36383e1ee4add4","Type" => "AddPatches"} 1040s git-debrebase get_differs 1986506b09aedf1864a4e3228284a58c3db6ac7a 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0 1040s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x30 1040s git-debrebase classify 1bc46c9d4678351c17d3f6376286edb58ddee61b $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p 1986506b09aedf1864a4e3228284a58c3db6ac7a/0 98d1ef33f97b1baf0e88f735213286f40a2d2980/0x30 1040s git-debrebase = Pseudomerge {"Type" => "Pseudomerge","Overwritten" => [{"CommitId" => "98d1ef33f97b1baf0e88f735213286f40a2d2980","Ix" => 1,"Differs" => 48}],"Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Msg" => "Merge branch 'upstream' into quilt-tip\n","CommitId" => "1bc46c9d4678351c17d3f6376286edb58ddee61b","Contributor" => {"Ix" => 0,"Differs" => 0,"CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a"},"Parents" => [$VAR1->{"Contributor"},$VAR1->{"Overwritten"}[0]],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent 1986506b09aedf1864a4e3228284a58c3db6ac7a\nparent 98d1ef33f97b1baf0e88f735213286f40a2d2980\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1040s git-debrebase get_differs ccfa28ce24478c3336e77e709106a16a158ac7eb 20c64ebe6600e246d9769e072e25be7fdf7db102 = 0x2 1040s git-debrebase classify 1986506b09aedf1864a4e3228284a58c3db6ac7a $t=20c64ebe6600e246d9769e072e25be7fdf7db102 @p ccfa28ce24478c3336e77e709106a16a158ac7eb/0x2 1040s git-debrebase = Upstream {"Type" => "Upstream","Msg" => "Add *.o to .gitignore\n","CommitId" => "1986506b09aedf1864a4e3228284a58c3db6ac7a","Tree" => "20c64ebe6600e246d9769e072e25be7fdf7db102","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb"}],"Hdr" => "tree 20c64ebe6600e246d9769e072e25be7fdf7db102\nparent ccfa28ce24478c3336e77e709106a16a158ac7eb\nauthor Ian Jackson 1449445781 +0000\ncommitter Ian Jackson 1449445781 +0000\n"} 1040s git-debrebase get_differs 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 c66f25b68ea8e44ff0cf5439719cc66f18baf18b = 0x32 1040s git-debrebase classify ccfa28ce24478c3336e77e709106a16a158ac7eb $t=c66f25b68ea8e44ff0cf5439719cc66f18baf18b @p 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9/0x32 1040s git-debrebase = Mixed {"Type" => "Mixed","Msg" => "Prep for quilt, now builds a quilt source package with suitable origs\n","CommitId" => "ccfa28ce24478c3336e77e709106a16a158ac7eb","Hdr" => "tree c66f25b68ea8e44ff0cf5439719cc66f18baf18b\nparent 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9\nauthor Ian Jackson 1449445459 +0000\ncommitter Ian Jackson 1449445459 +0000\n","Tree" => "c66f25b68ea8e44ff0cf5439719cc66f18baf18b","Parents" => [{"Ix" => 0,"Differs" => 50,"CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"}]} 1040s git-debrebase get_differs a26f8e83ba01707d830f942dc143a46140a87643 3e4c260f8c5eeef3add7252e4533ced877325165 = 0x20 1040s git-debrebase classify 17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9 $t=3e4c260f8c5eeef3add7252e4533ced877325165 @p a26f8e83ba01707d830f942dc143a46140a87643/0x20 1040s git-debrebase = Packaging {"Type" => "Packaging","Tree" => "3e4c260f8c5eeef3add7252e4533ced877325165","Hdr" => "tree 3e4c260f8c5eeef3add7252e4533ced877325165\nparent a26f8e83ba01707d830f942dc143a46140a87643\nauthor Ian Jackson 1437955081 +0100\ncommitter Ian Jackson 1437957862 +0100\n","Parents" => [{"Differs" => 32,"Ix" => 0,"CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643"}],"Msg" => "echo EXAMPLE RULES TARGET\n","CommitId" => "17d67dbd8f2a46fa824ed7aa5aecd7893ac1dcf9"} 1040s git-debrebase get_differs 4d8f0e7980e2454b960fbd44cf76d11996098caa 39d1cf1360982eb239348f27d1b066e662a66be9 = 0x20 1040s git-debrebase classify a26f8e83ba01707d830f942dc143a46140a87643 $t=39d1cf1360982eb239348f27d1b066e662a66be9 @p 4d8f0e7980e2454b960fbd44cf76d11996098caa/0x20 1040s git-debrebase = Packaging {"Type" => "Packaging","CommitId" => "a26f8e83ba01707d830f942dc143a46140a87643","Msg" => "WIP\n","Hdr" => "tree 39d1cf1360982eb239348f27d1b066e662a66be9\nparent 4d8f0e7980e2454b960fbd44cf76d11996098caa\nauthor Ian Jackson 1431549388 +0100\ncommitter Ian Jackson 1431549388 +0100\n","Tree" => "39d1cf1360982eb239348f27d1b066e662a66be9","Parents" => [{"Ix" => 0,"Differs" => 32,"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa"}]} 1040s git-debrebase get_differs 2767dfd053a8a3be1e7df2406b5a68ad913a661d 54a37c376e8e04f6cc462fdc15201d2e59892056 = 0x20 1040s git-debrebase classify 4d8f0e7980e2454b960fbd44cf76d11996098caa $t=54a37c376e8e04f6cc462fdc15201d2e59892056 @p 2767dfd053a8a3be1e7df2406b5a68ad913a661d/0x20 1040s git-debrebase = Packaging {"Tree" => "54a37c376e8e04f6cc462fdc15201d2e59892056","Hdr" => "tree 54a37c376e8e04f6cc462fdc15201d2e59892056\nparent 2767dfd053a8a3be1e7df2406b5a68ad913a661d\nauthor Ian Jackson 1431548962 +0100\ncommitter Ian Jackson 1431548962 +0100\n","Parents" => [{"CommitId" => "2767dfd053a8a3be1e7df2406b5a68ad913a661d","Differs" => 32,"Ix" => 0}],"CommitId" => "4d8f0e7980e2454b960fbd44cf76d11996098caa","Msg" => "WIP\n","Type" => "Packaging"} 1040s git-debrebase classify 2767dfd053a8a3be1e7df2406b5a68ad913a661d $t=e40b6a64ffb4849d3776d5669a5d46eae5e03112 @p 1040s git-debrebase ** Unknown 1040s git-debrebase *** WALK BOMB unrecognised 1040s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1040s ' 1040s 2767dfd053a8a3be1e7df2406b5a68ad913a661d Unknown Unprocessable (origin commit) 1040s + : 'fake up an upstream 2.0' 1040s + git branch make-upstream upstream 1040s + t-make-new-upstream-tarball 2.0 1040s + local uv=2.0 1040s + git checkout make-upstream 1040s Switched to branch 'make-upstream' 1040s + echo 'upstream 2.0' 1040s + git commit -a -m 'upstream 2.0 tarball' 1040s [make-upstream 19f63cb] upstream 2.0 tarball 1040s 1 file changed, 1 insertion(+) 1040s + t-make-orig example 2.0 make-upstream 1040s + local p=example 1040s + local v=2.0 1040s + local tag=make-upstream 1040s + ust=example_2.0.orig.tar.gz 1040s + GZIP=-1 1040s + git archive -o ../example_2.0.orig.tar.gz --prefix=example-2.0/ make-upstream 1040s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1040s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1040s + git branch -D quilt-tip-2 1040s Deleted branch quilt-tip-2 (was 99fcab4). 1040s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1040s + git branch -D gitish-only 1040s Deleted branch gitish-only (was 2b2ddc8). 1040s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1040s + git branch -D quilt-tip-1.1 1040s Deleted branch quilt-tip-1.1 (was 7fc34be). 1040s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1040s + git branch -D patch-queue/quilt-tip 1040s Deleted branch patch-queue/quilt-tip (was d843a68). 1040s + for b in quilt-tip-2 gitish-only quilt-tip-1.1 patch-queue/quilt-tip indep-arch 1040s + git branch -D indep-arch 1040s Deleted branch indep-arch (was e215729). 1040s + : 'see what gbp import-orig does' 1040s + git checkout master 1040s Switched to branch 'master' 1040s + gbp import-orig --upstream-version=2.0 ../example_2.0.orig.tar.gz 1040s gbp:info: Importing '../example_2.0.orig.tar.gz' to branch 'upstream'... 1040s gbp:info: Source package is example 1040s gbp:info: Upstream version is 2.0 1040s gbp:info: Replacing upstream source on 'master' 1040s gbp:info: Successfully imported version 2.0 of ../example_2.0.orig.tar.gz 1040s + not-gdr-processable merge 1040s + git branch gdr-unprocessable/merge 1040s + t-git-debrebase analyse 1040s + local gdr=git-debrebase 1040s + : ' 1040s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1040s + git-debrebase --dgit=dgit -D analyse 1040s + grep 'Unknown Unprocessable' 1040s git-debrebase *** WALK 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 1 *main::STDOUT 1040s git-debrebase get_differs 2d660f75d860eebc7c1d206b7b36383e1ee4add4 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x2 1040s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 = 0x34 1040s git-debrebase classify 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 $t=4f05061f4cb41a9bc1a263cc45d02f18f67cafb7 @p 2d660f75d860eebc7c1d206b7b36383e1ee4add4/0x2 dcacb606b0a29bcbc1331971222caf97f79a139c/0x34 1040s git-debrebase ** Unknown 1040s git-debrebase *** WALK BOMB unrecognised 1040s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1040s ' 1040s 74f81bd50f0e18d93ad941ee5fb5d4afc4e25503 Unknown Unprocessable (general two-parent merge) 1040s + t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1040s + t-debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1040s + DEBEMAIL=dgit-tests@example.org 1040s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-1 -m 'new upstream (did gbp import-orig)' 1040s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-1 -m new upstream (did gbp import-orig) 1040s + git commit -m 'dch -v 2.0-1 -m new upstream (did gbp import-orig)' debian/changelog 1040s [master 39a9ae4] dch -v 2.0-1 -m new upstream (did gbp import-orig) 1040s 1 file changed, 6 insertions(+) 1040s + t-dch-commit-r 1040s + t-dch-r-rune t-dch-commit 1040s + local cmd=t-dch-commit 1040s + shift 1040s + local suite=unstable 1040s + t-dch-commit -r -D unstable '' 1040s + t-debchange -r -D unstable '' 1040s + DEBEMAIL=dgit-tests@example.org 1040s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1040s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1040s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1040s libdistro-info-perl is not installed, Debian release names are not known. 1040s libdistro-info-perl is not installed, Ubuntu release names are not known. 1040s + git commit -m 'dch -r -D unstable ' debian/changelog 1040s [master c8629cf] dch -r -D unstable 1040s 1 file changed, 3 insertions(+), 2 deletions(-) 1040s + echo garbage 1040s + git add debian/patches/garbage 1040s + git commit -m 'add garbage' debian/patches/garbage 1040s [master 07528ed] add garbage 1040s 1 file changed, 1 insertion(+) 1040s create mode 100644 debian/patches/garbage 1040s + : t-archive-none example 1040s + : t-git-none 1040s + : t-dgit -wgf --gbp push-source --new 1040s + t-salsa-add-remote 1040s + local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1040s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1040s + set -e 1040s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1040s + git init --bare 1040s hint: Using 'master' as the name for the initial branch. This default branch name 1040s hint: is subject to change. To configure the initial branch name to use in all 1040s hint: of your new repositories, which will suppress this warning, call: 1040s hint: 1040s hint: git config --global init.defaultBranch 1040s hint: 1040s hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and 1040s hint: 'development'. The just-created branch can be renamed via this command: 1040s hint: 1040s hint: git branch -m 1040s Initialized empty Git repository in /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example/ 1040s + git remote add origin /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1040s + git push --set-upstream origin master 1040s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1040s * [new branch] master -> master 1040s Branch 'master' set up to track remote branch 'master' from 'origin'. 1040s + t-expect-fail 'E:identical in upstream files' t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1040s + local 'mpat=E:identical in upstream files' 1040s + shift 1040s + set +o pipefail 1040s + LC_MESSAGES=C 1040s + LANGUAGE=C 1040s + t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ 1040s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1040s + local gdr=git-debrebase 1040s + : ' 1040s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1040s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp upstream/2.0~ 1040s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1040s git-debrebase get_differs 98d1ef33f97b1baf0e88f735213286f40a2d2980 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x36 1040s docs/README | 1 + 1040s 1 file changed, 1 insertion(+) 1040s 1040s git-debrebase: error: upstream (upstream/2.0~) and HEAD are not 1040s git-debrebase: identical in upstream files. See diffstat above, or run 1040s git-debrebase: git diff 98d1ef33f97b1baf0e88f735213286f40a2d2980 HEAD -- :!/debian :/ 1040s + local 'ps=255 0' 1040s + set -o pipefail 1040s + case $ps in 1040s + t-grep-mpat 'E:identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1040s + local 'mpat=E:identical in upstream files' 1040s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1040s + local grepper=fgrep 1040s + case "$mpat" in 1040s + case "$mpat" in 1040s + grepper=egrep 1040s + mpat='identical in upstream files' 1040s + egrep -e 'identical in upstream files' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1040s git-debrebase: identical in upstream files. See diffstat above, or run 1040s + t-expect-fail 'E:Unused patch file garbage will be discarded' t-git-debrebase -fupstream-has-debian convert-from-gbp 1040s + local 'mpat=E:Unused patch file garbage will be discarded' 1040s + shift 1040s + set +o pipefail 1040s + LC_MESSAGES=C 1040s + LANGUAGE=C 1040s + t-git-debrebase -fupstream-has-debian convert-from-gbp 1040s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1040s + local gdr=git-debrebase 1040s + : ' 1040s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1040s + git-debrebase --dgit=dgit -D -fupstream-has-debian convert-from-gbp 1040s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1040s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1040s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1040s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1041s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1041s $VAR2 = bless( do{\(my $o = { 1041s 'is_pgp_signed' => 0, 1041s 'fields' => { 1041s 'Source' => 'example', 1041s 'Version' => '2.0-1', 1041s 'Distribution' => 'unstable', 1041s 'Urgency' => 'medium', 1041s 'Maintainer' => 'dgit test git user ', 1041s 'Timestamp' => '1530000000', 1041s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1041s 'Changes' => ' 1041s example (2.0-1) unstable; urgency=medium 1041s 1041s [ Ian Jackson ] 1041s * new upstream (did gbp import-orig)' 1041s }, 1041s 'drop_empty' => 0, 1041s 'allow_pgp' => 1, 1041s 'out_order' => [], 1041s 'allow_duplicate' => 0, 1041s 'name' => 'debian/changelog, entry no.1', 1041s 'in_order' => [ 1041s 'Source', 1041s 'Version', 1041s 'Distribution', 1041s 'Urgency', 1041s 'Maintainer', 1041s 'Timestamp', 1041s 'Date', 1041s 'Changes' 1041s ], 1041s 'keep_duplicate' => 0 1041s })}, 'Dpkg::Control::Hash' ); 1041s last finished-looking changelog entry: (2.0-1) unstable 1041s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1041s Failed to stitch in dgit view (see messages above). 1041s dgit --overwrite will be needed on the first dgit push after conversion. 1041s git-debrebase: snags: 1 overriden by individual -f options 1041s 1041s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1041s + local 'ps=255 0' 1041s + set -o pipefail 1041s + case $ps in 1041s + t-grep-mpat 'E:Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1041s + local 'mpat=E:Unused patch file garbage will be discarded' 1041s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1041s + local grepper=fgrep 1041s + case "$mpat" in 1041s + case "$mpat" in 1041s + grepper=egrep 1041s + mpat='Unused patch file garbage will be discarded' 1041s + egrep -e 'Unused patch file garbage will be discarded' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1041s git-debrebase: snag detected (-funused-patches): Unused patch file garbage will be discarded 1041s + t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp 1041s + local gdr=git-debrebase 1041s + : ' 1041s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1041s + git-debrebase --dgit=dgit -D -fupstream-has-debian -funused-patches convert-from-gbp 1041s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1041s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 07528ed443e7bf250b829b6c1d391c42507ce2b1 = 0x34 1041s git-debrebase: snag ignored (-fupstream-has-debian): upstream (dcacb606b0a29bcbc1331971222caf97f79a139c) contains debian/ directory 1041s git-debrebase: snag ignored (-funused-patches): Unused patch file garbage will be discarded 1041s git-debrebase CHANGELOG $VAR1 = 'debian/changelog, entry no.1'; 1041s $VAR2 = bless( do{\(my $o = { 1041s 'fields' => { 1041s 'Source' => 'example', 1041s 'Version' => '2.0-1', 1041s 'Distribution' => 'unstable', 1041s 'Urgency' => 'medium', 1041s 'Maintainer' => 'dgit test git user ', 1041s 'Timestamp' => '1530000000', 1041s 'Date' => 'Tue, 26 Jun 2018 08:00:00 +0000', 1041s 'Changes' => ' 1041s example (2.0-1) unstable; urgency=medium 1041s 1041s [ Ian Jackson ] 1041s * new upstream (did gbp import-orig)' 1041s }, 1041s 'drop_empty' => 0, 1041s 'out_order' => [], 1041s 'keep_duplicate' => 0, 1041s 'in_order' => [ 1041s 'Source', 1041s 'Version', 1041s 'Distribution', 1041s 'Urgency', 1041s 'Maintainer', 1041s 'Timestamp', 1041s 'Date', 1041s 'Changes' 1041s ], 1041s 'allow_duplicate' => 0, 1041s 'is_pgp_signed' => 0, 1041s 'allow_pgp' => 1, 1041s 'name' => 'debian/changelog, entry no.1' 1041s })}, 'Dpkg::Control::Hash' ); 1041s last finished-looking changelog entry: (2.0-1) unstable 1041s Cannot confirm dgit view: could not find suitable maintainer view tag */2.0-1 1041s Failed to stitch in dgit view (see messages above). 1041s dgit --overwrite will be needed on the first dgit push after conversion. 1041s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1041s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1041s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1041s gbp:info: Trying to apply patches at '07528ed443e7bf250b829b6c1d391c42507ce2b1' 1041s gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' 1041s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1041s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1041s git-debrebase ffq check_specs * 1041s git-debrebase ffq merge master 1041s git-debrebase ffq check_remote origin remote fetch/merge branch 1041s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1041s OK, you are ahead of refs/remotes/origin/master 1041s git-debrebase ffq check_remote undef remote push branch 1041s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1041s git-debrebase: snags: 2 overriden by individual -f options 1041s git-debrebase >= update refs/debrebase-last/heads/master f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 0000000000000000000000000000000000000000 1041s git-debrebase >= update HEAD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 07528ed443e7bf250b829b6c1d391c42507ce2b1 1041s git-debrebase >$ 1041s HEAD is now at f5ce088 Add another new upstream file 1041s git-debrebase: converted from patched-unapplied (gbp) branch format, OK 1041s + : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1041s ' 1041s + git branch converted-from-gbp 1041s + v=2.0-2 1041s + t-dch-commit -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1041s + t-debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1041s + DEBEMAIL=dgit-tests@example.org 1041s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -v 2.0-2 -m 'switch to git-debrebase, no other changes' 1041s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -v 2.0-2 -m switch to git-debrebase, no other changes 1041s + git commit -m 'dch -v 2.0-2 -m switch to git-debrebase, no other changes' debian/changelog 1041s [master f4c946a] dch -v 2.0-2 -m switch to git-debrebase, no other changes 1041s 1 file changed, 6 insertions(+) 1041s + t-dch-commit-r 1041s + t-dch-r-rune t-dch-commit 1041s + local cmd=t-dch-commit 1041s + shift 1041s + local suite=unstable 1041s + t-dch-commit -r -D unstable '' 1041s + t-debchange -r -D unstable '' 1041s + DEBEMAIL=dgit-tests@example.org 1041s + /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/debchange -r -D unstable '' 1041s + exec env TZ=UTC faketime -f 2018-06-26 08:00:00 env -u TZ /usr/bin/debchange -r -D unstable 1041s debchange warning: Unable to determine if unstable is a valid Ubuntu release. 1041s libdistro-info-perl is not installed, Debian release names are not known. 1041s libdistro-info-perl is not installed, Ubuntu release names are not known. 1041s + git commit -m 'dch -r -D unstable ' debian/changelog 1041s [master 2306c75] dch -r -D unstable 1041s 1 file changed, 1 insertion(+), 1 deletion(-) 1041s + : t-dgit -wgf push-source --new 1041s + git push 1041s To /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/salsa/example 1041s 07528ed..2306c75 master -> master 1041s + cd .. 1041s + : t-archive-process-incoming sid 1041s ++ echo example example_2.0.orig.tar.gz 1041s ++ : echo git mirror aq 1041s + t-setup-done '' 'example example_2.0.orig.tar.gz salsa ' ' 1041s . $troot/lib-gdr 1041s t-tstunt-parsechangelog 1041s p=example 1041s t-git-next-date 1041s ' 1041s + local savevars= 1041s + local 'savedirs=example example_2.0.orig.tar.gz salsa ' 1041s + local 'importeval= 1041s . $troot/lib-gdr 1041s t-tstunt-parsechangelog 1041s p=example 1041s t-git-next-date 1041s ' 1041s + local import=IMPORT.gdr-convert-gbp-noarchive 1041s + exec 1041s + local vn 1041s + perl -I/tmp/autopkgtest.ztMUxl/build.mDJ/src -MDebian::Dgit -we ' 1041s foreach my $vn (grep m/^DGIT_TEST_REAL_/, keys %ENV) { 1041s print STDERR "saving-exporting $vn\n"; 1041s printf "export %s=%s\n", $vn, shellquote $ENV{$vn} 1041s or die $!; 1041s } 1041s ' 1041s saving-exporting DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1041s saving-exporting DGIT_TEST_REAL_DEBCHANGE 1041s + set -e 1041s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1041s + tar cf IMPORT.gdr-convert-gbp-noarchive.tar example example_2.0.orig.tar.gz salsa 1041s + printf '\n%s\n' ' 1041s . $troot/lib-gdr 1041s t-tstunt-parsechangelog 1041s p=example 1041s t-git-next-date 1041s ' 1041s + mv -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive.new /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1041s + rc=0 1041s + set +x 1041s + set +e 1041s + pwd 1041s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp 1041s + '[' x '!=' x ']' 1041s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1041s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1041s + set -e 1041s + test 0 = 0 1041s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp '!=' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp ']' 1041s + mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1041s + . /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/IMPORT.gdr-convert-gbp-noarchive 1041s ++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1041s ++ DGIT_TEST_REAL_DPKG_PARSECHANGELOG=/usr/bin/dpkg-parsechangelog 1041s ++ export DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1041s ++ DGIT_TEST_REAL_DEBCHANGE=/usr/bin/debchange 1041s ++ . /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/lib-gdr 1041s +++ : -D 1041s +++ export GDR_TEST_DEBUG 1041s +++ t-tstunt debchange 1041s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ local var=PATH 1041s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ eval ' 1041s case "$PATH" in 1041s "$tstunt:"*) ;; 1041s *":$tstunt:"*) ;; 1041s "") PATH="$tstunt" ;; 1041s *) PATH="$tstunt:$PATH" ;; 1041s esac 1041s export PATH 1041s ' 1041s ++++ case "$PATH" in 1041s ++++ PATH=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s ++++ export PATH 1041s +++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ local var=PERLLIB 1041s +++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ eval ' 1041s case "$PERLLIB" in 1041s "$tstunt:"*) ;; 1041s *":$tstunt:"*) ;; 1041s "") PERLLIB="$tstunt" ;; 1041s *) PERLLIB="$tstunt:$PERLLIB" ;; 1041s esac 1041s export PERLLIB 1041s ' 1041s ++++ case "$PERLLIB" in 1041s ++++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++++ export PERLLIB 1041s +++ local f 1041s +++ for f in "$@" 1041s +++ t-tstunt--save-real debchange 1041s +++ local f=debchange 1041s +++ case "$f" in 1041s +++ local rc 1041s +++ local real 1041s +++ set +e 1041s ++++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1041s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1041s ++++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s ++++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s ++++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s ++++ type -p debchange 1041s +++ real=/usr/bin/debchange 1041s +++ rc=0 1041s +++ set -e 1041s +++ case $rc in 1041s +++ local varname=debchange 1041s +++ varname=DGIT_TEST_REAL_DEBCHANGE 1041s +++ eval ' 1041s : ${DGIT_TEST_REAL_DEBCHANGE:=$real} 1041s export DGIT_TEST_REAL_DEBCHANGE 1041s ' 1041s ++++ : /usr/bin/debchange 1041s ++++ export DGIT_TEST_REAL_DEBCHANGE 1041s +++ f=./debchange 1041s +++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1041s +++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1041s +++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./debchange /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1041s ++ t-tstunt-parsechangelog 1041s ++ t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm 1041s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++ t-stunt-envvar PATH /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++ local var=PATH 1041s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++ eval ' 1041s case "$PATH" in 1041s "$tstunt:"*) ;; 1041s *":$tstunt:"*) ;; 1041s "") PATH="$tstunt" ;; 1041s *) PATH="$tstunt:$PATH" ;; 1041s esac 1041s export PATH 1041s ' 1041s +++ case "$PATH" in 1041s +++ export PATH 1041s ++ t-stunt-envvar PERLLIB /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++ local var=PERLLIB 1041s ++ local tstunt=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s ++ eval ' 1041s case "$PERLLIB" in 1041s "$tstunt:"*) ;; 1041s *":$tstunt:"*) ;; 1041s "") PERLLIB="$tstunt" ;; 1041s *) PERLLIB="$tstunt:$PERLLIB" ;; 1041s esac 1041s export PERLLIB 1041s ' 1041s +++ case "$PERLLIB" in 1041s +++ PERLLIB=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt 1041s +++ export PERLLIB 1041s ++ local f 1041s ++ for f in "$@" 1041s ++ t-tstunt--save-real dpkg-parsechangelog 1041s ++ local f=dpkg-parsechangelog 1041s ++ case "$f" in 1041s ++ local rc 1041s ++ local real 1041s ++ set +e 1041s +++ p=:/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1041s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin: 1041s +++ p=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s +++ p=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s +++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin 1041s +++ type -p dpkg-parsechangelog 1041s ++ real=/usr/bin/dpkg-parsechangelog 1041s ++ rc=0 1041s ++ set -e 1041s ++ case $rc in 1041s ++ local varname=dpkg_parsechangelog 1041s ++ varname=DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1041s ++ eval ' 1041s : ${DGIT_TEST_REAL_DPKG_PARSECHANGELOG:=$real} 1041s export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1041s ' 1041s +++ : /usr/bin/dpkg-parsechangelog 1041s +++ export DGIT_TEST_REAL_DPKG_PARSECHANGELOG 1041s ++ f=./dpkg-parsechangelog 1041s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1041s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/. 1041s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./dpkg-parsechangelog /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./. 1041s ++ for f in "$@" 1041s ++ t-tstunt--save-real Dpkg/Changelog/Parse.pm 1041s ++ local f=Dpkg/Changelog/Parse.pm 1041s ++ case "$f" in 1041s ++ return 1041s ++ f=./Dpkg/Changelog/Parse.pm 1041s ++ local d=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1041s ++ mkdir -p /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog 1041s ++ ln -sf /tmp/autopkgtest.ztMUxl/build.mDJ/src/tests/tstunt/./Dpkg/Changelog/Parse.pm /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/tstunt/./Dpkg/Changelog/. 1041s ++ p=example 1041s ++ t-git-next-date 1041s ++ GIT_COMMITTER_DATE='1530000001 +0100' 1041s ++ GIT_AUTHOR_DATE='1530000001 +0100' 1041s + cd example 1041s + t-gdr-prep-new-upstream 2.1 1041s + uv=2.1 1041s + t-git-next-date 1041s + GIT_COMMITTER_DATE='1530000002 +0100' 1041s + GIT_AUTHOR_DATE='1530000002 +0100' 1041s + git checkout make-upstream 1041s Switched to branch 'make-upstream' 1041s + git reset --hard upstream 1041s HEAD is now at dcacb60 New upstream version 2.0 1041s + t-make-new-upstream-tarball 2.1 1041s + local uv=2.1 1041s + git checkout make-upstream 1041s Already on 'make-upstream' 1041s + echo 'upstream 2.1' 1041s + git commit -a -m 'upstream 2.1 tarball' 1041s [make-upstream 9638c21] upstream 2.1 tarball 1041s 1 file changed, 1 insertion(+) 1041s + t-make-orig example 2.1 make-upstream 1041s + local p=example 1041s + local v=2.1 1041s + local tag=make-upstream 1041s + ust=example_2.1.orig.tar.gz 1041s + GZIP=-1 1041s + git archive -o ../example_2.1.orig.tar.gz --prefix=example-2.1/ make-upstream 1041s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1041s + git push . make-upstream:upstream 1041s To . 1041s dcacb60..9638c21 make-upstream -> upstream 1041s + git checkout master 1041s Switched to branch 'master' 1041s Your branch is up to date with 'origin/master'. 1041s + t-git-next-date 1041s + GIT_COMMITTER_DATE='1530000003 +0100' 1041s + GIT_AUTHOR_DATE='1530000003 +0100' 1041s + git tag v2.1 upstream 1041s + git branch startpoint 1041s + v=2.1-1 1041s + git checkout master 1041s Already on 'master' 1041s Your branch is up to date with 'origin/master'. 1041s ++ t-git-debrebase anchor 1041s ++ local gdr=git-debrebase 1041s ++ : ' 1041s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1041s ++ git-debrebase --dgit=dgit -D anchor 1041s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1041s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1041s git-debrebase = Changelog {"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Changelog","Msg" => "dch -r -D unstable\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9"}],"CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d"} 1041s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1041s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1041s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Type" => "Changelog","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5"}]} 1041s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1041s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1041s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Parents" => [{"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n"} 1041s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1041s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1041s git-debrebase = Upstream {"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Parents" => [{"Ix" => 0,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2}],"Type" => "Upstream","Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1041s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1041s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1041s git-debrebase = Upstream {"Parents" => [{"Differs" => 2,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0}],"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Type" => "Upstream","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n"} 1041s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1041s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1041s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1041s git-debrebase = Anchor {"Type" => "Anchor","OrigParents" => [{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},$VAR1->{"OrigParents"}[0]],"Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"} 1041s ++ : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} 1041s ' 1041s + anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1041s + t-expect-fail 'F:old anchor is recognised' t-git-debrebase --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1041s + local 'mpat=F:old anchor is recognised' 1041s + shift 1041s + set +o pipefail 1041s + LC_MESSAGES=C 1041s + LANGUAGE=C 1041s + t-git-debrebase --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1041s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1041s + local gdr=git-debrebase 1041s + : ' 1041s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1041s + git-debrebase --dgit=dgit -D --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1041s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1041s git-debrebase ffq check_specs * 1041s git-debrebase ffq merge master 1041s git-debrebase ffq check_remote origin remote fetch/merge branch 1041s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1041s OK, you are ahead of refs/remotes/origin/master 1041s git-debrebase ffq check_remote undef remote push branch 1041s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1041s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 0 - 1041s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1041s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1041s git-debrebase = Changelog {"Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Ix" => 0}],"Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Msg" => "dch -r -D unstable\n"} 1041s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1041s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1041s git-debrebase = Changelog {"Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n","Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Type" => "Changelog","Parents" => [{"Differs" => 16,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Ix" => 0}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db"} 1041s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1041s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1041s git-debrebase = Upstream {"Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Ix" => 0,"Differs" => 2}],"Type" => "Upstream"} 1042s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1042s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1042s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","Type" => "Upstream","Parents" => [{"Differs" => 2,"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c"} 1042s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1042s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1042s git-debrebase = Upstream {"Parents" => [{"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Ix" => 0,"Differs" => 2}],"Type" => "Upstream","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4"} 1042s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1042s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1042s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1042s git-debrebase = TreatAsAnchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Parents" => [{"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Ix" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "TreatAsAnchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1042s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 6 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1042s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1042s git-debrebase WALK REWRITING NOW cl=HASH(0x563b55b1b570) procd=HASH(0x563b55b73428) 1042s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1042s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1042s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1042s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1042s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s git-debrebase get_differs c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 = 0 1042s git-debrebase *** WALK RETURN c4dedfc862799c2b23916ff3522d513ee1051f1a 514fe3f551f3706f5408598630daac3e7bbc512d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1042s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1042s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1042s git-debrebase = Changelog {"Msg" => "dch -r -D unstable\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","Parents" => [{"Differs" => 16,"Ix" => 0,"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572"}],"Type" => "Changelog","Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7"} 1042s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1042s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1042s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1042s git-debrebase = TreatAsAnchor {"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","Parents" => [{"Ix" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7","Differs" => 0},{"Differs" => 48,"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c"}],"Type" => "TreatAsAnchor","Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7"} 1042s git-debrebase: snag detected (-fanchor-treated): old anchor is recognised due to --anchor, cannot check upstream 1042s git-debrebase %pieces = {"" => {"Desc" => "upstream (main piece","OldIx" => 0,"New" => "9638c2110033b719cc742997b9527505ffdc1a65","Name" => "","NewIx" => 0}} 1042s git-debrebase @newpieces = [{"Desc" => "upstream (main piece","OldIx" => 0,"New" => "9638c2110033b719cc742997b9527505ffdc1a65","Name" => "","NewIx" => 0}] 1042s 1042s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1042s + local 'ps=255 0' 1042s + set -o pipefail 1042s + case $ps in 1042s + t-grep-mpat 'F:old anchor is recognised' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s + local 'mpat=F:old anchor is recognised' 1042s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s + local grepper=fgrep 1042s + case "$mpat" in 1042s + case "$mpat" in 1042s + grepper=fgrep 1042s + mpat='old anchor is recognised' 1042s + fgrep -e 'old anchor is recognised' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s git-debrebase: snag detected (-fanchor-treated): old anchor is recognised due to --anchor, cannot check upstream 1042s + expect_fail_lcmessages=en_US.UTF-8 1042s + t-expect-fail 'F:old anchor is recognized' t-git-debrebase --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1042s + local 'mpat=F:old anchor is recognized' 1042s + shift 1042s + set +o pipefail 1042s + tee /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s + LC_MESSAGES=en_US.UTF-8 1042s + LANGUAGE=en_US.UTF-8 1042s + t-git-debrebase --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1042s + local gdr=git-debrebase 1042s + : ' 1042s {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{' 1042s + git-debrebase --dgit=dgit -D --anchor=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 new-upstream 2.1 1042s git-debrebase ffq_prev_branchinfo branch current refs/heads/master 1042s git-debrebase ffq check_specs * 1042s git-debrebase ffq merge master 1042s git-debrebase ffq check_remote origin remote fetch/merge branch 1042s git-debrebase ffq might check refs/remotes/origin/master (remote fetch/merge branch) 1042s OK, you are ahead of refs/remotes/origin/master 1042s git-debrebase ffq check_remote undef remote push branch 1042s git-debrebase ffq might check refs/remotes/dgit/dgit/sid (remote dgit branch for sid) 1042s git-debrebase *** WALK 2306c75cf843d0ffac699f610942f2a4632dad14 0 - 1042s git-debrebase get_differs f4c946ae0300e22203248ca380c5e80b2f6cfbf9 e8c5f27eb7c84fe5ed67a01de4600b576da20e9d = 0x10 1042s git-debrebase classify 2306c75cf843d0ffac699f610942f2a4632dad14 $t=e8c5f27eb7c84fe5ed67a01de4600b576da20e9d @p f4c946ae0300e22203248ca380c5e80b2f6cfbf9/0x10 1042s git-debrebase = Changelog {"Type" => "Changelog","Hdr" => "tree e8c5f27eb7c84fe5ed67a01de4600b576da20e9d\nparent f4c946ae0300e22203248ca380c5e80b2f6cfbf9\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "2306c75cf843d0ffac699f610942f2a4632dad14","Msg" => "dch -r -D unstable\n","Tree" => "e8c5f27eb7c84fe5ed67a01de4600b576da20e9d","Parents" => [{"Ix" => 0,"CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Differs" => 16}]} 1042s git-debrebase get_differs f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db = 0x10 1042s git-debrebase classify f4c946ae0300e22203248ca380c5e80b2f6cfbf9 $t=ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db @p f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5/0x10 1042s git-debrebase = Changelog {"Hdr" => "tree ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db\nparent f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f4c946ae0300e22203248ca380c5e80b2f6cfbf9","Type" => "Changelog","Parents" => [{"Ix" => 0,"CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Differs" => 16}],"Tree" => "ad2a4ea2255fc4a0bb0f3dba982c4baf5e6164db","Msg" => "dch -v 2.0-2 -m switch to git-debrebase, no other changes\n"} 1042s git-debrebase get_differs 4324f7235dbc782c09a14c9186517708404a348d 3f6e3491a790a55e7410c108f39ede7bf6dde3f7 = 0x2 1042s git-debrebase classify f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 $t=3f6e3491a790a55e7410c108f39ede7bf6dde3f7 @p 4324f7235dbc782c09a14c9186517708404a348d/0x2 1042s git-debrebase = Upstream {"Tree" => "3f6e3491a790a55e7410c108f39ede7bf6dde3f7","Parents" => [{"Differs" => 2,"CommitId" => "4324f7235dbc782c09a14c9186517708404a348d","Ix" => 0}],"Msg" => "Add another new upstream file\n\n\nGbp-Pq: Topic subdir\nGbp-Pq: Name addnewups","Hdr" => "tree 3f6e3491a790a55e7410c108f39ede7bf6dde3f7\nparent 4324f7235dbc782c09a14c9186517708404a348d\nauthor Ian Jackson 1465074572 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5","Type" => "Upstream"} 1042s git-debrebase get_differs 34deccec5312d146eb805e928eb278716567c3a4 dd6a134cae97ce5f54cea9c4d96698529fdd498c = 0x2 1042s git-debrebase classify 4324f7235dbc782c09a14c9186517708404a348d $t=dd6a134cae97ce5f54cea9c4d96698529fdd498c @p 34deccec5312d146eb805e928eb278716567c3a4/0x2 1042s git-debrebase = Upstream {"Msg" => "Edit the .c file\n\n\nGbp-Pq: Name 0002-Edit-the-.c-file.patch","Parents" => [{"CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Differs" => 2,"Ix" => 0}],"Tree" => "dd6a134cae97ce5f54cea9c4d96698529fdd498c","Type" => "Upstream","Hdr" => "tree dd6a134cae97ce5f54cea9c4d96698529fdd498c\nparent 34deccec5312d146eb805e928eb278716567c3a4\nauthor Ian Jackson 1449445839 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "4324f7235dbc782c09a14c9186517708404a348d"} 1042s git-debrebase get_differs 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 68a0567e91f2936d7f3f03b02e86aac41b457945 = 0x2 1042s git-debrebase classify 34deccec5312d146eb805e928eb278716567c3a4 $t=68a0567e91f2936d7f3f03b02e86aac41b457945 @p 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1/0x2 1042s git-debrebase = Upstream {"Type" => "Upstream","Hdr" => "tree 68a0567e91f2936d7f3f03b02e86aac41b457945\nparent 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1\nauthor Ian Jackson 1449445808 +0000\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "34deccec5312d146eb805e928eb278716567c3a4","Msg" => "Add a new upstream file\n\n\nGbp-Pq: Name 0001-Add-a-new-upstream-file.patch","Tree" => "68a0567e91f2936d7f3f03b02e86aac41b457945","Parents" => [{"Ix" => 0,"Differs" => 2,"CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1"}]} 1042s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1042s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1042s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1042s git-debrebase = TreatAsAnchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48,"Ix" => 1}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Type" => "TreatAsAnchor"} 1042s git-debrebase *** WALK prep done cur=1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 brw 1 upp 2 proc 5 pm -1 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s git-debrebase WALK REBUILD 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 6 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example/.git/debrebase/work 1042s git-debrebase WALK BUILD f4c946ae0300e22203248ca380c5e80b2f6cfbf9 Debian (rewriting=0) 1042s git-debrebase WALK REWRITING NOW cl=HASH(0x557873733230) procd=HASH(0x557873768058) 1042s git-debrebase WALK BUILD 2306c75cf843d0ffac699f610942f2a4632dad14 Debian (rewriting=1) 1042s git-debrebase WALK BUILD undef RecordBreakwaterTip (rewriting=1) 1042s git-debrebase WALK BUILD 34deccec5312d146eb805e928eb278716567c3a4 Upstream (rewriting=1) 1042s git-debrebase WALK BUILD 4324f7235dbc782c09a14c9186517708404a348d Upstream (rewriting=1) 1042s git-debrebase WALK BUILD f5ce0886e4e5207a2567c251d67e5a6dbc93aaa5 Upstream (rewriting=1) 1042s git-debrebase CD /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s git-debrebase get_differs c4dedfc862799c2b23916ff3522d513ee1051f1a 2306c75cf843d0ffac699f610942f2a4632dad14 = 0 1042s git-debrebase *** WALK RETURN c4dedfc862799c2b23916ff3522d513ee1051f1a 514fe3f551f3706f5408598630daac3e7bbc512d 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 1042s git-debrebase get_differs 6c5ccc74d24af3d27b1d6012d1810502d4005572 b14b4600cb5e937fcd1af89a74c0cf542e3758b7 = 0x10 1042s git-debrebase classify 514fe3f551f3706f5408598630daac3e7bbc512d $t=b14b4600cb5e937fcd1af89a74c0cf542e3758b7 @p 6c5ccc74d24af3d27b1d6012d1810502d4005572/0x10 1042s git-debrebase = Changelog {"Parents" => [{"CommitId" => "6c5ccc74d24af3d27b1d6012d1810502d4005572","Differs" => 16,"Ix" => 0}],"Tree" => "b14b4600cb5e937fcd1af89a74c0cf542e3758b7","Msg" => "dch -r -D unstable\n","Hdr" => "tree b14b4600cb5e937fcd1af89a74c0cf542e3758b7\nparent 6c5ccc74d24af3d27b1d6012d1810502d4005572\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000003 +0100\n","CommitId" => "514fe3f551f3706f5408598630daac3e7bbc512d","Type" => "Changelog"} 1042s git-debrebase get_differs 1c51d54eed3579c743d8579332cddc0201ed10e7 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0 1042s git-debrebase get_differs dcacb606b0a29bcbc1331971222caf97f79a139c 265bc49e383a8daa966237141d8ee55cb6afa8f7 = 0x30 1042s git-debrebase classify 1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1 $t=265bc49e383a8daa966237141d8ee55cb6afa8f7 @p 1c51d54eed3579c743d8579332cddc0201ed10e7/0 dcacb606b0a29bcbc1331971222caf97f79a139c/0x30 1042s git-debrebase = TreatAsAnchor {"Tree" => "265bc49e383a8daa966237141d8ee55cb6afa8f7","Parents" => [{"Ix" => 0,"Differs" => 0,"CommitId" => "1c51d54eed3579c743d8579332cddc0201ed10e7"},{"Ix" => 1,"CommitId" => "dcacb606b0a29bcbc1331971222caf97f79a139c","Differs" => 48}],"Msg" => "git-debrebase import: declare upstream\n\nFirst breakwater merge.\n\n[git-debrebase anchor: declare upstream]\n","Hdr" => "tree 265bc49e383a8daa966237141d8ee55cb6afa8f7\nparent 1c51d54eed3579c743d8579332cddc0201ed10e7\nparent dcacb606b0a29bcbc1331971222caf97f79a139c\nauthor dgit test git user 1530000000 +0100\ncommitter dgit test git user 1530000000 +0100\n","CommitId" => "1f5564af977cc0691ec4f32f9f00d0b3b4b0ccf1","Type" => "TreatAsAnchor"} 1042s git-debrebase: snag detected (-fanchor-treated): old anchor is recognized due to --anchor, cannot check upstream 1042s git-debrebase %pieces = {"" => {"Name" => "","New" => "9638c2110033b719cc742997b9527505ffdc1a65","NewIx" => 0,"OldIx" => 0,"Desc" => "upstream (main piece"}} 1042s git-debrebase @newpieces = [{"Name" => "","New" => "9638c2110033b719cc742997b9527505ffdc1a65","NewIx" => 0,"OldIx" => 0,"Desc" => "upstream (main piece"}] 1042s 1042s git-debrebase: error: git-debrebase: snags: 1 blocker(s) (you could -f, or --force) 1042s + local 'ps=255 0' 1042s + set -o pipefail 1042s + case $ps in 1042s + t-grep-mpat 'F:old anchor is recognized' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s + local 'mpat=F:old anchor is recognized' 1042s + local file=/tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s + local grepper=fgrep 1042s + case "$mpat" in 1042s + case "$mpat" in 1042s + grepper=fgrep 1042s + mpat='old anchor is recognized' 1042s + fgrep -e 'old anchor is recognized' /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/t.output 1042s git-debrebase: snag detected (-fanchor-treated): old anchor is recognized due to --anchor, cannot check upstream 1042s + t-ok 1042s + : ======================================== 1042s + t-check-only-bpd 1042s + '[' .. = .. ']' 1042s + return 1042s + t-fscks 1042s + shopt -s nullglob 1042s + for d in $tmp/*/.git $tmp/git/*.git 1042s + cd /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s + t-git-fsck 1042s ++ git rev-parse --git-dir 1042s + local fsckerrs=.git/dgit-test-fsck.errs 1042s + set +e 1042s + LC_MESSAGES=C 1042s + git fsck --no-dangling --strict 1042s + tee .git/dgit-test-fsck.errs 1042s + ps='0 0' 1042s + set -e 1042s + local pats 1042s + '[' -f /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/fsck.expected-errors ']' 1042s + test '0 0' = '0 0' 1042s + pats+=(-e 'notice: HEAD points to an unborn branch') 1042s + pats+=(-e 'notice: No default references') 1042s + set +e 1042s + grep -v -e 'notice: HEAD points to an unborn branch' -e 'notice: No default references' .git/dgit-test-fsck.errs 1042s + rc=1 1042s + set -e 1042s + case $rc in 1042s + t-save-artifacts 1042s + artifacts=/tmp/autopkgtest.ztMUxl/i18n-messages-artifacts 1042s + '[' x/tmp/autopkgtest.ztMUxl/i18n-messages-artifacts = x ']' 1042s + '[' xtmp = x ']' 1042s + GZIP=-1v 1042s + tar -C /tmp/autopkgtest.ztMUxl/autopkgtest_tmp -zc -f /tmp/autopkgtest.ztMUxl/i18n-messages-artifacts/i18n-messages.tar.gz '--exclude=*.tar' . 1042s gzip: warning: GZIP environment variable is deprecated; use an alias or script 1042s 81.7% 1042s + echo ok. 1042s ok. 1042s + rc=0 1042s + set +x 1042s + set +e 1042s + pwd 1042s /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/example 1042s + '[' x '!=' x ']' 1042s + '[' x/tmp/autopkgtest.ztMUxl/autopkgtest_tmp = x ']' 1042s + rm -rf /tmp/autopkgtest.ztMUxl/autopkgtest_tmp/must-clean 1042s + set -e 1042s + test 0 = 0 1042s autopkgtest [12:35:36]: test i18n-messages: -----------------------] 1043s i18n-messages PASS 1043s autopkgtest [12:35:37]: test i18n-messages: - - - - - - - - - - results - - - - - - - - - - 1043s autopkgtest [12:35:37]: test manpages-format: preparing testbed 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for 1318a3ec-9911-4a9f-b366-01e62bcab08b to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for 75e9fdf5-dedb-4b1c-8151-f6cf298030a3 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for 51082f4c-5882-4b03-aa4a-ab9f64abc047 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for e3e9179e-32cc-4578-9d10-8ba90019d068 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for c5f0849a-494e-423a-abe8-d1bccffa9013 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for 8910ffbe-fef8-4383-905d-a7db7b107c09 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for e8df4c0e-4b38-4e98-9bbf-541253cf7780 to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [W] Timed out waiting for db5ffd8c-38a6-4f10-b33f-5b403302584c to get deleted. 2292s nova [W] Skipping flock for amd64 2292s Creating nova instance adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 from image adt/ubuntu-jammy-amd64-server-20250331.img (UUID 4ce08928-2d16-43c1-b311-706598e3777e)... 2292s nova [E] nova boot failed (attempt #0): 2292s nova [E] DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 2292s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 2292s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 2292s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 2292s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://keystone.ps5.canonical.com:5000/v3 -H "Accept: application/json" -H "User-Agent: nova keystoneauth1/4.0.0 python-requests/2.22.0 CPython/3.8.10" 2292s DEBUG (connectionpool:962) Starting new HTTPS connection (1): keystone.ps5.canonical.com:5000 2292s DEBUG (connectionpool:429) https://keystone.ps5.canonical.com:5000 "GET /v3 HTTP/1.1" 200 267 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 267 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:56 GMT Keep-Alive: timeout=5, max=100 Server: Apache/2.4.41 (Ubuntu) Vary: X-Auth-Token x-openstack-request-id: req-a60ad799-3a2d-4097-b703-d013b7f22727 2292s DEBUG (session:580) RESP BODY: {"version": {"id": "v3.14", "status": "stable", "updated": "2020-04-07T00:00:00Z", "links": [{"rel": "self", "href": "https://keystone.ps5.canonical.com:5000/v3/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.identity-v3+json"}]}} 2292s DEBUG (session:946) GET call to https://keystone.ps5.canonical.com:5000/v3 used request id req-a60ad799-3a2d-4097-b703-d013b7f22727 2292s DEBUG (base:182) Making authentication request to https://keystone.ps5.canonical.com:5000/v3/auth/tokens 2292s DEBUG (connectionpool:429) https://keystone.ps5.canonical.com:5000 "POST /v3/auth/tokens HTTP/1.1" 201 11718 2292s DEBUG (base:187) {"token": {"methods": ["password"], "user": {"domain": {"id": "default", "name": "Default"}, "id": "c01f0e5a065246f2a090a7d191029fce", "name": "prod-proposed-migration", "password_expires_at": null}, "audit_ids": ["r7lFAGyqSh63E85JJliokA"], "expires_at": "2025-04-01T12:35:57.000000Z", "issued_at": "2025-03-31T12:35:57.000000Z", "project": {"domain": {"id": "default", "name": "Default"}, "id": "a77cf7d04cc348e3b9aad5180306c3dd", "name": "prod-proposed-migration_project"}, "is_domain": false, "roles": [{"id": "f84069c3d10e4eebaea55b7499d804ac", "name": "reader"}, {"id": "3c78c6ccb7a24b77a91e24246ff0896e", "name": "member"}], "is_admin_project": false, "catalog": [{"endpoints": [{"id": "381f92a8b48942dfbfdf1f2569df8e5a", "interface": "internal", "region_id": "prodstack5", "url": "https://heat-internal.ps5.canonical.com:8004/v1/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "57c801b8efae427bb38d127888ec39c7", "interface": "admin", "region_id": "prodstack5", "url": "https://heat-admin.ps5.canonical.com:8004/v1/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "edae1b88012c46b892b6ca4d670e78e6", "interface": "public", "region_id": "prodstack5", "url": "https://heat.ps5.canonical.com:8004/v1/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}], "id": "0c32215c880f45ebb55fa813d2c01a05", "type": "orchestration", "name": "heat"}, {"endpoints": [{"id": "3f327f9d25044e4dae537bc2aa694117", "interface": "internal", "region_id": "prodstack5", "url": "https://cinder-internal.ps5.canonical.com:8776/v3/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "be9b6d7a63fd4c2cbec3d3945d67da23", "interface": "admin", "region_id": "prodstack5", "url": "https://cinder-admin.ps5.canonical.com:8776/v3/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "f79fd684be71400084dd1871bf1ceed8", "interface": "public", "region_id": "prodstack5", "url": "https://cinder.ps5.canonical.com:8776/v3/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}], "id": "0c799399b02f4d468844fac80cf78763", "type": "volumev3", "name": "cinderv3"}, {"endpoints": [{"id": "32d4ab1d59314991b616622f958c55a3", "interface": "admin", "region_id": "prodstack5", "url": "https://glance-admin.ps5.canonical.com:9292", "region": "prodstack5"}, {"id": "c0023fe925774a949a611bafa775b1dd", "interface": "public", "region_id": "prodstack5", "url": "https://glance.ps5.canonical.com:9292", "region": "prodstack5"}, {"id": "efdeffa94ac54e8485318b673fe00a62", "interface": "internal", "region_id": "prodstack5", "url": "https://glance-internal.ps5.canonical.com:9292", "region": "prodstack5"}], "id": "12a1596e978446df9f49adedf0281be4", "type": "image", "name": "glance"}, {"endpoints": [{"id": "35a1da84ece8457796097bbb42a7c48b", "interface": "public", "region_id": "prodstack5", "url": "https://neutron.ps5.canonical.com:9696", "region": "prodstack5"}, {"id": "76f58d33070d4716b6ace61da0cf5fab", "interface": "internal", "region_id": "prodstack5", "url": "https://neutron-internal.ps5.canonical.com:9696", "region": "prodstack5"}, {"id": "fa63ae5cd82345128c1e06d795bd5c5c", "interface": "admin", "region_id": "prodstack5", "url": "https://neutron-admin.ps5.canonical.com:9696", "region": "prodstack5"}], "id": "166ad5679b9e4430b00903524f1aa2e2", "type": "network", "name": "neutron"}, {"endpoints": [{"id": "51b3369f6bcb44d39d927fed38dfcb1d", "interface": "public", "region_id": "prodstack5", "url": "https://nova.ps5.canonical.com:8774/v2.1", "region": "prodstack5"}, {"id": "bde75440fd044085a599523fa768b3e0", "interface": "internal", "region_id": "prodstack5", "url": "https://nova-internal.ps5.canonical.com:8774/v2.1", "region": "prodstack5"}, {"id": "ebb570ffacb64d188008169beff10c7d", "interface": "admin", "region_id": "prodstack5", "url": "https://nova-admin.ps5.canonical.com:8774/v2.1", "region": "prodstack5"}], "id": "239a7e347ea145ba8900922319abfe0c", "type": "compute", "name": "nova"}, {"endpoints": [{"id": "7bc0cff06df9462eadc8f751b17b147b", "interface": "internal", "region_id": "prodstack5", "url": "https://gnocchi-internal.ps5.canonical.com:8041", "region": "prodstack5"}, {"id": "9eccd9a5774b450685f5be93e03eb579", "interface": "admin", "region_id": "prodstack5", "url": "https://gnocchi-admin.ps5.canonical.com:8041", "region": "prodstack5"}, {"id": "b116265ff15d46449f063572137c127e", "interface": "public", "region_id": "prodstack5", "url": "https://gnocchi.ps5.canonical.com:8041", "region": "prodstack5"}], "id": "3094700472a043d9a9095409791d1ebd", "type": "metric", "name": "gnocchi"}, {"endpoints": [{"id": "8ee6d1af15c5497393f87dadb8d88dc0", "interface": "public", "region_id": "prodstack5", "url": "https://octavia.ps5.canonical.com:9876", "region": "prodstack5"}, {"id": "d1ebffaac581458fbfe417de21f6179e", "interface": "internal", "region_id": "prodstack5", "url": "https://octavia-internal.ps5.canonical.com:9876", "region": "prodstack5"}, {"id": "fe6854cc50864b7e8884c666d0c49525", "interface": "admin", "region_id": "prodstack5", "url": "https://octavia-admin.ps5.canonical.com:9876", "region": "prodstack5"}], "id": "31368cb36db84561bd587221566417fe", "type": "load-balancer", "name": "octavia"}, {"endpoints": [{"id": "04c6279eb3274a8b9558481fcb84f91f", "interface": "admin", "region_id": "prodstack5", "url": "https://radosgw-admin.ps5.canonical.com:443/", "region": "prodstack5"}, {"id": "4078713c5b4e42af9af5181b0e370195", "interface": "public", "region_id": "prodstack5", "url": "https://radosgw.ps5.canonical.com:443/", "region": "prodstack5"}, {"id": "539afbfe83284d1794337ab29534d146", "interface": "internal", "region_id": "prodstack5", "url": "https://radosgw-internal.ps5.canonical.com:443/", "region": "prodstack5"}], "id": "33fe254c9ab3464f9cefb0735db5c7b6", "type": "s3", "name": "s3"}, {"endpoints": [{"id": "0e87b83617064bf4a310ac3b19bbb6d3", "interface": "admin", "region_id": "prodstack5", "url": "https://barbican-admin.ps5.canonical.com:9312", "region": "prodstack5"}, {"id": "11763e77618146d29b12e08749f72ebe", "interface": "public", "region_id": "prodstack5", "url": "https://barbican.ps5.canonical.com:9311", "region": "prodstack5"}, {"id": "c028b0aad7e64fc181028c5e580410ca", "interface": "internal", "region_id": "prodstack5", "url": "https://barbican-internal.ps5.canonical.com:9311", "region": "prodstack5"}], "id": "4a5b6290ebc64737b2ce1d680622c9b0", "type": "key-manager", "name": "barbican"}, {"endpoints": [{"id": "3e668beb71f6455d89614720578fb48e", "interface": "public", "region_id": "prodstack5", "url": "https://designate.ps5.canonical.com:9001", "region": "prodstack5"}, {"id": "4819d3baf6fe4074b00d4dbce532acc4", "interface": "admin", "region_id": "prodstack5", "url": "https://designate-admin.ps5.canonical.com:9001", "region": "prodstack5"}, {"id": "b40c9ffe39c64e5ca19cc2b1f3c74499", "interface": "internal", "region_id": "prodstack5", "url": "https://designate-internal.ps5.canonical.com:9001", "region": "prodstack5"}], "id": "4f3473e2e5994fee8132b0e6b5b96b10", "type": "dns", "name": "designate"}, {"endpoints": [{"id": "135a559d49ac4e308f9ba622ab4eea39", "interface": "admin", "region_id": "prodstack5", "url": "https://radosgw-admin.ps5.canonical.com:443/swift", "region": "prodstack5"}, {"id": "dbcd5cb805df4ab789e586b2d37cfebb", "interface": "public", "region_id": "prodstack5", "url": "https://radosgw.ps5.canonical.com:443/swift/v1/AUTH_a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "e313670eb03d431298eb0c604ebc0e5a", "interface": "internal", "region_id": "prodstack5", "url": "https://radosgw-internal.ps5.canonical.com:443/swift/v1/AUTH_a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}], "id": "7066b013a1bf45ea88db389a412e7e0a", "type": "object-store", "name": "swift"}, {"endpoints": [{"id": "1f02cd17eafd4c6898ba27eef5c27551", "interface": "admin", "region_id": "prodstack5", "url": "https://placement-admin.ps5.canonical.com:8778", "region": "prodstack5"}, {"id": "4eae3072a321488f9ff8514f0b4f9d23", "interface": "public", "region_id": "prodstack5", "url": "https://placement.ps5.canonical.com:8778", "region": "prodstack5"}, {"id": "7df5a1a986ad42258d3d2006d28a5658", "interface": "internal", "region_id": "prodstack5", "url": "https://placement-internal.ps5.canonical.com:8778", "region": "prodstack5"}], "id": "85421f66b1804c6298c7a5db84b753a2", "type": "placement", "name": "placement"}, {"endpoints": [{"id": "30c12456f82b43d0b7b3b9b38ee6b98d", "interface": "admin", "region_id": "prodstack5", "url": "https://keystone-admin.ps5.canonical.com:35357/v3", "region": "prodstack5"}, {"id": "8affc90f95f54139ac786bac07c69664", "interface": "public", "region_id": "prodstack5", "url": "https://keystone.ps5.canonical.com:5000/v3", "region": "prodstack5"}, {"id": "be617e6c3fa442258fb5e88d9f29f498", "interface": "internal", "region_id": "prodstack5", "url": "https://keystone-internal.ps5.canonical.com:5000/v3", "region": "prodstack5"}], "id": "9cedc56a694848cca451e602ba3d3546", "type": "identity", "name": "keystone"}, {"endpoints": [{"id": "7c44a04287cb4606800fed5f79e53e7b", "interface": "public", "region_id": "prodstack5", "url": "https://radosgw.ps5.canonical.com:443/swift/v1/AUTH_6dd669096f9045e28e7895ef3e130559/simplestreams/data", "region": "prodstack5"}, {"id": "f8c2ae126ae9484e98cea882dd16fb7a", "interface": "internal", "region_id": "prodstack5", "url": "https://radosgw-internal.ps5.canonical.com:443/swift/v1/AUTH_6dd669096f9045e28e7895ef3e130559/simplestreams/data", "region": "prodstack5"}, {"id": "facc0eac313d4c40aef797443e8d7ce2", "interface": "admin", "region_id": "prodstack5", "url": "https://radosgw-admin.ps5.canonical.com:443/swift/simplestreams/data", "region": "prodstack5"}], "id": "a65e443f46b64434b1f926d1726653d5", "type": "product-streams", "name": "image-stream"}, {"endpoints": [{"id": "99d93600c5a44bc2a1ed77537833df85", "interface": "public", "region_id": "prodstack5", "url": "https://heat.ps5.canonical.com:8000/v1", "region": "prodstack5"}, {"id": "d8b9ce900b4c462a9a76c0602e97f263", "interface": "internal", "region_id": "prodstack5", "url": "https://heat-internal.ps5.canonical.com:8000/v1", "region": "prodstack5"}, {"id": "e2e1febd025547ddb27708842cd059cc", "interface": "admin", "region_id": "prodstack5", "url": "https://heat-admin.ps5.canonical.com:8000/v1", "region": "prodstack5"}], "id": "c3e7bea8f4a34b7da8d6d2fdd2f32833", "type": "cloudformation", "name": "heat-cfn"}, {"endpoints": [{"id": "6292435b5b24409087de737781d5a760", "interface": "internal", "region_id": "prodstack5", "url": "https://aodh-internal.ps5.canonical.com:8042", "region": "prodstack5"}, {"id": "660cbccb033641b6ac3680c85facfec7", "interface": "public", "region_id": "prodstack5", "url": "https://aodh.ps5.canonical.com:8042", "region": "prodstack5"}, {"id": "90112245ed1f46409e701fa1c9c12194", "interface": "admin", "region_id": "prodstack5", "url": "https://aodh-admin.ps5.canonical.com:8042", "region": "prodstack5"}], "id": "c5fe16dbcbab4875a376b69e9d60762b", "type": "alarming", "name": "aodh"}, {"endpoints": [{"id": "147effd39862447690863776c948b462", "interface": "internal", "region_id": "prodstack5", "url": "https://cinder-internal.ps5.canonical.com:8776/v2/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "43c302450db34754a415aae292cf41bd", "interface": "public", "region_id": "prodstack5", "url": "https://cinder.ps5.canonical.com:8776/v2/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}, {"id": "5052f17402424f418e320f48665fe1ac", "interface": "admin", "region_id": "prodstack5", "url": "https://cinder-admin.ps5.canonical.com:8776/v2/a77cf7d04cc348e3b9aad5180306c3dd", "region": "prodstack5"}], "id": "da8a1d72b62843e1baa4ca44bd82a9d3", "type": "volumev2", "name": "cinderv2"}]}} 2292s REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1 -H "Accept: application/json" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" 2292s DEBUG (connectionpool:962) Starting new HTTPS connection (1): nova.ps5.canonical.com:8774 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1 HTTP/1.1" 302 0 2292s RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps5.canonical.com:8774/v2.1/ Server: Apache/2.4.41 (Ubuntu) x-compute-request-id: req-99e6b22f-fbc2-4c27-a7d8-94c107d85833 x-openstack-request-id: req-99e6b22f-fbc2-4c27-a7d8-94c107d85833 2292s DEBUG (session:548) RESP: [302] Connection: Keep-Alive Content-Length: 0 Content-Type: text/plain; charset=utf8 Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=1000 Location: https://nova.ps5.canonical.com:8774/v2.1/ Server: Apache/2.4.41 (Ubuntu) x-compute-request-id: req-99e6b22f-fbc2-4c27-a7d8-94c107d85833 x-openstack-request-id: req-99e6b22f-fbc2-4c27-a7d8-94c107d85833 2292s RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 2292s DEBUG (session:580) RESP BODY: Omitted, Content-Type is set to text/plain; charset=utf8. Only application/json responses have their bodies logged. 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/ HTTP/1.1" 200 397 2292s RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-6275bc80-3b93-4408-b875-7035028a5121 x-openstack-request-id: req-6275bc80-3b93-4408-b875-7035028a5121 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 397 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=999 OpenStack-API-Version: compute 2.1 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.1 x-compute-request-id: req-6275bc80-3b93-4408-b875-7035028a5121 x-openstack-request-id: req-6275bc80-3b93-4408-b875-7035028a5121 2292s RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.87", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 2292s DEBUG (session:580) RESP BODY: {"version": {"id": "v2.1", "status": "CURRENT", "version": "2.87", "min_version": "2.1", "updated": "2013-07-23T11:33:21Z", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/"}, {"rel": "describedby", "type": "text/html", "href": "http://docs.openstack.org/"}], "media-types": [{"base": "application/json", "type": "application/vnd.openstack.compute+json;version=2.1"}]}} 2292s GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/ used request id req-6275bc80-3b93-4408-b875-7035028a5121 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/ used request id req-6275bc80-3b93-4408-b875-7035028a5121 2292s DEBUG (extension:189) found extension EntryPoint.parse('v1password = swiftclient.authv1:PasswordLoader') 2292s DEBUG (extension:189) found extension EntryPoint.parse('noauth = cinderclient.contrib.noauth:CinderNoAuthLoader') 2292s DEBUG (extension:189) found extension EntryPoint.parse('admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken') 2292s DEBUG (extension:189) found extension EntryPoint.parse('none = keystoneauth1.loading._plugins.noauth:NoAuth') 2292s DEBUG (extension:189) found extension EntryPoint.parse('password = keystoneauth1.loading._plugins.identity.generic:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('token = keystoneauth1.loading._plugins.identity.generic:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v2password = keystoneauth1.loading._plugins.identity.v2:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v2token = keystoneauth1.loading._plugins.identity.v2:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3adfspassword = keystoneauth1.extras._saml2._loading:ADFSPassword') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3applicationcredential = keystoneauth1.loading._plugins.identity.v3:ApplicationCredential') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3fedkerb = keystoneauth1.extras.kerberos._loading:MappedKerberos') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3kerberos = keystoneauth1.extras.kerberos._loading:Kerberos') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3multifactor = keystoneauth1.loading._plugins.identity.v3:MultiFactor') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oauth1 = keystoneauth1.extras.oauth1._loading:V3OAuth1') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcaccesstoken = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAccessToken') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcauthcode = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectAuthorizationCode') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcclientcredentials = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectClientCredentials') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3oidcpassword = keystoneauth1.loading._plugins.identity.v3:OpenIDConnectPassword') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3password = keystoneauth1.loading._plugins.identity.v3:Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3samlpassword = keystoneauth1.extras._saml2._loading:Saml2Password') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3token = keystoneauth1.loading._plugins.identity.v3:Token') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3tokenlessauth = keystoneauth1.loading._plugins.identity.v3:TokenlessAuth') 2292s DEBUG (extension:189) found extension EntryPoint.parse('v3totp = keystoneauth1.loading._plugins.identity.v3:TOTP') 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps5.canonical.com:9292/v2/images/4ce08928-2d16-43c1-b311-706598e3777e -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:962) Starting new HTTPS connection (1): glance.ps5.canonical.com:9292 2292s DEBUG (connectionpool:429) https://glance.ps5.canonical.com:9292 "GET /v2/images/4ce08928-2d16-43c1-b311-706598e3777e HTTP/1.1" 200 2114 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2114 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=5, max=100 Server: Apache/2.4.41 (Ubuntu) X-Openstack-Request-Id: req-0496c1b7-e38b-4c55-b22d-2cf67e7c4c7c 2292s DEBUG (session:580) RESP BODY: {"architecture": "x86_64", "base_image_ref": "de5bcd7d-979c-472e-a442-fd38f5a2b40f", "boot_roles": "reader,member", "content_id": "auto.sync", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "instance_uuid": "d5ef3c1b-f5c3-4175-a1c5-abbbc202ad08", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "22.04", "owner_id": "a77cf7d04cc348e3b9aad5180306c3dd", "owner_project_name": "prod-proposed-migration_project", "owner_user_name": "prod-proposed-migration", "product_name": "com.ubuntu.cloud.daily:server:22.04:amd64", "simplestreams_metadata": "{\"aliases\": \"22.04,j,jammy\", \"arch\": \"amd64\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"md5\": \"458301c3c514f91b809f169c49da0a43\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-jammy-daily-amd64-server-20250327\", \"release\": \"jammy\", \"release_codename\": \"Jammy Jellyfis", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "c01f0e5a065246f2a090a7d191029fce", "version_name": "20250327", "name": "adt/ubuntu-jammy-amd64-server-20250331.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2906718208, "virtual_size": null, "status": "active", "checksum": "fd3fcbf0671b89a673c229c27317e52f", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "a77cf7d04cc348e3b9aad5180306c3dd", "os_hidden": false, "os_hash_algo": "sha512", "os_hash_value": "e039129b60e044994782ff82cf0ec74a25a9d9af56f10e27c876e042f304ff7abe429f3f2c82f0145c94b1e6917558b626a253b4a7fb0a3c262b3e2812b3fe29", "id": "4ce08928-2d16-43c1-b311-706598e3777e", "created_at": "2025-03-31T03:41:10Z", "updated_at": "2025-03-31T03:42:23Z", "locations": [{"url": "rbd://3d196f64-760e-11eb-b486-e7aafffac620/glance/4ce08928-2d16-43c1-b311-706598e3777e/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://3d196f64-760e-11eb-b486-e7aafffac620/glance/4ce08928-2d16-43c1-b311-706598e3777e/snap", "tags": [], "self": "/v2/images/4ce08928-2d16-43c1-b311-706598e3777e", "file": "/v2/images/4ce08928-2d16-43c1-b311-706598e3777e/file", "schema": "/v2/schemas/image", "stores": "ceph"} 2292s DEBUG (session:936) GET call to image for https://glance.ps5.canonical.com:9292/v2/images/4ce08928-2d16-43c1-b311-706598e3777e used request id req-0496c1b7-e38b-4c55-b22d-2cf67e7c4c7c 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/flavors/autopkgtest -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/flavors/autopkgtest HTTP/1.1" 404 84 2292s DEBUG (session:548) RESP: [404] Connection: Keep-Alive Content-Length: 84 Content-Type: application/json; charset=UTF-8 Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=998 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-e8d33938-0c83-4f96-ae6e-17d51e2ee6bc x-openstack-request-id: req-e8d33938-0c83-4f96-ae6e-17d51e2ee6bc 2292s DEBUG (session:580) RESP BODY: {"itemNotFound": {"code": 404, "message": "Flavor autopkgtest could not be found."}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/flavors/autopkgtest used request id req-e8d33938-0c83-4f96-ae6e-17d51e2ee6bc 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/flavors?is_public=None -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/flavors?is_public=None HTTP/1.1" 200 30288 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 30288 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=997 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-b39fa6e5-b8ae-4e82-a4c7-eb329372fc20 x-openstack-request-id: req-b39fa6e5-b8ae-4e82-a4c7-eb329372fc20 2292s DEBUG (session:580) RESP BODY: {"flavors": [{"id": "02e9c87a-a583-4e03-9b7a-e12ac6e718de", "name": "builder-cpu16-ram32-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/02e9c87a-a583-4e03-9b7a-e12ac6e718de"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/02e9c87a-a583-4e03-9b7a-e12ac6e718de"}], "description": null}, {"id": "05985aaa-bad3-4e3e-93f8-a52755995027", "name": "builder-cpu4-ram64-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/05985aaa-bad3-4e3e-93f8-a52755995027"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/05985aaa-bad3-4e3e-93f8-a52755995027"}], "description": null}, {"id": "07ae4bac-2ce3-4dd4-8019-4a62a43d8d3f", "name": "builder-cpu32-ram16-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/07ae4bac-2ce3-4dd4-8019-4a62a43d8d3f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/07ae4bac-2ce3-4dd4-8019-4a62a43d8d3f"}], "description": null}, {"id": "09e7dbfc-161e-47ae-a384-5cd6334b2d8b", "name": "builder-cpu2-ram12-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/09e7dbfc-161e-47ae-a384-5cd6334b2d8b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/09e7dbfc-161e-47ae-a384-5cd6334b2d8b"}], "description": null}, {"id": "0f722088-0d98-4129-8e3d-b292a0adbe44", "name": "builder-cpu4-ram16-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/0f722088-0d98-4129-8e3d-b292a0adbe44"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/0f722088-0d98-4129-8e3d-b292a0adbe44"}], "description": null}, {"id": "1319cb50-758a-4b0a-9247-17f0e3fe4211", "name": "autopkgtest", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211"}], "description": null}, {"id": "13d4378b-9327-4969-89a6-3c6750d93680", "name": "builder-cpu8-ram16-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/13d4378b-9327-4969-89a6-3c6750d93680"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/13d4378b-9327-4969-89a6-3c6750d93680"}], "description": null}, {"id": "140a24f9-8b65-4a0b-a95f-eeb96f38c5e9", "name": "builder-cpu8-ram8-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/140a24f9-8b65-4a0b-a95f-eeb96f38c5e9"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/140a24f9-8b65-4a0b-a95f-eeb96f38c5e9"}], "description": null}, {"id": "16cc919c-7e15-43e1-ba1e-a49fed5e3401", "name": "builder-cpu2-ram8-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/16cc919c-7e15-43e1-ba1e-a49fed5e3401"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/16cc919c-7e15-43e1-ba1e-a49fed5e3401"}], "description": null}, {"id": "18f42ccb-05c4-4d80-989b-d367dbe45ba3", "name": "builder-cpu16-ram4-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/18f42ccb-05c4-4d80-989b-d367dbe45ba3"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/18f42ccb-05c4-4d80-989b-d367dbe45ba3"}], "description": null}, {"id": "1bdf7801-90e7-4c6a-9ccc-0930a31ca27b", "name": "builder-cpu16-ram16-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1bdf7801-90e7-4c6a-9ccc-0930a31ca27b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1bdf7801-90e7-4c6a-9ccc-0930a31ca27b"}], "description": null}, {"id": "1c18fadc-0f9b-4c9f-9595-8a74af82a72b", "name": "builder-cpu2-ram12-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1c18fadc-0f9b-4c9f-9595-8a74af82a72b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1c18fadc-0f9b-4c9f-9595-8a74af82a72b"}], "description": null}, {"id": "1e731fe2-ffd3-4c27-b149-e102eccfe052", "name": "builder-cpu8-ram64-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1e731fe2-ffd3-4c27-b149-e102eccfe052"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1e731fe2-ffd3-4c27-b149-e102eccfe052"}], "description": null}, {"id": "1f730b22-ac7a-4474-8ea5-09db60e42555", "name": "builder-cpu2-ram64-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1f730b22-ac7a-4474-8ea5-09db60e42555"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1f730b22-ac7a-4474-8ea5-09db60e42555"}], "description": null}, {"id": "25e742fd-7fed-43b3-9f3b-0258bb5053a0", "name": "builder-cpu32-ram16-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/25e742fd-7fed-43b3-9f3b-0258bb5053a0"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/25e742fd-7fed-43b3-9f3b-0258bb5053a0"}], "description": null}, {"id": "26b00ebd-f8ed-48ea-9ef2-88700638dc7b", "name": "builder-cpu32-ram32-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/26b00ebd-f8ed-48ea-9ef2-88700638dc7b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/26b00ebd-f8ed-48ea-9ef2-88700638dc7b"}], "description": null}, {"id": "2784156e-2387-494d-b64a-8ef8110b7b63", "name": "builder-cpu16-ram8-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/2784156e-2387-494d-b64a-8ef8110b7b63"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/2784156e-2387-494d-b64a-8ef8110b7b63"}], "description": null}, {"id": "28d0b426-6a41-45bf-ae80-a72fa286ae63", "name": "builder-cpu32-ram4-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/28d0b426-6a41-45bf-ae80-a72fa286ae63"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/28d0b426-6a41-45bf-ae80-a72fa286ae63"}], "description": null}, {"id": "2a9c15dc-0346-4403-803a-bfcaa5b2a87e", "name": "builder-cpu4-ram128-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/2a9c15dc-0346-4403-803a-bfcaa5b2a87e"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/2a9c15dc-0346-4403-803a-bfcaa5b2a87e"}], "description": null}, {"id": "2e965756-eead-4cbd-9a0d-87cf765e6dfe", "name": "builder-cpu8-ram32-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/2e965756-eead-4cbd-9a0d-87cf765e6dfe"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/2e965756-eead-4cbd-9a0d-87cf765e6dfe"}], "description": null}, {"id": "30ba7786-eba3-4277-a7bc-ad2b31a3a5a4", "name": "builder-cpu4-ram8-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/30ba7786-eba3-4277-a7bc-ad2b31a3a5a4"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/30ba7786-eba3-4277-a7bc-ad2b31a3a5a4"}], "description": null}, {"id": "38973dd4-9016-48cb-8ccd-1f2212c1deb6", "name": "builder-cpu32-ram4-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/38973dd4-9016-48cb-8ccd-1f2212c1deb6"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/38973dd4-9016-48cb-8ccd-1f2212c1deb6"}], "description": null}, {"id": "3a869ca3-4ef2-48bd-bd2e-b4236ef47352", "name": "builder-cpu8-ram16-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/3a869ca3-4ef2-48bd-bd2e-b4236ef47352"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/3a869ca3-4ef2-48bd-bd2e-b4236ef47352"}], "description": null}, {"id": "3d138c6d-20f5-4594-8ea1-f10f8053fe55", "name": "builder-cpu4-ram16-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/3d138c6d-20f5-4594-8ea1-f10f8053fe55"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/3d138c6d-20f5-4594-8ea1-f10f8053fe55"}], "description": null}, {"id": "46273dd3-48a2-4938-8e4f-2e779f702da9", "name": "builder-cpu32-ram32-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/46273dd3-48a2-4938-8e4f-2e779f702da9"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/46273dd3-48a2-4938-8e4f-2e779f702da9"}], "description": null}, {"id": "46a6df85-28de-4b80-b742-8045ebe16e47", "name": "builder-cpu8-ram32-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/46a6df85-28de-4b80-b742-8045ebe16e47"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/46a6df85-28de-4b80-b742-8045ebe16e47"}], "description": null}, {"id": "46b47b2a-0abf-4388-8f4d-efeff0421403", "name": "builder-cpu8-ram8-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/46b47b2a-0abf-4388-8f4d-efeff0421403"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/46b47b2a-0abf-4388-8f4d-efeff0421403"}], "description": null}, {"id": "50c5d94c-3170-4a46-ab4e-894651855eeb", "name": "builder-cpu4-ram12-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/50c5d94c-3170-4a46-ab4e-894651855eeb"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/50c5d94c-3170-4a46-ab4e-894651855eeb"}], "description": null}, {"id": "5ce974b5-11db-4391-a652-e44f8f3ae54a", "name": "builder-cpu8-ram4-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/5ce974b5-11db-4391-a652-e44f8f3ae54a"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/5ce974b5-11db-4391-a652-e44f8f3ae54a"}], "description": null}, {"id": "5cf86d23-4ff2-4891-84c5-34054aed0208", "name": "builder-cpu8-ram12-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/5cf86d23-4ff2-4891-84c5-34054aed0208"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/5cf86d23-4ff2-4891-84c5-34054aed0208"}], "description": null}, {"id": "608d7900-7e9d-4a60-9c23-39ff9c2be41a", "name": "builder-cpu8-ram12-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/608d7900-7e9d-4a60-9c23-39ff9c2be41a"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/608d7900-7e9d-4a60-9c23-39ff9c2be41a"}], "description": null}, {"id": "67af7743-c0a6-421e-8419-32666a466263", "name": "builder-cpu2-ram8-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/67af7743-c0a6-421e-8419-32666a466263"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/67af7743-c0a6-421e-8419-32666a466263"}], "description": null}, {"id": "71862f5c-108c-4f62-94bf-c54d7964fd85", "name": "autopkgtest-big", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/71862f5c-108c-4f62-94bf-c54d7964fd85"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/71862f5c-108c-4f62-94bf-c54d7964fd85"}], "description": null}, {"id": "71988587-beda-4f81-a015-f7fc85d335c5", "name": "builder-cpu4-ram32-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/71988587-beda-4f81-a015-f7fc85d335c5"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/71988587-beda-4f81-a015-f7fc85d335c5"}], "description": null}, {"id": "7202bdf5-4adf-41e3-9c18-3bf3e772fe9c", "name": "builder-cpu8-ram128-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/7202bdf5-4adf-41e3-9c18-3bf3e772fe9c"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/7202bdf5-4adf-41e3-9c18-3bf3e772fe9c"}], "description": null}, {"id": "73f69675-f0df-45a7-951d-6b99a4e4c867", "name": "builder-cpu16-ram16-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/73f69675-f0df-45a7-951d-6b99a4e4c867"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/73f69675-f0df-45a7-951d-6b99a4e4c867"}], "description": null}, {"id": "74aa1421-0ea3-4268-8352-00ff5a55f1fd", "name": "builder-cpu4-ram12-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/74aa1421-0ea3-4268-8352-00ff5a55f1fd"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/74aa1421-0ea3-4268-8352-00ff5a55f1fd"}], "description": null}, {"id": "76fd436d-82b8-47a5-9019-39f165fcff5f", "name": "builder-cpu2-ram32-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/76fd436d-82b8-47a5-9019-39f165fcff5f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/76fd436d-82b8-47a5-9019-39f165fcff5f"}], "description": null}, {"id": "7a6f0221-2b7e-4870-8c71-0b87c0be0d79", "name": "builder-cpu32-ram8-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/7a6f0221-2b7e-4870-8c71-0b87c0be0d79"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/7a6f0221-2b7e-4870-8c71-0b87c0be0d79"}], "description": null}, {"id": "7b63e1b6-167c-4074-b207-9c68b206ff1f", "name": "builder-cpu16-ram16-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/7b63e1b6-167c-4074-b207-9c68b206ff1f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/7b63e1b6-167c-4074-b207-9c68b206ff1f"}], "description": null}, {"id": "815fc6d8-8bb5-4c17-8b51-3e5c5ccfccde", "name": "builder-cpu32-ram8-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/815fc6d8-8bb5-4c17-8b51-3e5c5ccfccde"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/815fc6d8-8bb5-4c17-8b51-3e5c5ccfccde"}], "description": null}, {"id": "85bd1e14-a2c3-4f07-be4c-7c1e125b53b5", "name": "builder-cpu16-ram32-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/85bd1e14-a2c3-4f07-be4c-7c1e125b53b5"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/85bd1e14-a2c3-4f07-be4c-7c1e125b53b5"}], "description": null}, {"id": "8628f990-c323-475b-9ac4-b5b29ef4d71f", "name": "builder-cpu8-ram32-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/8628f990-c323-475b-9ac4-b5b29ef4d71f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/8628f990-c323-475b-9ac4-b5b29ef4d71f"}], "description": null}, {"id": "87ce5f3b-cad3-43dc-85a6-7b43148eaff8", "name": "builder-cpu8-ram16-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/87ce5f3b-cad3-43dc-85a6-7b43148eaff8"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/87ce5f3b-cad3-43dc-85a6-7b43148eaff8"}], "description": null}, {"id": "8a7f12b1-84ce-4c3c-994b-4198d0ee0d2c", "name": "builder-cpu4-ram8-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/8a7f12b1-84ce-4c3c-994b-4198d0ee0d2c"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/8a7f12b1-84ce-4c3c-994b-4198d0ee0d2c"}], "description": null}, {"id": "8c477e64-2bf1-40ec-8a12-e84bad65bec9", "name": "builder-cpu2-ram64-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/8c477e64-2bf1-40ec-8a12-e84bad65bec9"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/8c477e64-2bf1-40ec-8a12-e84bad65bec9"}], "description": null}, {"id": "8c75e311-86f7-4c74-bdb5-74bdaf1d2996", "name": "builder-cpu4-ram64-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/8c75e311-86f7-4c74-bdb5-74bdaf1d2996"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/8c75e311-86f7-4c74-bdb5-74bdaf1d2996"}], "description": null}, {"id": "972338d3-6aee-4f01-8419-ee6b1dd28714", "name": "builder-cpu8-ram8-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/972338d3-6aee-4f01-8419-ee6b1dd28714"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/972338d3-6aee-4f01-8419-ee6b1dd28714"}], "description": null}, {"id": "986345b2-789f-434e-a062-fd45297dea47", "name": "builder-cpu32-ram16-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/986345b2-789f-434e-a062-fd45297dea47"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/986345b2-789f-434e-a062-fd45297dea47"}], "description": null}, {"id": "99384943-ed59-42cb-9938-b17cfd6b3928", "name": "builder-cpu16-ram8-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/99384943-ed59-42cb-9938-b17cfd6b3928"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/99384943-ed59-42cb-9938-b17cfd6b3928"}], "description": null}, {"id": "99ad2321-a3b1-4b03-8199-edc98c3d287b", "name": "builder-cpu16-ram32-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/99ad2321-a3b1-4b03-8199-edc98c3d287b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/99ad2321-a3b1-4b03-8199-edc98c3d287b"}], "description": null}, {"id": "9a0f0a8d-83ef-49de-a098-da05987815dc", "name": "builder-cpu4-ram105-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/9a0f0a8d-83ef-49de-a098-da05987815dc"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/9a0f0a8d-83ef-49de-a098-da05987815dc"}], "description": null}, {"id": "9ec839f6-483c-4007-93de-8da10de7b4fd", "name": "builder-cpu2-ram32-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/9ec839f6-483c-4007-93de-8da10de7b4fd"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/9ec839f6-483c-4007-93de-8da10de7b4fd"}], "description": null}, {"id": "9fda4ae7-de8e-4a7c-86a8-8ed686009255", "name": "builder-cpu4-ram64-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/9fda4ae7-de8e-4a7c-86a8-8ed686009255"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/9fda4ae7-de8e-4a7c-86a8-8ed686009255"}], "description": null}, {"id": "a210f982-bb3c-4459-ac90-4b9f03a27d2c", "name": "builder-cpu2-ram16-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/a210f982-bb3c-4459-ac90-4b9f03a27d2c"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/a210f982-bb3c-4459-ac90-4b9f03a27d2c"}], "description": null}, {"id": "a3878f6e-b996-4a19-b05c-a41ab1fb1a4f", "name": "builder-cpu8-ram64-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/a3878f6e-b996-4a19-b05c-a41ab1fb1a4f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/a3878f6e-b996-4a19-b05c-a41ab1fb1a4f"}], "description": null}, {"id": "a3f80b80-413a-4343-9038-fb766d168d4d", "name": "builder-cpu4-ram8-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/a3f80b80-413a-4343-9038-fb766d168d4d"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/a3f80b80-413a-4343-9038-fb766d168d4d"}], "description": null}, {"id": "a53b0b44-c9fa-4d95-b7ac-a15069368331", "name": "builder-cpu16-ram4-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/a53b0b44-c9fa-4d95-b7ac-a15069368331"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/a53b0b44-c9fa-4d95-b7ac-a15069368331"}], "description": null}, {"id": "a78db586-771d-4934-a075-08a4d319773a", "name": "builder-cpu32-ram4-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/a78db586-771d-4934-a075-08a4d319773a"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/a78db586-771d-4934-a075-08a4d319773a"}], "description": null}, {"id": "adaa0312-27f2-4d6b-8ae5-7f1fc49b924b", "name": "builder-cpu8-ram12-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/adaa0312-27f2-4d6b-8ae5-7f1fc49b924b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/adaa0312-27f2-4d6b-8ae5-7f1fc49b924b"}], "description": null}, {"id": "ae47beab-f3cb-4bb0-b1ad-5cefb55d9713", "name": "builder-cpu4-ram72-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/ae47beab-f3cb-4bb0-b1ad-5cefb55d9713"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/ae47beab-f3cb-4bb0-b1ad-5cefb55d9713"}], "description": null}, {"id": "b28f2b08-ddee-4522-9489-2e84976c9816", "name": "builder-cpu4-ram4-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/b28f2b08-ddee-4522-9489-2e84976c9816"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/b28f2b08-ddee-4522-9489-2e84976c9816"}], "description": null}, {"id": "b4682187-2690-488c-a221-2541194b11b6", "name": "builder-cpu16-ram8-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/b4682187-2690-488c-a221-2541194b11b6"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/b4682187-2690-488c-a221-2541194b11b6"}], "description": null}, {"id": "b87e1a27-e2e0-4147-95f4-e9e5f6fc7be3", "name": "builder-cpu32-ram32-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/b87e1a27-e2e0-4147-95f4-e9e5f6fc7be3"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/b87e1a27-e2e0-4147-95f4-e9e5f6fc7be3"}], "description": null}, {"id": "b95b3976-a42a-4a93-ad21-a7e0a2ccbdc3", "name": "builder-cpu4-ram12-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/b95b3976-a42a-4a93-ad21-a7e0a2ccbdc3"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/b95b3976-a42a-4a93-ad21-a7e0a2ccbdc3"}], "description": null}, {"id": "bae423a2-460e-4fde-9931-6581734630f2", "name": "builder-cpu2-ram8-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/bae423a2-460e-4fde-9931-6581734630f2"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/bae423a2-460e-4fde-9931-6581734630f2"}], "description": null}, {"id": "bafb2a25-adf3-4c23-a2f2-bb93a7b322b5", "name": "builder-cpu8-ram4-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/bafb2a25-adf3-4c23-a2f2-bb93a7b322b5"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/bafb2a25-adf3-4c23-a2f2-bb93a7b322b5"}], "description": null}, {"id": "bc52d8c5-6267-4511-9ebb-968668f69b03", "name": "builder-cpu2-ram4-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/bc52d8c5-6267-4511-9ebb-968668f69b03"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/bc52d8c5-6267-4511-9ebb-968668f69b03"}], "description": null}, {"id": "bd3f2eeb-b0fc-49d5-9bf0-b116d353fe59", "name": "builder-cpu4-ram32-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/bd3f2eeb-b0fc-49d5-9bf0-b116d353fe59"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/bd3f2eeb-b0fc-49d5-9bf0-b116d353fe59"}], "description": null}, {"id": "bf774e98-a708-4015-aadd-a9d75e2e577e", "name": "builder-cpu8-ram64-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/bf774e98-a708-4015-aadd-a9d75e2e577e"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/bf774e98-a708-4015-aadd-a9d75e2e577e"}], "description": null}, {"id": "c8f31bd5-d40f-4ef0-8ad3-a378cc79be33", "name": "builder-cpu32-ram8-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/c8f31bd5-d40f-4ef0-8ad3-a378cc79be33"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/c8f31bd5-d40f-4ef0-8ad3-a378cc79be33"}], "description": null}, {"id": "c9a40e1b-3e3a-4b2b-9cb5-a8dcf3d277fd", "name": "builder-cpu4-ram4-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/c9a40e1b-3e3a-4b2b-9cb5-a8dcf3d277fd"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/c9a40e1b-3e3a-4b2b-9cb5-a8dcf3d277fd"}], "description": null}, {"id": "c9ccd7cb-7dc2-4c64-99fc-768fc34aea33", "name": "builder-cpu16-ram4-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/c9ccd7cb-7dc2-4c64-99fc-768fc34aea33"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/c9ccd7cb-7dc2-4c64-99fc-768fc34aea33"}], "description": null}, {"id": "ca65745f-04cc-4a79-b5d3-850d87ada100", "name": "builder-cpu2-ram16-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/ca65745f-04cc-4a79-b5d3-850d87ada100"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/ca65745f-04cc-4a79-b5d3-850d87ada100"}], "description": null}, {"id": "ca7d8fd5-7032-42fd-816d-e7b56688408b", "name": "builder-cpu2-ram44-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/ca7d8fd5-7032-42fd-816d-e7b56688408b"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/ca7d8fd5-7032-42fd-816d-e7b56688408b"}], "description": null}, {"id": "cc26157f-ed37-4dbd-abeb-1a460e5a3f89", "name": "builder-cpu2-ram64-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/cc26157f-ed37-4dbd-abeb-1a460e5a3f89"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/cc26157f-ed37-4dbd-abeb-1a460e5a3f89"}], "description": null}, {"id": "d1775bcf-3942-484b-92ff-f9c22cd4f971", "name": "builder-cpu2-ram16-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/d1775bcf-3942-484b-92ff-f9c22cd4f971"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/d1775bcf-3942-484b-92ff-f9c22cd4f971"}], "description": null}, {"id": "d83654b5-3a0f-47c4-9378-96534bc9d174", "name": "builder-cpu96-ram192-disk1000", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/d83654b5-3a0f-47c4-9378-96534bc9d174"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/d83654b5-3a0f-47c4-9378-96534bc9d174"}], "description": null}, {"id": "d8a4fd7d-9017-415f-9528-834277c9fedd", "name": "builder-cpu4-ram8-disk120", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/d8a4fd7d-9017-415f-9528-834277c9fedd"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/d8a4fd7d-9017-415f-9528-834277c9fedd"}], "description": null}, {"id": "d986a066-2af9-42cb-842a-1be8f588cfb1", "name": "builder-cpu2-ram4-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/d986a066-2af9-42cb-842a-1be8f588cfb1"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/d986a066-2af9-42cb-842a-1be8f588cfb1"}], "description": null}, {"id": "dd88672e-3c9b-48eb-b589-c710e92a3fcb", "name": "builder-cpu4-ram4-disk20", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/dd88672e-3c9b-48eb-b589-c710e92a3fcb"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/dd88672e-3c9b-48eb-b589-c710e92a3fcb"}], "description": null}, {"id": "dfa06abe-39ce-41b0-9309-79f3d3d12499", "name": "builder-cpu2-ram32-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/dfa06abe-39ce-41b0-9309-79f3d3d12499"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/dfa06abe-39ce-41b0-9309-79f3d3d12499"}], "description": null}, {"id": "e8da3984-1a76-4bb0-a502-48c4dc862979", "name": "builder-cpu4-ram32-disk50", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/e8da3984-1a76-4bb0-a502-48c4dc862979"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/e8da3984-1a76-4bb0-a502-48c4dc862979"}], "description": null}, {"id": "ecbfad98-f8ab-4fee-9978-ba5f2516b36c", "name": "builder-cpu4-ram16-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/ecbfad98-f8ab-4fee-9978-ba5f2516b36c"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/ecbfad98-f8ab-4fee-9978-ba5f2516b36c"}], "description": null}, {"id": "f14866bd-022b-43f8-996d-71cb0d89f87a", "name": "builder-cpu4-ram8-disk200", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/f14866bd-022b-43f8-996d-71cb0d89f87a"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/f14866bd-022b-43f8-996d-71cb0d89f87a"}], "description": null}, {"id": "f1ed6577-17da-4b4e-afc4-f9d7b9672cc5", "name": "builder-cpu2-ram12-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/f1ed6577-17da-4b4e-afc4-f9d7b9672cc5"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/f1ed6577-17da-4b4e-afc4-f9d7b9672cc5"}], "description": null}, {"id": "f2c24289-7055-4ca7-af16-a18d711558e9", "name": "builder-cpu8-ram4-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/f2c24289-7055-4ca7-af16-a18d711558e9"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/f2c24289-7055-4ca7-af16-a18d711558e9"}], "description": null}, {"id": "f431c620-abda-4a04-b4b1-c6699fdac063", "name": "builder-cpu2-ram4-disk100", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/f431c620-abda-4a04-b4b1-c6699fdac063"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/f431c620-abda-4a04-b4b1-c6699fdac063"}], "description": null}]} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/flavors?is_public=None used request id req-b39fa6e5-b8ae-4e82-a4c7-eb329372fc20 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211 -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211 HTTP/1.1" 200 607 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 607 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=996 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ba078df1-5b27-453d-8fcf-e58f94eede4f x-openstack-request-id: req-ba078df1-5b27-453d-8fcf-e58f94eede4f 2292s DEBUG (session:580) RESP BODY: {"flavor": {"id": "1319cb50-758a-4b0a-9247-17f0e3fe4211", "name": "autopkgtest", "ram": 4096, "disk": 20, "swap": 0, "OS-FLV-EXT-DATA:ephemeral": 0, "OS-FLV-DISABLED:disabled": false, "vcpus": 2, "os-flavor-access:is_public": false, "rxtx_factor": 1.0, "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211"}], "description": null, "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/flavors/1319cb50-758a-4b0a-9247-17f0e3fe4211 used request id req-ba078df1-5b27-453d-8fcf-e58f94eede4f 2292s DEBUG (session:517) REQ: curl -g -i -X POST https://nova.ps5.canonical.com:8774/v2.1/servers -H "Accept: application/json" -H "Content-Type: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" -d '{"server": {"name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "imageRef": "4ce08928-2d16-43c1-b311-706598e3777e", "flavorRef": "1319cb50-758a-4b0a-9247-17f0e3fe4211", "user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "min_count": 1, "max_count": 1, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "networks": [{"uuid": "0d0997a0-13bd-484c-b3b7-ebb3288d6a74"}]}}' 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "POST /v2.1/servers HTTP/1.1" 202 470 2292s DEBUG (session:548) RESP: [202] Connection: Keep-Alive Content-Length: 470 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:57 GMT Keep-Alive: timeout=75, max=995 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 location: https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f x-compute-request-id: req-6eb8da05-83dc-4ba7-913a-e6f474879a85 x-openstack-request-id: req-6eb8da05-83dc-4ba7-913a-e6f474879a85 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "adminPass": "aZi3ZrSg5Qv6"}} 2292s DEBUG (session:936) POST call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers used request id req-6eb8da05-83dc-4ba7-913a-e6f474879a85 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3212 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3212 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:59 GMT Keep-Alive: timeout=75, max=994 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-194e557f-2ced-4fce-a7ff-309a9f432c9a x-openstack-request-id: req-194e557f-2ced-4fce-a7ff-309a9f432c9a 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:35:59Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "scheduling", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-194e557f-2ced-4fce-a7ff-309a9f432c9a 2292s DEBUG (session:517) REQ: curl -g -i -X GET https://glance.ps5.canonical.com:9292/v2/images/4ce08928-2d16-43c1-b311-706598e3777e -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://glance.ps5.canonical.com:9292 "GET /v2/images/4ce08928-2d16-43c1-b311-706598e3777e HTTP/1.1" 200 2114 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 2114 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:59 GMT Keep-Alive: timeout=5, max=99 Server: Apache/2.4.41 (Ubuntu) X-Openstack-Request-Id: req-fb4639d4-712c-4b82-8bae-37b913ad1122 2292s DEBUG (session:580) RESP BODY: {"architecture": "x86_64", "base_image_ref": "de5bcd7d-979c-472e-a442-fd38f5a2b40f", "boot_roles": "reader,member", "content_id": "auto.sync", "image_location": "snapshot", "image_state": "available", "image_type": "snapshot", "instance_uuid": "d5ef3c1b-f5c3-4175-a1c5-abbbc202ad08", "item_name": "disk1.img", "os_distro": "ubuntu", "os_version": "22.04", "owner_id": "a77cf7d04cc348e3b9aad5180306c3dd", "owner_project_name": "prod-proposed-migration_project", "owner_user_name": "prod-proposed-migration", "product_name": "com.ubuntu.cloud.daily:server:22.04:amd64", "simplestreams_metadata": "{\"aliases\": \"22.04,j,jammy\", \"arch\": \"amd64\", \"ftype\": \"disk1.img\", \"label\": \"daily\", \"md5\": \"458301c3c514f91b809f169c49da0a43\", \"os\": \"ubuntu\", \"pubname\": \"ubuntu-jammy-daily-amd64-server-20250327\", \"release\": \"jammy\", \"release_codename\": \"Jammy Jellyfis", "source_content_id": "com.ubuntu.cloud:daily:download", "user_id": "c01f0e5a065246f2a090a7d191029fce", "version_name": "20250327", "name": "adt/ubuntu-jammy-amd64-server-20250331.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "private", "size": 2906718208, "virtual_size": null, "status": "active", "checksum": "fd3fcbf0671b89a673c229c27317e52f", "protected": false, "min_ram": 0, "min_disk": 20, "owner": "a77cf7d04cc348e3b9aad5180306c3dd", "os_hidden": false, "os_hash_algo": "sha512", "os_hash_value": "e039129b60e044994782ff82cf0ec74a25a9d9af56f10e27c876e042f304ff7abe429f3f2c82f0145c94b1e6917558b626a253b4a7fb0a3c262b3e2812b3fe29", "id": "4ce08928-2d16-43c1-b311-706598e3777e", "created_at": "2025-03-31T03:41:10Z", "updated_at": "2025-03-31T03:42:23Z", "locations": [{"url": "rbd://3d196f64-760e-11eb-b486-e7aafffac620/glance/4ce08928-2d16-43c1-b311-706598e3777e/snap", "metadata": {"store": "ceph"}}], "direct_url": "rbd://3d196f64-760e-11eb-b486-e7aafffac620/glance/4ce08928-2d16-43c1-b311-706598e3777e/snap", "tags": [], "self": "/v2/images/4ce08928-2d16-43c1-b311-706598e3777e", "file": "/v2/images/4ce08928-2d16-43c1-b311-706598e3777e/file", "schema": "/v2/schemas/image", "stores": "ceph"} 2292s DEBUG (session:936) GET call to image for https://glance.ps5.canonical.com:9292/v2/images/4ce08928-2d16-43c1-b311-706598e3777e used request id req-fb4639d4-712c-4b82-8bae-37b913ad1122 2292s +--------------------------------------+------------------------------------------------------------------------------------------------------------------------------+ 2292s | Property | Value | 2292s +--------------------------------------+------------------------------------------------------------------------------------------------------------------------------+ 2292s | OS-DCF:diskConfig | MANUAL | 2292s | OS-EXT-AZ:availability_zone | | 2292s | OS-EXT-SRV-ATTR:host | - | 2292s | OS-EXT-SRV-ATTR:hostname | adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed | 2292s | OS-EXT-SRV-ATTR:hypervisor_hostname | - | 2292s | OS-EXT-SRV-ATTR:instance_name | | 2292s | OS-EXT-SRV-ATTR:kernel_id | | 2292s | OS-EXT-SRV-ATTR:launch_index | 0 | 2292s | OS-EXT-SRV-ATTR:ramdisk_id | | 2292s | OS-EXT-SRV-ATTR:reservation_id | r-9rohemjf | 2292s | OS-EXT-SRV-ATTR:root_device_name | - | 2292s | OS-EXT-STS:power_state | 0 | 2292s | OS-EXT-STS:task_state | scheduling | 2292s | OS-EXT-STS:vm_state | building | 2292s | OS-SRV-USG:launched_at | - | 2292s | OS-SRV-USG:terminated_at | - | 2292s | accessIPv4 | | 2292s | accessIPv6 | | 2292s | adminPass | aZi3ZrSg5Qv6 | 2292s | config_drive | | 2292s | created | 2025-03-31T12:35:59Z | 2292s | description | - | 2292s | flavor:disk | 20 | 2292s | flavor:ephemeral | 0 | 2292s | flavor:extra_specs | {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"} | 2292s | flavor:original_name | autopkgtest | 2292s | flavor:ram | 4096 | 2292s | flavor:swap | 0 | 2292s | flavor:vcpus | 2 | 2292s | hostId | | 2292s | id | 5c0af685-a2fb-479d-825e-ab4491b9544f | 2292s | image | adt/ubuntu-jammy-amd64-server-20250331.img (4ce08928-2d16-43c1-b311-706598e3777e) | 2292s | key_name | testbed-juju-7f2275-prod-proposed-migration-environment-15 | 2292s | locked | False | 2292s | locked_reason | - | 2292s | metadata | {} | 2292s | name | adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3 | 2292s | os-extended-volumes:volumes_attached | [] | 2292s | progress | 0 | 2292s | security_groups | autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup | 2292s | server_groups | [] | 2292s | status | BUILD | 2292s | tags | [] | 2292s | tenant_id | a77cf7d04cc348e3b9aad5180306c3dd | 2292s | trusted_image_certificates | - | 2292s | updated | 2025-03-31T12:35:59Z | 2292s | user_id | c01f0e5a065246f2a090a7d191029fce | 2292s +--------------------------------------+------------------------------------------------------------------------------------------------------------------------------+DEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3212 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3212 Content-Type: application/json Date: Mon, 31 Mar 2025 12:35:59 GMT Keep-Alive: timeout=75, max=993 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ffb2977d-9204-4fdb-8497-f2be9d5111db x-openstack-request-id: req-ffb2977d-9204-4fdb-8497-f2be9d5111db 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:35:59Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "OS-EXT-SRV-ATTR:host": null, "OS-EXT-SRV-ATTR:instance_name": "", "OS-EXT-SRV-ATTR:hypervisor_hostname": null, "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": null, "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "scheduling", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-ffb2977d-9204-4fdb-8497-f2be9d5111db 2292s 2292s 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:04 GMT Keep-Alive: timeout=75, max=992 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-44825b56-931a-4288-803f-114d3cb8da00 x-openstack-request-id: req-44825b56-931a-4288-803f-114d3cb8da00 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-44825b56-931a-4288-803f-114d3cb8da00 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:10 GMT Keep-Alive: timeout=75, max=991 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-bbc4573c-e1cf-40c8-8966-59af4d623fb7 x-openstack-request-id: req-bbc4573c-e1cf-40c8-8966-59af4d623fb7 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-bbc4573c-e1cf-40c8-8966-59af4d623fb7 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:15 GMT Keep-Alive: timeout=75, max=990 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-c01014c0-4bbf-467c-b2d4-a76c45256c05 x-openstack-request-id: req-c01014c0-4bbf-467c-b2d4-a76c45256c05 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-c01014c0-4bbf-467c-b2d4-a76c45256c05 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:20 GMT Keep-Alive: timeout=75, max=989 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-55e75665-5b75-45b3-a8cd-d07551ce971b x-openstack-request-id: req-55e75665-5b75-45b3-a8cd-d07551ce971b 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-55e75665-5b75-45b3-a8cd-d07551ce971b 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:25 GMT Keep-Alive: timeout=75, max=988 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-f193b031-0a89-4727-a26e-e281909d7bdb x-openstack-request-id: req-f193b031-0a89-4727-a26e-e281909d7bdb 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-f193b031-0a89-4727-a26e-e281909d7bdb 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:31 GMT Keep-Alive: timeout=75, max=987 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ecc8008f-ab68-4cdf-b72b-5c9f42755f6a x-openstack-request-id: req-ecc8008f-ab68-4cdf-b72b-5c9f42755f6a 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-ecc8008f-ab68-4cdf-b72b-5c9f42755f6a 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:36 GMT Keep-Alive: timeout=75, max=986 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-aaeaa61a-92c3-4e2f-bb83-fdcc1df2e7d0 x-openstack-request-id: req-aaeaa61a-92c3-4e2f-bb83-fdcc1df2e7d0 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-aaeaa61a-92c3-4e2f-bb83-fdcc1df2e7d0 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:41 GMT Keep-Alive: timeout=75, max=985 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-ef30da82-ff0f-4efd-911a-6f6cae0e6260 x-openstack-request-id: req-ef30da82-ff0f-4efd-911a-6f6cae0e6260 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-ef30da82-ff0f-4efd-911a-6f6cae0e6260 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:46 GMT Keep-Alive: timeout=75, max=984 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-fa8dc14c-1cb8-4c99-9768-1a12b5ed1de2 x-openstack-request-id: req-fa8dc14c-1cb8-4c99-9768-1a12b5ed1de2 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-fa8dc14c-1cb8-4c99-9768-1a12b5ed1de2 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:36:55 GMT Keep-Alive: timeout=75, max=983 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-05f953c6-4554-4617-8a89-9a7b77206a61 x-openstack-request-id: req-05f953c6-4554-4617-8a89-9a7b77206a61 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-05f953c6-4554-4617-8a89-9a7b77206a61 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:37:01 GMT Keep-Alive: timeout=75, max=982 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-bdba0e08-2e1e-424f-83e3-b4f8dddbaada x-openstack-request-id: req-bdba0e08-2e1e-424f-83e3-b4f8dddbaada 2292s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 2292s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-bdba0e08-2e1e-424f-83e3-b4f8dddbaada 2292s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 2292s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 2292s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:37:06 GMT Keep-Alive: timeout=75, max=981 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-c99249c8-69ea-4a6b-a7ea-9c70626d5d9f x-openstack-request-id: req-c99249c8-69ea-4a6b-a7ea-9c70626d5d9f 4528s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed", "OS-EXT-SRV-ATTR:kernel_id": "", "OS-EXT-SRV-ATTR:ramdisk_id": "", "OS-EXT-SRV-ATTR:root_device_name": "/dev/vda", "OS-EXT-SRV-ATTR:user_data": "I2Nsb3VkLWNvbmZpZwpob3N0bmFtZTogYXV0b3BrZ3Rlc3QKZnFkbjogYXV0b3BrZ3Rlc3QubG9jYWwKbWFuYWdlX2V0Y19ob3N0czogdHJ1ZQphcHRfdXBkYXRlOiB0cnVlCmFwdF91cGdyYWRlOiBmYWxzZQphcHRfbWlycm9yOiBodHRwOi8vZnRwbWFzdGVyLmludGVybmFsL3VidW50dS8KCnJ1bmNtZDoKIC0gZWNobyAnQWNxdWlyZTo6TGFuZ3VhZ2VzICJub25lIjsnID4gL2V0Yy9hcHQvYXB0LmNvbmYuZC85MG5vbGFuZ3VhZ2VzCiAtIGVjaG8gJ2ZvcmNlLXVuc2FmZS1pbycgPiAvZXRjL2Rwa2cvZHBrZy5jZmcuZC9hdXRvcGtndGVzdAogLSBwcmludGYgJ1xuVEVSTT1saW51eFxuJ2h0dHBfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4naHR0cHNfcHJveHk9aHR0cDovL3NxdWlkLmludGVybmFsOjMxMjgnXG4nbm9fcHJveHk9MTI3LjAuMC4xLDEyNy4wLjEuMSxsb2dpbi51YnVudHUuY29tLGxvY2FsaG9zdCxsb2NhbGRvbWFpbixub3ZhbG9jYWwsaW50ZXJuYWwsYXJjaGl2ZS51YnVudHUuY29tLHBvcnRzLnVidW50dS5jb20sc2VjdXJpdHkudWJ1bnR1LmNvbSxkZGVicy51YnVudHUuY29tLGNoYW5nZWxvZ3MudWJ1bnR1LmNvbSxrZXlzZXJ2ZXIudWJ1bnR1LmNvbSxsYXVuY2hwYWRsaWJyYXJpYW4ubmV0LGxhdW5jaHBhZGNvbnRlbnQubmV0LGxhdW5jaHBhZC5uZXQsMTAuMjQuMC4wLzI0LGtleXN0b25lLnBzNS5jYW5vbmljYWwuY29tLG9iamVjdHN0b3JhZ2UucHJvZHN0YWNrNS5jYW5vbmljYWwuY29tLHJhZG9zZ3cucHM1LmNhbm9uaWNhbC5jb20nXG4nID4+IC9ldGMvZW52aXJvbm1lbnQKIC0gc2VkIC1pIC1yICcvXjEyNy4wLjEuMS8gcy9hdXRvcGtndGVzdC1bXiBdK1wuL2F1dG9wa2d0ZXN0XC4vJyAvZXRjL2hvc3RzCg==", "OS-EXT-STS:task_state": "spawning", "OS-EXT-STS:vm_state": "building", "OS-EXT-STS:power_state": 0, "os-extended-volumes:volumes_attached": [], "locked": false, "locked_reason": null, "description": null, "tags": [], "trusted_image_certificates": null, "server_groups": []}} 4528s DEBUG (session:936) GET call to compute for https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f used request id req-c99249c8-69ea-4a6b-a7ea-9c70626d5d9f 4528s Server building... 0% completeDEBUG (session:517) REQ: curl -g -i -X GET https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f -H "Accept: application/json" -H "OpenStack-API-Version: compute 2.87" -H "User-Agent: python-novaclient" -H "X-Auth-Token: {SHA256}3febf9a3e96bcf47e48170801977552e886714ab0bb5c1d01aad6944b0571ad2" -H "X-OpenStack-Nova-API-Version: 2.87" 4528s DEBUG (connectionpool:429) https://nova.ps5.canonical.com:8774 "GET /v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f HTTP/1.1" 200 3448 4528s DEBUG (session:548) RESP: [200] Connection: Keep-Alive Content-Length: 3448 Content-Type: application/json Date: Mon, 31 Mar 2025 12:37:11 GMT Keep-Alive: timeout=75, max=980 OpenStack-API-Version: compute 2.87 Server: Apache/2.4.41 (Ubuntu) Vary: OpenStack-API-Version,X-OpenStack-Nova-API-Version X-OpenStack-Nova-API-Version: 2.87 x-compute-request-id: req-1c73f6a8-9b6d-4bf3-8470-d80bb3441731 x-openstack-request-id: req-1c73f6a8-9b6d-4bf3-8470-d80bb3441731 4528s DEBUG (session:580) RESP BODY: {"server": {"id": "5c0af685-a2fb-479d-825e-ab4491b9544f", "name": "adt-jammy-amd64-dgit-20250331-090210-juju-7f2275-prod-proposed-migration-environment-15-441b3de1-99cd-4424-9b55-51536d394bc3", "status": "BUILD", "tenant_id": "a77cf7d04cc348e3b9aad5180306c3dd", "user_id": "c01f0e5a065246f2a090a7d191029fce", "metadata": {}, "hostId": "9aa42be6300b3a6388250a9c5817e867800a0f1cfedf3917341d5325", "image": {"id": "4ce08928-2d16-43c1-b311-706598e3777e", "links": [{"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/images/4ce08928-2d16-43c1-b311-706598e3777e"}]}, "flavor": {"vcpus": 2, "ram": 4096, "disk": 20, "ephemeral": 0, "swap": 0, "original_name": "autopkgtest", "extra_specs": {"aggregate_instance_extra_specs:commit": "builder", "hw_rng:allowed": "True"}}, "created": "2025-03-31T12:35:59Z", "updated": "2025-03-31T12:36:01Z", "addresses": {}, "accessIPv4": "", "accessIPv6": "", "links": [{"rel": "self", "href": "https://nova.ps5.canonical.com:8774/v2.1/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}, {"rel": "bookmark", "href": "https://nova.ps5.canonical.com:8774/servers/5c0af685-a2fb-479d-825e-ab4491b9544f"}], "OS-DCF:diskConfig": "MANUAL", "progress": 0, "OS-EXT-AZ:availability_zone": "availability-zone-1", "config_drive": "", "key_name": "testbed-juju-7f2275-prod-proposed-migration-environment-15", "OS-SRV-USG:launched_at": null, "OS-SRV-USG:terminated_at": null, "security_groups": [{"name": "autopkgtest-juju-7f2275-prod-proposed-migration-environment-15@lcy02-6.secgroup"}], "OS-EXT-SRV-ATTR:host": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:instance_name": "instance-0095f187", "OS-EXT-SRV-ATTR:hypervisor_hostname": "ps5-ra2-n4.maas", "OS-EXT-SRV-ATTR:reservation_id": "r-9rohemjf", "OS-EXT-SRV-ATTR:launch_index": 0, "OS-EXT-SRV-ATTR:hostname": "adt-jammy-amd64-dgit-2nova [W] Timed out waiting for db5ffd8c-38a6-4f10-b33f-5b403302584c to get deleted. 4528s Unexpected error: 4528s Traceback (most recent call last): 4528s File "/home/ubuntu/autopkgtest/lib/VirtSubproc.py", line 833, in mainloop 4528s command() 4528s File "/home/ubuntu/autopkgtest/lib/VirtSubproc.py", line 762, in command 4528s r = f(c, ce) 4528s File "/home/ubuntu/autopkgtest/lib/VirtSubproc.py", line 395, in cmd_revert 4528s caller.hook_revert() 4528s File "/home/ubuntu/autopkgtest/virt/autopkgtest-virt-ssh", line 433, in hook_revert 4528s host_setup('revert') 4528s File "/home/ubuntu/autopkgtest/virt/autopkgtest-virt-ssh", line 252, in host_setup 4528s execute_setup_script(command) 4528s File "/home/ubuntu/autopkgtest/virt/autopkgtest-virt-ssh", line 209, in execute_setup_script 4528s sys.stderr.write(err) 4528s BlockingIOError: [Errno 11] write could not complete without blocking 4528s autopkgtest [13:33:42]: ERROR: testbed failure: unexpected eof from the testbed